SERVER-20412 allow for rescheduling of _priorityTakeover after cancelling the its callback

1 files changed, 2 insertions, 0 deletions

diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp
index eb03b42098a..1d04a3ed227 100644
--- a/src/mongo/db/repl/replication_coordinator_impl.cpp
+++ b/src/mongo/db/repl/replication_coordinator_impl.cpp
@@ -2328,6 +2328,7 @@ ReplicationCoordinatorImpl::_setCurrentRSConfig_inlock(
 
     if (_priorityTakeoverCbh.isValid()) {
         _replExecutor.cancel(_priorityTakeoverCbh);
+        _priorityTakeoverCbh = CallbackHandle();
     }
     const PostMemberStateUpdateAction action = _updateMemberStateFromTopologyCoordinator_inlock();
     _updateSlaveInfoFromConfig_inlock();
@@ -2969,6 +2970,7 @@ bool ReplicationCoordinatorImpl::_updateTerm_incallback(long long term) {
 
         if (updated && _priorityTakeoverCbh.isValid()) {
             _replExecutor.cancel(_priorityTakeoverCbh);
+            _priorityTakeoverCbh = CallbackHandle();
         }
     }