SERVER-20977 added test for processing metadata in heartbeat

1 files changed, 6 insertions, 8 deletions

diff --git a/src/mongo/db/repl/replication_coordinator_impl_elect_v1.cpp b/src/mongo/db/repl/replication_coordinator_impl_elect_v1.cpp
index 337a9ce3ff6..a1b53badd44 100644
--- a/src/mongo/db/repl/replication_coordinator_impl_elect_v1.cpp
+++ b/src/mongo/db/repl/replication_coordinator_impl_elect_v1.cpp
@@ -108,19 +108,17 @@ void ReplicationCoordinatorImpl::_startElectSelfV1() {
             fassertFailed(28641);
     }
 
-    const StatusWith<ReplicationExecutor::EventHandle> finishEvh = _replExecutor.makeEvent();
-    if (finishEvh.getStatus() == ErrorCodes::ShutdownInProgress) {
+    auto finishedEvent = _makeEvent();
+    if (!finishedEvent) {
         return;
     }
-    fassert(28642, finishEvh.getStatus());
-    _electionFinishedEvent = finishEvh.getValue();
+    _electionFinishedEvent = finishedEvent;
 
-    const StatusWith<ReplicationExecutor::EventHandle> dryRunFinishEvh = _replExecutor.makeEvent();
-    if (dryRunFinishEvh.getStatus() == ErrorCodes::ShutdownInProgress) {
+    auto dryRunFinishedEvent = _makeEvent();
+    if (!dryRunFinishedEvent) {
         return;
     }
-    fassert(28767, dryRunFinishEvh.getStatus());
-    _electionDryRunFinishedEvent = dryRunFinishEvh.getValue();
+    _electionDryRunFinishedEvent = dryRunFinishedEvent;
 
     LoseElectionDryRunGuardV1 lossGuard(this);