diff options
-rw-r--r-- | jstests/replsets/initial_sync_fails_on_rollback.js | 5 | ||||
-rw-r--r-- | jstests/replsets/initial_sync_survives_network_error.js | 5 | ||||
-rw-r--r-- | src/mongo/db/repl/abstract_oplog_fetcher.cpp | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/jstests/replsets/initial_sync_fails_on_rollback.js b/jstests/replsets/initial_sync_fails_on_rollback.js index 2df926f4e9c..4bd98e0f960 100644 --- a/jstests/replsets/initial_sync_fails_on_rollback.js +++ b/jstests/replsets/initial_sync_fails_on_rollback.js @@ -41,9 +41,8 @@ const initialSyncNode = rollbackTest.add({ setParameter: { 'failpoint.initialSyncHangBeforeCopyingDatabases': tojson({mode: 'alwaysOn'}), 'collectionClonerBatchSize': 10, - // TODO(SERVER-43279): Stopping the oplog fetcher avoids interference from the oplog - // fetcher failing. When SERVER-43279 is done, this will not be necessary as the oplog - // fetcher will follow the same restart strategy as the cloners. + // This test is specifically testing that the cloners stop, so we turn off the + // oplog fetcher to ensure that we don't inadvertently test that instead. 'failpoint.hangBeforeStartingOplogFetcher': tojson({mode: 'alwaysOn'}), // Make sure our initial sync node only talks to the rolling-back primary. 'failpoint.forceSyncSourceCandidate': diff --git a/jstests/replsets/initial_sync_survives_network_error.js b/jstests/replsets/initial_sync_survives_network_error.js index 0e958224fd8..f12e9caf6ce 100644 --- a/jstests/replsets/initial_sync_survives_network_error.js +++ b/jstests/replsets/initial_sync_survives_network_error.js @@ -23,9 +23,8 @@ const secondary = rst.add({ rsConfig: {priority: 0}, setParameter: { 'failpoint.initialSyncHangBeforeCopyingDatabases': tojson({mode: 'alwaysOn'}), - // TODO(SERVER-43279): Stopping the oplog fetcher avoids interference from the oplog - // fetcher failing. When SERVER-43279 is done, this will not be necessary as the oplog - // fetcher will follow the same restart strategy as the cloners. + // This test is specifically testing that the cloners stop, so we turn off the + // oplog fetcher to ensure that we don't inadvertently test that instead. 'failpoint.hangBeforeStartingOplogFetcher': tojson({mode: 'alwaysOn'}), 'numInitialSyncAttempts': 1, } diff --git a/src/mongo/db/repl/abstract_oplog_fetcher.cpp b/src/mongo/db/repl/abstract_oplog_fetcher.cpp index a9796d16e40..72c8bd0b788 100644 --- a/src/mongo/db/repl/abstract_oplog_fetcher.cpp +++ b/src/mongo/db/repl/abstract_oplog_fetcher.cpp @@ -48,8 +48,6 @@ namespace mongo { namespace repl { namespace { -// TODO(SERVER-43279): This failpoint is needed to test cloner network error behavior until -// OplogFetcher error behavior is made the same. It may be removed if not needed after that. MONGO_FAIL_POINT_DEFINE(hangBeforeStartingOplogFetcher); Counter64 readersCreatedStats; |