SERVER-18191 make new heartbeat args/response classes for the new election protocol

1 files changed, 28 insertions, 12 deletions

diff --git a/src/mongo/db/repl/replset_commands.cpp b/src/mongo/db/repl/replset_commands.cpp
index d160351c6b0..bedbf59a05a 100644
--- a/src/mongo/db/repl/replset_commands.cpp
+++ b/src/mongo/db/repl/replset_commands.cpp
@@ -46,7 +46,9 @@
 #include "mongo/db/repl/initial_sync.h"
 #include "mongo/db/repl/oplog.h"
 #include "mongo/db/repl/repl_set_heartbeat_args.h"
+#include "mongo/db/repl/repl_set_heartbeat_args_v1.h"
 #include "mongo/db/repl/repl_set_heartbeat_response.h"
+#include "mongo/db/repl/repl_set_heartbeat_response_v1.h"
 #include "mongo/db/repl/replication_coordinator_global.h"
 #include "mongo/db/repl/replication_coordinator_external_state_impl.h"
 #include "mongo/db/repl/replication_executor.h"
@@ -710,22 +712,36 @@ namespace {
                     mp->tag |= ReplicationExecutor::NetworkInterface::kMessagingPortKeepOpen;
             }
 
-            ReplSetHeartbeatArgs args;
-            status = args.initialize(cmdObj);
-            if (!status.isOK()) {
+            if (getGlobalReplicationCoordinator()->isV1ElectionProtocol()) {
+                ReplSetHeartbeatArgsV1 args;
+                status = args.initialize(cmdObj);
+                if (!status.isOK()) {
+                    return appendCommandStatus(result, status);
+                }
+                ReplSetHeartbeatResponseV1 response;
+                status = getGlobalReplicationCoordinator()->processHeartbeatV1(args, &response);
+                if (status.isOK())
+                    response.addToBSON(&result);
                 return appendCommandStatus(result, status);
             }
+            else {
+                ReplSetHeartbeatArgs args;
+                status = args.initialize(cmdObj);
+                if (!status.isOK()) {
+                    return appendCommandStatus(result, status);
+                }
 
-            // ugh.
-            if (args.getCheckEmpty()) {
-                result.append("hasData", replHasDatabases(txn));
-            }
+                // ugh.
+                if (args.getCheckEmpty()) {
+                    result.append("hasData", replHasDatabases(txn));
+                }
 
-            ReplSetHeartbeatResponse response;
-            status = getGlobalReplicationCoordinator()->processHeartbeat(args, &response);
-            if (status.isOK())
-                response.addToBSON(&result);
-            return appendCommandStatus(result, status);
+                ReplSetHeartbeatResponse response;
+                status = getGlobalReplicationCoordinator()->processHeartbeat(args, &response);
+                if (status.isOK())
+                    response.addToBSON(&result);
+                return appendCommandStatus(result, status);
+            }
         }
     } cmdReplSetHeartbeat;