SERVER-15113 fix order of cancellation vs. signaling in elect_cmd_runner

1 files changed, 3 insertions, 2 deletions

diff --git a/src/mongo/db/repl/elect_cmd_runner.cpp b/src/mongo/db/repl/elect_cmd_runner.cpp
index d4901a445ba..bda9e109ade 100644
--- a/src/mongo/db/repl/elect_cmd_runner.cpp
+++ b/src/mongo/db/repl/elect_cmd_runner.cpp
@@ -125,8 +125,6 @@ namespace repl {
 
     void ElectCmdRunner::_signalSufficientResponsesReceived(ReplicationExecutor* executor) {
         if (_sufficientResponsesReceived.isValid()) {
-            executor->signalEvent(_sufficientResponsesReceived);
-            _sufficientResponsesReceived = ReplicationExecutor::EventHandle();
 
             // Cancel any remaining command callbacks.
             std::for_each(_responseCallbacks.begin(),
@@ -134,6 +132,9 @@ namespace repl {
                           stdx::bind(&ReplicationExecutor::cancel,
                                      executor,
                                      stdx::placeholders::_1));   
+
+            executor->signalEvent(_sufficientResponsesReceived);
+            _sufficientResponsesReceived = ReplicationExecutor::EventHandle();
         }
     }