SERVER-42521 Add logging to waitUntilNoIndexBuildsRemain() to display the UUIDs of all remaining index builds

2 files changed, 30 insertions, 2 deletions

diff --git a/src/mongo/db/collection_index_builds_tracker.cpp b/src/mongo/db/collection_index_builds_tracker.cpp
index 141bcf0bcbc..17f62d1a644 100644
--- a/src/mongo/db/collection_index_builds_tracker.cpp
+++ b/src/mongo/db/collection_index_builds_tracker.cpp
@@ -27,11 +27,14 @@
  *    it in the license file.
  */
 
+#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kIndex
+
 #include "mongo/platform/basic.h"
 
 #include "mongo/db/collection_index_builds_tracker.h"
 
 #include "mongo/db/catalog/index_builds_manager.h"
+#include "mongo/util/log.h"
 
 namespace mongo {
 
@@ -103,7 +106,18 @@ int CollectionIndexBuildsTracker::getNumberOfIndexBuilds(WithLock) const {
 
 void CollectionIndexBuildsTracker::waitUntilNoIndexBuildsRemain(
     stdx::unique_lock<stdx::mutex>& lk) {
-    _noIndexBuildsRemainCondVar.wait(lk, [&] { return _buildStateByBuildUUID.empty(); });
+    _noIndexBuildsRemainCondVar.wait(lk, [&] {
+        if (_buildStateByBuildUUID.empty()) {
+            return true;
+        }
+
+        log() << "Waiting until the following index builds are finished:";
+        for (const auto& indexBuild : _buildStateByBuildUUID) {
+            log() << "    Index build with UUID: " << indexBuild.first;
+        }
+
+        return false;
+    });
 }
 
 }  // namespace mongo
diff --git a/src/mongo/db/database_index_builds_tracker.cpp b/src/mongo/db/database_index_builds_tracker.cpp
index 6e31c8ffeff..03097a4844a 100644
--- a/src/mongo/db/database_index_builds_tracker.cpp
+++ b/src/mongo/db/database_index_builds_tracker.cpp
@@ -27,11 +27,14 @@
  *    it in the license file.
  */
 
+#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kIndex
+
 #include "mongo/platform/basic.h"
 
 #include "mongo/db/database_index_builds_tracker.h"
 
 #include "mongo/db/catalog/index_builds_manager.h"
+#include "mongo/util/log.h"
 
 namespace mongo {
 
@@ -72,7 +75,18 @@ int DatabaseIndexBuildsTracker::getNumberOfIndexBuilds(WithLock) const {
 }
 
 void DatabaseIndexBuildsTracker::waitUntilNoIndexBuildsRemain(stdx::unique_lock<stdx::mutex>& lk) {
-    _noIndexBuildsRemainCondVar.wait(lk, [&] { return _allIndexBuilds.empty(); });
+    _noIndexBuildsRemainCondVar.wait(lk, [&] {
+        if (_allIndexBuilds.empty()) {
+            return true;
+        }
+
+        log() << "Waiting until the following index builds are finished:";
+        for (const auto& indexBuild : _allIndexBuilds) {
+            log() << "    Index build with UUID: " << indexBuild.first;
+        }
+
+        return false;
+    });
 }
 
 }  // namespace mongo