SERVER-27611 DatabaseCloner::shutdown() should shut down CollectionCloner

2 files changed, 44 insertions, 0 deletions

diff --git a/src/mongo/db/repl/database_cloner.cpp b/src/mongo/db/repl/database_cloner.cpp
index 4a2ed14d72b..224d6d15a08 100644
--- a/src/mongo/db/repl/database_cloner.cpp
+++ b/src/mongo/db/repl/database_cloner.cpp
@@ -191,6 +191,10 @@ void DatabaseCloner::shutdown() {
         if (!_active) {
             return;
         }
+
+        for (auto&& collectionCloner : _collectionCloners) {
+            collectionCloner.shutdown();
+        }
     }
 
     _listCollectionsFetcher.shutdown();
diff --git a/src/mongo/db/repl/database_cloner_test.cpp b/src/mongo/db/repl/database_cloner_test.cpp
index c2e13b2e8a9..5eeca00cfcd 100644
--- a/src/mongo/db/repl/database_cloner_test.cpp
+++ b/src/mongo/db/repl/database_cloner_test.cpp
@@ -568,6 +568,46 @@ TEST_F(DatabaseClonerTest, StartSecondCollectionClonerFailed) {
     ASSERT_EQUALS(errStatus, getStatus());
 }
 
+TEST_F(DatabaseClonerTest, ShutdownCancelsCollectionCloning) {
+    ASSERT_OK(_databaseCloner->startup());
+    auto net = getNet();
+    {
+        executor::NetworkInterfaceMock::InNetworkGuard guard(net);
+
+        assertRemoteCommandNameEquals("listCollections",
+                                      net->scheduleSuccessfulResponse(createListCollectionsResponse(
+                                          0,
+                                          BSON_ARRAY(BSON("name"
+                                                          << "a"
+                                                          << "options"
+                                                          << BSONObj())
+                                                     << BSON("name"
+                                                             << "b"
+                                                             << "options"
+                                                             << BSONObj())))));
+        net->runReadyNetworkOperations();
+
+        // CollectionCloner sends collection count request on startup.
+        // Blackhole count request to leave collection cloner active.
+        auto noi = net->getNextReadyRequest();
+        assertRemoteCommandNameEquals("count", noi->getRequest());
+        ASSERT_EQUALS("a", noi->getRequest().cmdObj.firstElement().String());
+        net->blackHole(noi);
+    }
+
+    _databaseCloner->shutdown();
+
+    // Deliver cancellation event to cloners.
+    executor::NetworkInterfaceMock::InNetworkGuard(net)->runReadyNetworkOperations();
+
+    _databaseCloner->join();
+    ASSERT_FALSE(_databaseCloner->isActive());
+
+    // This is the error code from attempting to start up the last (of 2) collection cloner which
+    // was shut down before it was ever started.
+    ASSERT_EQUALS(ErrorCodes::ShutdownInProgress, getStatus());
+}
+
 TEST_F(DatabaseClonerTest, FirstCollectionListIndexesFailed) {
     ASSERT_OK(_databaseCloner->startup());