SERVER-14135 implement processHandshake() in LegacyReplicationCoordinator

1 files changed, 4 insertions, 18 deletions

diff --git a/src/mongo/db/clientcursor.cpp b/src/mongo/db/clientcursor.cpp
index 7084a0699ea..80fb8d0694e 100644
--- a/src/mongo/db/clientcursor.cpp
+++ b/src/mongo/db/clientcursor.cpp
@@ -160,7 +160,7 @@ namespace mongo {
         _idleAgeMillis = millis;
     }
 
-    void ClientCursor::updateSlaveLocation( CurOp& curop ) {
+    void ClientCursor::updateSlaveLocation(CurOp& curop) {
         if (_slaveReadTill.isNull())
             return;
 
@@ -168,25 +168,11 @@ namespace mongo {
 
         Client* c = curop.getClient();
         verify(c);
-        BSONObj rid = c->getRemoteID();
-        if (rid.isEmpty())
+        OID rid = c->getRemoteID();
+        if (!rid.isSet())
             return;
 
-        BSONObj handshake = c->getHandshake();
-        if (handshake.hasField("config")) {
-            repl::getGlobalReplicationCoordinator()->setLastOptime(rid["_id"].OID(),
-                                                                   _slaveReadTill,
-                                                                   handshake["config"].Obj());
-        }
-        else {
-            BSONObjBuilder bob;
-            bob.append("host", curop.getRemoteString());
-            bob.append("upgradeNeeded", true);
-            repl::getGlobalReplicationCoordinator()->setLastOptime(rid["_id"].OID(),
-                                                                   _slaveReadTill,
-                                                                   bob.done());
-        }
-
+        repl::getGlobalReplicationCoordinator()->setLastOptime(rid, _slaveReadTill);
     }
 
     //