SERVER-20935 do not attempt to attach shard version to OpCtx inside direct client

2 files changed, 18 insertions, 1 deletions

diff --git a/jstests/aggregation/bugs/server7781.js b/jstests/aggregation/bugs/server7781.js
index 9a3520bab22..c369ddccbe0 100644
--- a/jstests/aggregation/bugs/server7781.js
+++ b/jstests/aggregation/bugs/server7781.js
@@ -116,6 +116,21 @@ function test(db, sharded, indexType) {
     aggCmd.$geoNear.near = queryPoint;
     aggArr = [aggCmd, {$limit: 50}, {$limit:60}, {$limit:40}];
     checkOutput(db.runCommand(geoCmd), db[coll].aggregate(aggArr), 40);
+
+    // Test $geoNear with an initial batchSize of 0. Regression test for SERVER-20935.
+    queryPoint = pointMaker.mkPt(0.25);
+    geoCmd.spherical = true;
+    geoCmd.near = queryPoint;
+    geoCmd.limit = 70;
+    delete geoCmd.num;
+    aggCmd.$geoNear.spherical = true;
+    aggCmd.$geoNear.near = queryPoint;
+    aggCmd.$geoNear.limit = 70;
+    delete aggCmd.$geoNear.num;
+    var cmdRes = db[coll].runCommand("aggregate", {pipeline: [aggCmd], cursor: {batchSize: 0}});
+    assert.commandWorked(cmdRes);
+    var cmdCursor = new DBCommandCursor(db[coll].getMongo(), cmdRes, 0);
+    checkOutput(db.runCommand(geoCmd), cmdCursor, 70);
 }
 
 test(db, false, '2d');
diff --git a/src/mongo/db/dbcommands.cpp b/src/mongo/db/dbcommands.cpp
index 78e13ad8a27..9d18c8269e8 100644
--- a/src/mongo/db/dbcommands.cpp
+++ b/src/mongo/db/dbcommands.cpp
@@ -1250,7 +1250,9 @@ void Command::execCommand(OperationContext* txn,
 
         CurOp::get(txn)->setMaxTimeMicros(static_cast<unsigned long long>(maxTimeMS) * 1000);
 
-        if (iAmPrimary) {
+        // Operations are only versioned against the primary. We also make sure not to redo shard
+        // version handling if this command was issued via the direct client.
+        if (iAmPrimary && !txn->getClient()->isInDirectClient()) {
             // Handle shard version and config optime information that may have been sent along with
             // the command.
             auto& operationShardVersion = OperationShardVersion::get(txn);