SERVER-18035 clean up collection and database cloners to not hold mutex when reporting completion status

1 files changed, 10 insertions, 3 deletions

diff --git a/src/mongo/db/repl/base_cloner_test_fixture.cpp b/src/mongo/db/repl/base_cloner_test_fixture.cpp
index 75bc0b7b886..92518498300 100644
--- a/src/mongo/db/repl/base_cloner_test_fixture.cpp
+++ b/src/mongo/db/repl/base_cloner_test_fixture.cpp
@@ -106,10 +106,12 @@ namespace repl {
         ReplicationExecutorTest::setUp();
         clear();
         launchExecutorThread();
+        storageInterface.reset(new StorageInterfaceMock());
     }
 
     void BaseClonerTest::tearDown() {
         ReplicationExecutorTest::tearDown();
+        storageInterface.reset();
     }
 
     void BaseClonerTest::clear() {
@@ -117,18 +119,18 @@ namespace repl {
     }
 
     void BaseClonerTest::setStatus(const Status& status) {
-        boost::unique_lock<boost::mutex> lk(_mutex);
+        stdx::unique_lock<stdx::mutex> lk(_mutex);
         _status = status;
         _setStatusCondition.notify_all();
     }
 
     const Status& BaseClonerTest::getStatus() const {
-        boost::unique_lock<boost::mutex> lk(_mutex);
+        stdx::unique_lock<stdx::mutex> lk(_mutex);
         return _status;
     }
 
     void BaseClonerTest::waitForStatus() {
-        boost::unique_lock<boost::mutex> lk(_mutex);
+        stdx::unique_lock<stdx::mutex> lk(_mutex);
         if (_status == getDetectableErrorStatus()) {
             try {
                 _setStatusCondition.wait_for(lk, Milliseconds(1000));
@@ -256,5 +258,10 @@ namespace repl {
         return insertDocumentsFn ? insertDocumentsFn(txn, nss, docs) : Status::OK();
     }
 
+    Status StorageInterfaceMock::commitCollection(OperationContext* txn,
+                                                  const NamespaceString& nss) {
+        return Status::OK();
+    }
+
 } // namespace repl
 } // namespace mongo