SERVER-39002 IndexBuildsCoordinator::abortIndexBuildByBuildUUID() returns void

Author: benety

src/mongo/db/commands/create_indexes.cpp

@@ -717,24 +717,22 @@ bool runCreateIndexesWithCoordinator(OperationContext* opCtx,
             // with the assumption that if the index build was already in the midst of tearing down,
             // this be a no-op.
             log() << "Index build interrupted: " << buildUUID << ": aborting index build.";
-            auto abortIndexFuture = indexBuildsCoord->abortIndexBuildByBuildUUID(
+            indexBuildsCoord->abortIndexBuildByBuildUUID(
                 opCtx,
                 buildUUID,
                 str::stream() << "Index build interrupted: " << buildUUID << ": "
                               << interruptionEx.toString());
-            log() << "Index build aborted: " << buildUUID << ": "
-                  << abortIndexFuture.getNoThrow(opCtx);
+            log() << "Index build aborted: " << buildUUID;
             throw;
         } catch (const ExceptionForCat<ErrorCategory::NotMasterError>& ex) {
             log() << "Index build interrupted: " << buildUUID
                   << ": aborting index build due to change in replication state.";
-            auto abortIndexFuture = indexBuildsCoord->abortIndexBuildByBuildUUID(
+            indexBuildsCoord->abortIndexBuildByBuildUUID(
                 opCtx,
                 buildUUID,
                 str::stream() << "Index build interrupted due to change in replication state: "
                               << buildUUID << ": " << ex.toString());
-            log() << "Index build aborted due to NotMaster error: " << buildUUID << ": "
-                  << abortIndexFuture.getNoThrow(opCtx);
+            log() << "Index build aborted due to NotMaster error: " << buildUUID;
             throw;
         }
 

src/mongo/db/index_builds_coordinator.cpp

@@ -355,9 +355,9 @@ Status IndexBuildsCoordinator::commitIndexBuild(OperationContext* opCtx,
     return Status::OK();
 }
 
-Future<void> IndexBuildsCoordinator::abortIndexBuildByBuildUUID(OperationContext* opCtx,
-                                                                const UUID& buildUUID,
-                                                                const std::string& reason) {
+void IndexBuildsCoordinator::abortIndexBuildByBuildUUID(OperationContext* opCtx,
+                                                        const UUID& buildUUID,
+                                                        const std::string& reason) {
     _indexBuildsManager.abortIndexBuild(buildUUID, reason);
 
     auto replStateResult = _getIndexBuild(buildUUID);
@@ -370,11 +370,6 @@ Future<void> IndexBuildsCoordinator::abortIndexBuildByBuildUUID(OperationContext
         replState->abortReason = reason;
         replState->condVar.notify_all();
     }
-
-    auto pf = makePromiseFuture<void>();
-    auto promise = std::move(pf.promise);
-    promise.setWith([] {});
-    return std::move(pf.future);
 }
 
 void IndexBuildsCoordinator::recoverIndexBuilds() {

src/mongo/db/index_builds_coordinator.h

@@ -207,9 +207,9 @@ class IndexBuildsCoordinator {
     /**
      * Aborts a given index build by index build UUID.
      */
-    Future<void> abortIndexBuildByBuildUUID(OperationContext* opCtx,
-                                            const UUID& buildUUID,
-                                            const std::string& reason);
+    void abortIndexBuildByBuildUUID(OperationContext* opCtx,
+                                    const UUID& buildUUID,
+                                    const std::string& reason);
 
     /**
      * TODO: This is not yet implemented.

src/mongo/db/repl/oplog.cpp

@@ -221,11 +221,11 @@ Status abortIndexBuild(OperationContext* opCtx,
                        const Status& cause,
                        OplogApplication::Mode mode) {
     // Wait until the index build finishes aborting.
-    Future<void> abort = IndexBuildsCoordinator::get(opCtx)->abortIndexBuildByBuildUUID(
+    IndexBuildsCoordinator::get(opCtx)->abortIndexBuildByBuildUUID(
         opCtx,
         indexBuildUUID,
         str::stream() << "abortIndexBuild oplog entry encountered: " << cause);
-    return abort.waitNoThrow();
+    return Status::OK();
 }
 
 void createIndexForApplyOps(OperationContext* opCtx,