Revert "SERVER-25114 renamed MultiApplier lifecycle functions"

This reverts commit e9b0b39bbf6a277ab470f7f7ee5bb313d5f1f434.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/mongo/db/repl/multiapplier.cpp b/src/mongo/db/repl/multiapplier.cpp
index ddf690e3897..a2588c474d7 100644
--- a/src/mongo/db/repl/multiapplier.cpp
+++ b/src/mongo/db/repl/multiapplier.cpp
@@ -63,7 +63,7 @@ MultiApplier::MultiApplier(executor::TaskExecutor* executor,
 }
 
 MultiApplier::~MultiApplier() {
-    DESTRUCTOR_GUARD(shutdown(); join(););
+    DESTRUCTOR_GUARD(cancel(); wait(););
 }
 
 std::string MultiApplier::toString() const {
@@ -86,7 +86,7 @@ bool MultiApplier::isActive() const {
     return _active;
 }
 
-Status MultiApplier::startup() {
+Status MultiApplier::start() {
     stdx::lock_guard<stdx::mutex> lk(_mutex);
 
     if (_active) {
@@ -105,7 +105,7 @@ Status MultiApplier::startup() {
     return Status::OK();
 }
 
-void MultiApplier::shutdown() {
+void MultiApplier::cancel() {
     executor::TaskExecutor::CallbackHandle dbWorkCallbackHandle;
     {
         stdx::lock_guard<stdx::mutex> lk(_mutex);
@@ -122,7 +122,7 @@ void MultiApplier::shutdown() {
     }
 }
 
-void MultiApplier::join() {
+void MultiApplier::wait() {
     stdx::unique_lock<stdx::mutex> lk(_mutex);
 
     while (_active) {