SERVER-25197 DatabaseCloner should not override CollectionCloner::_scheduleDbWork function by default

1 files changed, 4 insertions, 5 deletions

diff --git a/src/mongo/db/repl/database_cloner.cpp b/src/mongo/db/repl/database_cloner.cpp
index f8617c1cea1..47e334892eb 100644
--- a/src/mongo/db/repl/database_cloner.cpp
+++ b/src/mongo/db/repl/database_cloner.cpp
@@ -114,9 +114,6 @@ DatabaseCloner::DatabaseCloner(executor::TaskExecutor* executor,
                                   numListCollectionsRetries,
                                   executor::RemoteCommandRequest::kNoTimeout,
                                   RemoteCommandRetryScheduler::kAllRetriableErrors)),
-      _scheduleDbWorkFn([this](const executor::TaskExecutor::CallbackFn& work) {
-          return _executor->scheduleWork(work);
-      }),
       _startCollectionCloner([](CollectionCloner& cloner) { return cloner.start(); }) {
     // Fetcher throws an exception on null executor.
     invariant(executor);
@@ -332,8 +329,10 @@ void DatabaseCloner::_listCollectionsCallback(const StatusWith<Fetcher::QueryRes
         }
     }
 
-    for (auto&& collectionCloner : _collectionCloners) {
-        collectionCloner.setScheduleDbWorkFn_forTest(_scheduleDbWorkFn);
+    if (_scheduleDbWorkFn) {
+        for (auto&& collectionCloner : _collectionCloners) {
+            collectionCloner.setScheduleDbWorkFn_forTest(_scheduleDbWorkFn);
+        }
     }
 
     // Start first collection cloner.