SERVER-22995 Protect TopoCoord with mutex rather than single thread executor.

Move scatter gather runner out of executor and protect the runner with its own mutex.
Replace onComplete with callbacks scheduled on finish event.

1 files changed, 10 insertions, 12 deletions

diff --git a/src/mongo/db/repl/vote_requester.cpp b/src/mongo/db/repl/vote_requester.cpp
index eafa68715e2..836617e5493 100644
--- a/src/mongo/db/repl/vote_requester.cpp
+++ b/src/mongo/db/repl/vote_requester.cpp
@@ -141,22 +141,20 @@ unordered_set<HostAndPort> VoteRequester::Algorithm::getResponders() const {
 VoteRequester::VoteRequester() : _isCanceled(false) {}
 VoteRequester::~VoteRequester() {}
 
-StatusWith<ReplicationExecutor::EventHandle> VoteRequester::start(
-    ReplicationExecutor* executor,
-    const ReplicaSetConfig& rsConfig,
-    long long candidateIndex,
-    long long term,
-    bool dryRun,
-    OpTime lastDurableOpTime,
-    const stdx::function<void()>& onCompletion) {
+StatusWith<ReplicationExecutor::EventHandle> VoteRequester::start(ReplicationExecutor* executor,
+                                                                  const ReplicaSetConfig& rsConfig,
+                                                                  long long candidateIndex,
+                                                                  long long term,
+                                                                  bool dryRun,
+                                                                  OpTime lastDurableOpTime) {
     _algorithm.reset(new Algorithm(rsConfig, candidateIndex, term, dryRun, lastDurableOpTime));
-    _runner.reset(new ScatterGatherRunner(_algorithm.get()));
-    return _runner->start(executor, onCompletion);
+    _runner.reset(new ScatterGatherRunner(_algorithm.get(), executor));
+    return _runner->start();
 }
 
-void VoteRequester::cancel(ReplicationExecutor* executor) {
+void VoteRequester::cancel() {
     _isCanceled = true;
-    _runner->cancel(executor);
+    _runner->cancel();
 }
 
 VoteRequester::Result VoteRequester::getResult() const {