SERVER-43639 IndexBuildsCoordinator::commitIndexBuild() returns void

3 files changed, 9 insertions, 10 deletions

diff --git a/src/mongo/db/index_builds_coordinator.cpp b/src/mongo/db/index_builds_coordinator.cpp
index 6308c20c217..16a9cee8ae4 100644
--- a/src/mongo/db/index_builds_coordinator.cpp
+++ b/src/mongo/db/index_builds_coordinator.cpp
@@ -369,9 +369,9 @@ void IndexBuildsCoordinator::abortDatabaseIndexBuilds(StringData db, const std::
     dbIndexBuilds->waitUntilNoIndexBuildsRemain(lk);
 }
 
-Status IndexBuildsCoordinator::commitIndexBuild(OperationContext* opCtx,
-                                                const std::vector<BSONObj>& specs,
-                                                const UUID& buildUUID) {
+void IndexBuildsCoordinator::commitIndexBuild(OperationContext* opCtx,
+                                              const std::vector<BSONObj>& specs,
+                                              const UUID& buildUUID) {
     auto replState = uassertStatusOK(_getIndexBuild(buildUUID));
 
     stdx::unique_lock<Latch> lk(replState->mutex);
@@ -379,8 +379,6 @@ Status IndexBuildsCoordinator::commitIndexBuild(OperationContext* opCtx,
     replState->commitTimestamp = opCtx->recoveryUnit()->getCommitTimestamp();
     invariant(!replState->commitTimestamp.isNull(), buildUUID.toString());
     replState->condVar.notify_all();
-
-    return Status::OK();
 }
 
 void IndexBuildsCoordinator::abortIndexBuildByBuildUUID(OperationContext* opCtx,
diff --git a/src/mongo/db/index_builds_coordinator.h b/src/mongo/db/index_builds_coordinator.h
index 68670be5263..175c6bbad95 100644
--- a/src/mongo/db/index_builds_coordinator.h
+++ b/src/mongo/db/index_builds_coordinator.h
@@ -146,9 +146,9 @@ public:
     /**
      * Commits the index build identified by 'buildUUID'.
      */
-    Status commitIndexBuild(OperationContext* opCtx,
-                            const std::vector<BSONObj>& specs,
-                            const UUID& buildUUID);
+    void commitIndexBuild(OperationContext* opCtx,
+                          const std::vector<BSONObj>& specs,
+                          const UUID& buildUUID);
 
     /**
      * Waits for all index builds to stop after they have been interrupted during shutdown.
diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp
index 2d3830562e5..ae1e766532b 100644
--- a/src/mongo/db/repl/oplog.cpp
+++ b/src/mongo/db/repl/oplog.cpp
@@ -212,8 +212,9 @@ Status commitIndexBuild(OperationContext* opCtx,
     if (!statusWithIndexes.isOK()) {
         return statusWithIndexes.getStatus();
     }
-    return IndexBuildsCoordinator::get(opCtx)->commitIndexBuild(
-        opCtx, statusWithIndexes.getValue(), indexBuildUUID);
+    auto indexBuildsCoord = IndexBuildsCoordinator::get(opCtx);
+    indexBuildsCoord->commitIndexBuild(opCtx, statusWithIndexes.getValue(), indexBuildUUID);
+    return Status::OK();
 }
 
 Status abortIndexBuild(OperationContext* opCtx,