diff options
author | Benety Goh <benety@mongodb.com> | 2017-03-26 07:12:52 -0400 |
---|---|---|
committer | Benety Goh <benety@mongodb.com> | 2017-03-29 07:51:48 -0400 |
commit | 710cefca98db7c8f7736a79cebca855b99509235 (patch) | |
tree | 07050f5f68daf477c1913d5d286f6fbe11ccc797 | |
parent | ff6116630ad77b2afd348bbf81c8af2eccfa8163 (diff) | |
download | mongo-710cefca98db7c8f7736a79cebca855b99509235.tar.gz |
SERVER-28376 fixed jstests/ssl and jstests/sslSpecial tests to not require node 0 as primary
-rw-r--r-- | jstests/ssl/initial_sync1_x509.js | 5 | ||||
-rw-r--r-- | jstests/ssl/upgrade_to_x509_ssl.js | 7 | ||||
-rw-r--r-- | jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js | 7 |
3 files changed, 14 insertions, 5 deletions
diff --git a/jstests/ssl/initial_sync1_x509.js b/jstests/ssl/initial_sync1_x509.js index 96a707c6e17..596d76b4247 100644 --- a/jstests/ssl/initial_sync1_x509.js +++ b/jstests/ssl/initial_sync1_x509.js @@ -28,7 +28,10 @@ function runInitialSyncTest() { nodes: {node0: x509_options1, node1: x509_options2}, }); var conns = replTest.startSet(); - replTest.initiate( + + // ReplSetTest.initiate() requires all nodes to be to be authorized to run replSetGetStatus. + // TODO(SERVER-14017): Remove this in favor of using initiate() everywhere. + replTest.initiateWithAnyNodeAsPrimary( Object.extend(replTest.getReplSetConfig(), {writeConcernMajorityJournalDefault: wcMajorityJournalDefault})); diff --git a/jstests/ssl/upgrade_to_x509_ssl.js b/jstests/ssl/upgrade_to_x509_ssl.js index 0a0a3338de8..83c38b0a62c 100644 --- a/jstests/ssl/upgrade_to_x509_ssl.js +++ b/jstests/ssl/upgrade_to_x509_ssl.js @@ -46,8 +46,11 @@ var rst = new ReplSetTest({ nodeOptions: opts, }); rst.startSet(); -rst.initiate(Object.extend(rst.getReplSetConfig(), - {writeConcernMajorityJournalDefault: wcMajorityJournalDefault})); + +// ReplSetTest.initiate() requires all nodes to be to be authorized to run replSetGetStatus. +// TODO(SERVER-14017): Remove this in favor of using initiate() everywhere. +rst.initiateWithAnyNodeAsPrimary(Object.extend( + rst.getReplSetConfig(), {writeConcernMajorityJournalDefault: wcMajorityJournalDefault})); // Connect to master and do some basic operations var rstConn1 = rst.getPrimary(); diff --git a/jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js b/jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js index 990f4983a91..5c8467e3be5 100644 --- a/jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js +++ b/jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js @@ -39,8 +39,11 @@ opts = { var NUM_NODES = 3; var rst = new ReplSetTest({name: 'sslSet', nodes: NUM_NODES, nodeOptions: opts}); rst.startSet(); -rst.initiate(Object.extend(rst.getReplSetConfig(), - {writeConcernMajorityJournalDefault: wcMajorityJournalDefault})); + +// ReplSetTest.initiate() requires all nodes to be to be authorized to run replSetGetStatus. +// TODO(SERVER-14017): Remove this in favor of using initiate() everywhere. +rst.initiateWithAnyNodeAsPrimary(Object.extend( + rst.getReplSetConfig(), {writeConcernMajorityJournalDefault: wcMajorityJournalDefault})); // Connect to master and do some basic operations var rstConn1 = rst.getPrimary(); |