SERVER-14616 replace BSONObj with HandshakeArgs and eliminate redundant handshake method

1 files changed, 13 insertions, 4 deletions

diff --git a/src/mongo/db/repl/replset_commands.cpp b/src/mongo/db/repl/replset_commands.cpp
index 7b421ed06a0..98523e5e7ac 100644
--- a/src/mongo/db/repl/replset_commands.cpp
+++ b/src/mongo/db/repl/replset_commands.cpp
@@ -368,12 +368,21 @@ namespace repl {
                 // we have received a handshake, not an update message
                 // handshakes are done here to ensure the receiving end supports the update command
 
+                HandshakeArgs handshake;
+                status = handshake.initialize(cmdObj["handshake"].embeddedObject());
+                if (!status.isOK())
+                    return appendCommandStatus(result, status);
+
+                if (!handshake.hasMemberId()) {
+                    return appendCommandStatus(
+                            result,
+                            Status(ErrorCodes::NoSuchKey,
+                                   "replSetUpdatePosition handshake was missing 'member' field"));
+                }
+
                 return appendCommandStatus(
                         result,
-                        getGlobalReplicationCoordinator()->processReplSetUpdatePositionHandshake(
-                                txn,
-                                cmdObj["handshake"].embeddedObject(),
-                                &result));
+                        getGlobalReplicationCoordinator()->processHandshake(txn, handshake));
             }
 
             uassert(16888, "optimes field should be an array with an object for each secondary",