diff options
author | Alexander Neben <alexander.neben@mongodb.com> | 2022-12-29 16:47:36 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-12-29 17:43:19 +0000 |
commit | 40e2c70e4b9518335d4cd9fede1b766ac80a0b57 (patch) | |
tree | 6792a7f4014167a95b75b44af699fae4e853c507 /buildscripts | |
parent | 6677bb2aaaa5008203272703871a2d4f8bc52e12 (diff) | |
download | mongo-40e2c70e4b9518335d4cd9fede1b766ac80a0b57.tar.gz |
SERVER-72412 Added direct connection to powercycle tests
Diffstat (limited to 'buildscripts')
-rwxr-xr-x | buildscripts/resmokelib/powercycle/powercycle.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/buildscripts/resmokelib/powercycle/powercycle.py b/buildscripts/resmokelib/powercycle/powercycle.py index f0f5091864f..c36c6c6894d 100755 --- a/buildscripts/resmokelib/powercycle/powercycle.py +++ b/buildscripts/resmokelib/powercycle/powercycle.py @@ -1100,12 +1100,13 @@ def wait_for_mongod_shutdown(mongod_control, timeout=2 * ONE_HOUR_SECS): def get_mongo_client_args(host=None, port=None, task_config=None, server_selection_timeout_ms=2 * ONE_HOUR_SECS * 1000, - socket_timeout_ms=2 * ONE_HOUR_SECS * 1000): + socket_timeout_ms=2 * ONE_HOUR_SECS * 1000, direct_connection=True): """Return keyword arg dict used in PyMongo client.""" # Set the default serverSelectionTimeoutMS & socketTimeoutMS to 10 minutes. mongo_args = { "serverSelectionTimeoutMS": server_selection_timeout_ms, - "socketTimeoutMS": socket_timeout_ms + "socketTimeoutMS": socket_timeout_ms, + "directConnection": direct_connection, } if host: mongo_args["host"] = host @@ -1165,7 +1166,7 @@ def mongo_reconfig_replication(mongo, host_port, repl_set): database = pymongo.database.Database(mongo, "local") system_replset = database.get_collection("system.replset") # Check if replica set has already been initialized - if not system_replset or not system_replset.find_one(): + if system_replset is None or not system_replset.find_one(): rs_config = {"_id": repl_set, "members": [{"_id": 0, "host": host_port}]} ret = mongo.admin.command("replSetInitiate", rs_config) LOGGER.info("Replication initialized: %s %s", ret, rs_config) |