summaryrefslogtreecommitdiff
path: root/jstests/replsets
diff options
context:
space:
mode:
Diffstat (limited to 'jstests/replsets')
-rw-r--r--jstests/replsets/initial_sync_drop_collection.js105
-rw-r--r--jstests/replsets/initial_sync_rename_collection.js207
2 files changed, 264 insertions, 48 deletions
diff --git a/jstests/replsets/initial_sync_drop_collection.js b/jstests/replsets/initial_sync_drop_collection.js
index cd6b6aaee08..de375ffc73c 100644
--- a/jstests/replsets/initial_sync_drop_collection.js
+++ b/jstests/replsets/initial_sync_drop_collection.js
@@ -1,16 +1,11 @@
-// Test that CollectionCloner completes without error when a collection is dropped during cloning.
+/**
+ * Test that CollectionCloner completes without error when a collection is dropped during cloning.
+ * @tags: [requires_fcv_44]
+ */
(function() {
"use strict";
-// TODO(SERVER-43277): This test is disabled while we work on the Resumable Initial Sync
-// project
-/* eslint-disable no-unreachable */
-return;
-
-// Skip db hash check because secondary cannot complete initial sync.
-TestData.skipCheckDBHashes = true;
-
load("jstests/libs/fail_point_util.js");
load('jstests/replsets/libs/two_phase_drops.js');
load("jstests/libs/uuid_util.js");
@@ -30,7 +25,6 @@ var secondaryDB = secondary.getDB(dbName);
const collName = "testcoll";
var primaryColl = primaryDB[collName];
var secondaryColl = secondaryDB[collName];
-var pRenameColl = primaryDB["r_" + collName];
var nss = primaryColl.getFullName();
// This function adds data to the collection, restarts the secondary node with the given
@@ -38,13 +32,14 @@ var nss = primaryColl.getFullName();
// drops the collection, then disables the failpoint. It then optionally waits for the
// expectedLog message and waits for the secondary to complete initial sync, then ensures
// the collection on the secondary is empty.
-function setupTest({failPoint, secondaryStartupParams}) {
+function setupTest({failPoint, extraFailPointData, secondaryStartupParams}) {
jsTestLog("Writing data to collection.");
assert.commandWorked(primaryColl.insert([{_id: 1}, {_id: 2}]));
+ const data = Object.merge(extraFailPointData || {}, {nss: nss});
jsTestLog("Restarting secondary with failPoint " + failPoint + " set for " + nss);
secondaryStartupParams = secondaryStartupParams || {};
- secondaryStartupParams['failpoint.' + failPoint] = tojson({mode: 'alwaysOn', data: {nss: nss}});
+ secondaryStartupParams['failpoint.' + failPoint] = tojson({mode: 'alwaysOn', data: data});
// Skip clearing initial sync progress after a successful initial sync attempt so that we
// can check initialSyncStatus fields after initial sync is complete.
secondaryStartupParams['failpoint.skipClearInitialSyncState'] = tojson({mode: 'alwaysOn'});
@@ -67,9 +62,9 @@ function setupTest({failPoint, secondaryStartupParams}) {
replTest.waitForState(secondary, ReplSetTest.State.STARTUP_2);
}
-function finishTest({failPoint, secondaryStartupParams, expectedLog, waitForDrop, createNew}) {
+function finishTest({failPoint, expectedLog, waitForDrop, createNew}) {
// Get the uuid for use in checking the log line.
- let uuid = getUUIDFromListCollections(primaryDB, collName);
+ const uuid = extractUUIDFromObject(getUUIDFromListCollections(primaryDB, collName));
jsTestLog("Dropping collection on primary: " + primaryColl.getFullName());
assert(primaryColl.drop());
@@ -79,6 +74,16 @@ function finishTest({failPoint, secondaryStartupParams, expectedLog, waitForDrop
TwoPhaseDropCollectionTest.waitForDropToComplete(primaryDB, collName);
}
+ // Only set for test cases that use 'system.drop' namespaces when dropping collections.
+ // In those tests the variable 'rnss' represents such a namespace. Used for expectedLog.
+ // See test cases 3 and 4 below.
+ let rnss;
+ const dropPendingColl =
+ TwoPhaseDropCollectionTest.collectionIsPendingDropInDatabase(primaryDB, collName);
+ if (dropPendingColl) {
+ rnss = dbName + "." + dropPendingColl["name"];
+ }
+
if (createNew) {
jsTestLog("Creating a new collection with the same name: " + primaryColl.getFullName());
assert.commandWorked(primaryColl.insert({_id: "not the same collection"}));
@@ -112,68 +117,72 @@ function runDropTest(params) {
finishTest(params);
}
-jsTestLog("Testing dropping between listIndexes and find.");
-runDropTest({failPoint: "initialSyncHangCollectionClonerBeforeEstablishingCursor"});
+jsTestLog("[1] Testing dropping between listIndexes and find.");
+runDropTest({
+ failPoint: "hangBeforeClonerStage",
+ extraFailPointData: {cloner: "CollectionCloner", stage: "query"}
+});
+
+jsTestLog(
+ "[2] Testing dropping between listIndexes and find, with new same-name collection created.");
+runDropTest({
+ failPoint: "hangBeforeClonerStage",
+ extraFailPointData: {cloner: "CollectionCloner", stage: "query"},
+ createNew: true
+});
+
+let expectedLogFor3and4 =
+ "`CollectionCloner ns: '${nss}' uuid: UUID(\"${uuid}\") stopped because collection was dropped on source.`";
-jsTestLog("Testing dropping between listIndexes and find, with new same-name collection created.");
-runDropTest(
- {failPoint: "initialSyncHangCollectionClonerBeforeEstablishingCursor", createNew: true});
+// We don't support 4.2 style two-phase drops with EMRC=false - in that configuration, the
+// collection will instead be renamed to a <db>.system.drop.* namespace before being dropped. Since
+// the cloner queries collection by UUID, it will observe the first drop phase as a rename.
+// We still want to check that initial sync succeeds in such a case.
+if (TwoPhaseDropCollectionTest.supportsDropPendingNamespaces(replTest)) {
+ expectedLogFor3and4 =
+ "`Initial Sync retrying CollectionCloner stage query due to QueryPlanKilled: collection renamed from '${nss}' to '${rnss}'. UUID ${uuid}`";
+}
-jsTestLog("Testing drop-pending between getMore calls.");
+jsTestLog("[3] Testing drop-pending between getMore calls.");
runDropTest({
failPoint: "initialSyncHangCollectionClonerAfterHandlingBatchResponse",
secondaryStartupParams: {collectionClonerBatchSize: 1},
- expectedLog:
- "`CollectionCloner ns: '${nss}' uuid: ${uuid} stopped because collection was dropped.`"
+ expectedLog: expectedLogFor3and4
});
-jsTestLog("Testing drop-pending with new same-name collection created, between getMore calls.");
+jsTestLog("[4] Testing drop-pending with new same-name collection created, between getMore calls.");
runDropTest({
failPoint: "initialSyncHangCollectionClonerAfterHandlingBatchResponse",
secondaryStartupParams: {collectionClonerBatchSize: 1},
- expectedLog:
- "`CollectionCloner ns: '${nss}' uuid: ${uuid} stopped because collection was dropped.`",
+ expectedLog: expectedLogFor3and4,
createNew: true
});
-jsTestLog("Testing committed drop between getMore calls.");
-
// Add another node to the set, so when we drop the collection it can commit. This other
// secondary will be finished with initial sync when the drop happens.
var secondary2 = replTest.add({rsConfig: {priority: 0}});
replTest.reInitiate();
replTest.waitForState(secondary2, ReplSetTest.State.SECONDARY);
+jsTestLog("[5] Testing committed drop between getMore calls.");
runDropTest({
failPoint: "initialSyncHangCollectionClonerAfterHandlingBatchResponse",
secondaryStartupParams: {collectionClonerBatchSize: 1},
waitForDrop: true,
expectedLog:
- "`CollectionCloner ns: '${nss}' uuid: ${uuid} stopped because collection was dropped.`"
+ "`CollectionCloner ns: '${nss}' uuid: UUID(\"${uuid}\") stopped because collection was dropped on source.`"
});
-jsTestLog("Testing rename between getMores.");
-setupTest({
+jsTestLog(
+ "[6] Testing committed drop with new same-name collection created, between getMore calls.");
+runDropTest({
failPoint: "initialSyncHangCollectionClonerAfterHandlingBatchResponse",
secondaryStartupParams: {collectionClonerBatchSize: 1},
+ waitForDrop: true,
+ expectedLog:
+ "`CollectionCloner ns: '${nss}' uuid: UUID(\"${uuid}\") stopped because collection was dropped on source.`",
+ createNew: true
});
-jsTestLog("Renaming collection on primary");
-assert.commandWorked(primary.adminCommand({
- renameCollection: primaryColl.getFullName(),
- to: pRenameColl.getFullName(),
- dropTarget: false
-}));
-
-jsTestLog("Allowing secondary to continue.");
-// Make sure we don't reach the fassert() indicating initial sync failure.
-assert.commandWorked(
- secondary.adminCommand({configureFailPoint: "initialSyncHangBeforeFinish", mode: 'alwaysOn'}));
-
-assert.commandWorked(secondary.adminCommand({
- configureFailPoint: "initialSyncHangCollectionClonerAfterHandlingBatchResponse",
- mode: 'off'
-}));
-jsTestLog("Waiting for initial sync to complete.");
-checkLog.contains(secondary, "The maximum number of retries have been exhausted for initial sync.");
+
replTest.stopSet();
})();
diff --git a/jstests/replsets/initial_sync_rename_collection.js b/jstests/replsets/initial_sync_rename_collection.js
new file mode 100644
index 00000000000..cc07397cd90
--- /dev/null
+++ b/jstests/replsets/initial_sync_rename_collection.js
@@ -0,0 +1,207 @@
+/**
+ * Test that CollectionCloner completes without error when a collection is renamed during cloning.
+ * @tags: [requires_fcv_44]
+ */
+
+(function() {
+"use strict";
+
+load("jstests/libs/fail_point_util.js");
+load("jstests/libs/uuid_util.js");
+load('jstests/replsets/libs/two_phase_drops.js');
+
+// Set up replica set. Disallow chaining so nodes always sync from primary.
+const testName = "initial_sync_rename_collection";
+const dbName = testName;
+const replTest = new ReplSetTest(
+ {name: testName, nodes: [{}, {rsConfig: {priority: 0}}], settings: {chainingAllowed: false}});
+replTest.startSet();
+replTest.initiate();
+
+const collName = "testcoll";
+const primary = replTest.getPrimary();
+const primaryDB = primary.getDB(dbName);
+const primaryColl = primaryDB[collName];
+const pRenameColl = primaryDB["r_" + collName];
+
+// Used for cross-DB renames.
+const secondDbName = testName + "_cross";
+const primarySecondDB = primary.getDB(secondDbName);
+const pCrossDBRenameColl = primarySecondDB[collName + "_cross"];
+
+const nss = primaryColl.getFullName();
+const rnss = pRenameColl.getFullName();
+let secondary = replTest.getSecondary();
+let secondaryDB = secondary.getDB(dbName);
+let secondaryColl = secondaryDB[collName];
+
+// This function adds data to the collection, restarts the secondary node with the given
+// parameters and setting the given failpoint, waits for the failpoint to be hit,
+// renames the collection, then disables the failpoint. It then optionally waits for the
+// expectedLog message and waits for the secondary to complete initial sync, then ensures
+// the collection on the secondary has been properly cloned.
+function setupTest({failPoint, extraFailPointData, secondaryStartupParams}) {
+ jsTestLog("Writing data to collection.");
+ assert.commandWorked(primaryColl.insert([{_id: 1}, {_id: 2}]));
+ const data = Object.merge(extraFailPointData || {}, {nss: nss});
+
+ jsTestLog("Restarting secondary with failPoint " + failPoint + " set for " + nss);
+ secondaryStartupParams = secondaryStartupParams || {};
+ secondaryStartupParams['failpoint.' + failPoint] = tojson({mode: 'alwaysOn', data: data});
+ // Skip clearing initial sync progress after a successful initial sync attempt so that we
+ // can check initialSyncStatus fields after initial sync is complete.
+ secondaryStartupParams['failpoint.skipClearInitialSyncState'] = tojson({mode: 'alwaysOn'});
+ secondaryStartupParams['numInitialSyncAttempts'] = 1;
+ secondary =
+ replTest.restart(secondary, {startClean: true, setParameter: secondaryStartupParams});
+ secondaryDB = secondary.getDB(dbName);
+ secondaryColl = secondaryDB[collName];
+
+ jsTestLog("Waiting for secondary to reach failPoint " + failPoint);
+ assert.commandWorked(secondary.adminCommand({
+ waitForFailPoint: failPoint,
+ timesEntered: 1,
+ maxTimeMS: kDefaultWaitForFailPointTimeout
+ }));
+
+ // Restarting the secondary may have resulted in an election. Wait until the system
+ // stabilizes and reaches RS_STARTUP2 state.
+ replTest.getPrimary();
+ replTest.waitForState(secondary, ReplSetTest.State.STARTUP_2);
+}
+
+function finishTest({failPoint, expectedLog, createNew, renameAcrossDBs}) {
+ // Get the uuid for use in checking the log line.
+ const uuid = extractUUIDFromObject(getUUIDFromListCollections(primaryDB, collName));
+ const target = (renameAcrossDBs ? pCrossDBRenameColl : pRenameColl);
+
+ jsTestLog("Renaming collection on primary: " + target.getFullName());
+ assert.commandWorked(primary.adminCommand({
+ renameCollection: primaryColl.getFullName(),
+ to: target.getFullName(),
+ dropTarget: false
+ }));
+
+ // Only set for test cases that use 'system.drop' namespaces when dropping collections.
+ // In those tests the variable 'dropPendingNss' represents such a namespace. Used for
+ // expectedLog. See test cases 6 and 8 below.
+ let dropPendingNss;
+ const dropPendingColl =
+ TwoPhaseDropCollectionTest.collectionIsPendingDropInDatabase(primaryDB, collName);
+ if (dropPendingColl) {
+ dropPendingNss = dbName + "." + dropPendingColl["name"];
+ }
+
+ if (createNew) {
+ jsTestLog("Creating a new collection with the same name: " + primaryColl.getFullName());
+ assert.commandWorked(primaryColl.insert({_id: "not the same collection"}));
+ }
+
+ jsTestLog("Allowing secondary to continue.");
+ assert.commandWorked(secondary.adminCommand({configureFailPoint: failPoint, mode: 'off'}));
+
+ if (expectedLog) {
+ jsTestLog(eval(expectedLog));
+ checkLog.contains(secondary, eval(expectedLog));
+ }
+
+ jsTestLog("Waiting for initial sync to complete.");
+ replTest.waitForState(secondary, ReplSetTest.State.SECONDARY);
+
+ let res = assert.commandWorked(secondary.adminCommand({replSetGetStatus: 1}));
+ assert.eq(0, res.initialSyncStatus.failedInitialSyncAttempts);
+
+ if (createNew) {
+ assert.eq([{_id: "not the same collection"}], secondaryColl.find().toArray());
+ assert(primaryColl.drop());
+ } else {
+ assert.eq(0, secondaryColl.find().itcount());
+ }
+ replTest.checkReplicatedDataHashes();
+
+ // Drop the renamed collection so we can start fresh the next time around.
+ assert(target.drop());
+}
+
+function runRenameTest(params) {
+ setupTest(params);
+ finishTest(params);
+}
+
+jsTestLog("[1] Testing rename between listIndexes and find.");
+runRenameTest({
+ failPoint: "hangBeforeClonerStage",
+ extraFailPointData: {cloner: "CollectionCloner", stage: "query"}
+});
+
+jsTestLog("[2] Testing cross-DB rename between listIndexes and find.");
+runRenameTest({
+ failPoint: "hangBeforeClonerStage",
+ extraFailPointData: {cloner: "CollectionCloner", stage: "query"},
+ renameAcrossDBs: true
+});
+
+jsTestLog(
+ "[3] Testing rename between listIndexes and find, with new same-name collection created.");
+runRenameTest({
+ failPoint: "hangBeforeClonerStage",
+ extraFailPointData: {cloner: "CollectionCloner", stage: "query"},
+ createNew: true
+});
+
+jsTestLog(
+ "[4] Testing cross-DB rename between listIndexes and find, with new same-name collection created.");
+runRenameTest({
+ failPoint: "hangBeforeClonerStage",
+ extraFailPointData: {cloner: "CollectionCloner", stage: "query"},
+ createNew: true,
+ renameAcrossDBs: true
+});
+
+jsTestLog("[5] Testing rename between getMores.");
+runRenameTest({
+ failPoint: "initialSyncHangCollectionClonerAfterHandlingBatchResponse",
+ secondaryStartupParams: {collectionClonerBatchSize: 1},
+ expectedLog:
+ "`Initial Sync retrying CollectionCloner stage query due to QueryPlanKilled: collection renamed from '${nss}' to '${rnss}'. UUID ${uuid}`"
+});
+
+// A cross-DB rename will appear as a drop in the context of the source DB.
+let expectedLogFor6and8 =
+ "`CollectionCloner ns: '${nss}' uuid: UUID(\"${uuid}\") stopped because collection was dropped on source.`";
+
+// We don't support 4.2 style two-phase drops with EMRC=false - in that configuration, the
+// collection will instead be renamed to a <db>.system.drop.* namespace before being dropped. Since
+// the cloner queries collection by UUID, it will observe the first drop phase as a rename.
+// We still want to check that initial sync succeeds in such a case.
+if (TwoPhaseDropCollectionTest.supportsDropPendingNamespaces(replTest)) {
+ expectedLogFor6and8 =
+ "`Initial Sync retrying CollectionCloner stage query due to QueryPlanKilled: collection renamed from '${nss}' to '${dropPendingNss}'. UUID ${uuid}`";
+}
+
+jsTestLog("[6] Testing cross-DB rename between getMores.");
+runRenameTest({
+ failPoint: "initialSyncHangCollectionClonerAfterHandlingBatchResponse",
+ secondaryStartupParams: {collectionClonerBatchSize: 1},
+ renameAcrossDBs: true,
+ expectedLog: expectedLogFor6and8
+});
+
+jsTestLog("[7] Testing rename with new same-name collection created, between getMores.");
+runRenameTest({
+ failPoint: "initialSyncHangCollectionClonerAfterHandlingBatchResponse",
+ secondaryStartupParams: {collectionClonerBatchSize: 1},
+ expectedLog:
+ "`Initial Sync retrying CollectionCloner stage query due to QueryPlanKilled: collection renamed from '${nss}' to '${rnss}'. UUID ${uuid}`"
+});
+
+jsTestLog("[8] Testing cross-DB rename with new same-name collection created, between getMores.");
+runRenameTest({
+ failPoint: "initialSyncHangCollectionClonerAfterHandlingBatchResponse",
+ secondaryStartupParams: {collectionClonerBatchSize: 1},
+ renameAcrossDBs: true,
+ expectedLog: expectedLogFor6and8
+});
+
+replTest.stopSet();
+})(); \ No newline at end of file
View Lorry Controller Status