SERVER-37270 Remove foreground index builds by default

1 files changed, 11 insertions, 0 deletions

diff --git a/src/mongo/db/service_context.cpp b/src/mongo/db/service_context.cpp
index da1040ca6d8..f0b2dbbf44a 100644
--- a/src/mongo/db/service_context.cpp
+++ b/src/mongo/db/service_context.cpp
@@ -225,6 +225,9 @@ void ServiceContext::ClientDeleter::operator()(Client* client) const {
     {
         stdx::lock_guard<stdx::mutex> lk(service->_mutex);
         invariant(service->_clients.erase(client));
+        if (service->_clients.empty()) {
+            service->_clientsEmptyCondVar.notify_all();
+        }
     }
     onDestroy(client, service->_clientObservers);
     delete client;
@@ -342,6 +345,14 @@ void ServiceContext::waitForStartupComplete() {
     _startupCompleteCondVar.wait(lk, [this] { return _startupComplete; });
 }
 
+void ServiceContext::waitForClientsToFinish() {
+    stdx::unique_lock<stdx::mutex> lk(_mutex);
+    for (const auto& client : _clients) {
+        log() << "Waiting for client " << client->desc() << " to exit";
+    }
+    _clientsEmptyCondVar.wait(lk, [this] { return _clients.empty(); });
+}
+
 void ServiceContext::notifyStartupComplete() {
     stdx::unique_lock<stdx::mutex> lk(_mutex);
     _startupComplete = true;