diff options
| author | Jonathan Abrahams <jonathan@mongodb.com> | 2018-04-10 10:16:43 -0400 |
|---|---|---|
| committer | Jonathan Abrahams <jonathan@mongodb.com> | 2018-04-10 10:16:43 -0400 |
| commit | 279ef03069aada749b48dbdff527e4020364c0a1 (patch) | |
| tree | 7687528aee3a8a609814ba0bf0cc1bf797fb22f6 | |
| parent | 5ae38f156cb08fd5a66eb9e9327953e99442fc9c (diff) | |
| download | mongo-279ef03069aada749b48dbdff527e4020364c0a1.tar.gz | |
SERVER-34144 Powercycle output improvements:
- Correct replset name to 'powercycle'
- Improve canary insert and validate output
| -rw-r--r-- | etc/evergreen.yml | 4 | ||||
| -rwxr-xr-x | pytests/powertest.py | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 00109f19a21..1a2e7ffd5bb 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -4490,7 +4490,7 @@ tasks: - func: "run powercycle test" vars: <<: *powercycle_test - mongod_extra_options: --replSet=powercyle --mongodOptions=\"--setParameter enableTestCommands=1 --storageEngine wiredTiger\" + mongod_extra_options: --replSet=powercycle --mongodOptions=\"--setParameter enableTestCommands=1 --storageEngine wiredTiger\" - name: powercycle_replication_smalloplog exec_timeout_secs: 7200 # 2 hour timeout for the task overall @@ -4510,7 +4510,7 @@ tasks: - func: "run powercycle test" vars: <<: *powercycle_test - mongod_extra_options: --replSet=powercyle --mongodOptions=\"--setParameter enableTestCommands=1 --oplogSize 20 --storageEngine wiredTiger\" + mongod_extra_options: --replSet=powercycle --mongodOptions=\"--setParameter enableTestCommands=1 --oplogSize 20 --storageEngine wiredTiger\" - name: powercycle_syncdelay exec_timeout_secs: 7200 # 2 hour timeout for the task overall diff --git a/pytests/powertest.py b/pytests/powertest.py index 2ae5acdd0f3..ed8dbf76381 100755 --- a/pytests/powertest.py +++ b/pytests/powertest.py @@ -1508,13 +1508,15 @@ def mongo_validate_collections(mongo): def mongo_validate_canary(mongo, db_name, coll_name, doc): """Validate a canary document, return 0 if the document exists.""" - LOGGER.info("Validating canary document %s", doc) - return 0 if not doc or mongo[db_name][coll_name].find_one(doc) else 1 + if not doc: + return 0 + LOGGER.info("Validating canary document using %s.%s.find_one(%s)", db_name, coll_name, doc) + return 0 if mongo[db_name][coll_name].find_one(doc) else 1 def mongo_insert_canary(mongo, db_name, coll_name, doc): """Insert a canary document with 'j' True, return 0 if successful.""" - LOGGER.info("Inserting canary document %s to DB %s Collection %s", doc, db_name, coll_name) + LOGGER.info("Inserting canary document using %s.%s.insert_one(%s)", db_name, coll_name, doc) coll = mongo[db_name][coll_name].with_options( write_concern=pymongo.write_concern.WriteConcern(j=True)) res = coll.insert_one(doc) |