From d296e1dfed119fb3ef9d4907ac1875480f1408c8 Mon Sep 17 00:00:00 2001 From: Geert Bosch Date: Wed, 2 Aug 2017 18:39:55 -0400 Subject: SERVER-4941 Allow renameCollection during initial sync --- jstests/replsets/initial_sync_applier_error.js | 1 - jstests/replsets/initial_sync_rename_collection.js | 3 +-- jstests/replsets/initial_sync_rename_collection_unsafe.js | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'jstests/replsets') diff --git a/jstests/replsets/initial_sync_applier_error.js b/jstests/replsets/initial_sync_applier_error.js index 9816e92fd74..7a280242024 100644 --- a/jstests/replsets/initial_sync_applier_error.js +++ b/jstests/replsets/initial_sync_applier_error.js @@ -44,7 +44,6 @@ assert.commandWorked(secondary.getDB('admin').runCommand( {configureFailPoint: 'initialSyncHangBeforeCopyingDatabases', mode: 'off'})); - checkLog.contains(secondary, 'Applying renameCollection not supported'); checkLog.contains(secondary, 'initial sync done'); replSet.awaitReplication(); diff --git a/jstests/replsets/initial_sync_rename_collection.js b/jstests/replsets/initial_sync_rename_collection.js index b8736b5274d..fdb77ea6da4 100644 --- a/jstests/replsets/initial_sync_rename_collection.js +++ b/jstests/replsets/initial_sync_rename_collection.js @@ -26,8 +26,7 @@ rst.awaitReplication(); jsTestLog('Bring up a new node'); - // TODO(SERVER-4941): Only a single initial sync attempt should be necessary. - const secondary = rst.add({setParameter: 'numInitialSyncAttempts=3'}); + const secondary = rst.add({setParameter: 'numInitialSyncAttempts=1'}); rst.reInitiate(); assert.eq(primary, rst.getPrimary(), 'Primary changed after reconfig'); diff --git a/jstests/replsets/initial_sync_rename_collection_unsafe.js b/jstests/replsets/initial_sync_rename_collection_unsafe.js index a08143ba735..13e58b1503a 100644 --- a/jstests/replsets/initial_sync_rename_collection_unsafe.js +++ b/jstests/replsets/initial_sync_rename_collection_unsafe.js @@ -17,6 +17,7 @@ const dbName = 'd'; const primary = rst.getPrimary(); const primaryDB = primary.getDB(dbName); + assert.commandWorked(primary.adminCommand({setFeatureCompatibilityVersion:"3.4"})); assert.writeOK(primaryDB['foo'].save({})); -- cgit v1.2.1