SERVER-2212 mongos maxTimeMS support for moveChunk

1 files changed, 25 insertions, 0 deletions

diff --git a/jstests/sharding/max_time_ms_sharded.js b/jstests/sharding/max_time_ms_sharded.js
index a34f0e916ac..2c46f3a341f 100644
--- a/jstests/sharding/max_time_ms_sharded.js
+++ b/jstests/sharding/max_time_ms_sharded.js
@@ -106,4 +106,29 @@ assert.doesNotThrow(function() { cursor.itcount(); },
                     [],
                     "did not expect getmore ops to hit the time limit");
 
+configureMaxTimeNeverTimeOut("off");
+
+//
+// Test that mongos correctly forwards max time to shards for sharded commands.  Uses
+// maxTimeAlwaysTimeOut to ensure mongod throws if it receives a max time.
+//
+
+// Positive test for "moveChunk".
+configureMaxTimeAlwaysTimeOut("alwaysOn");
+assert.commandFailed(admin.runCommand({moveChunk: coll.getFullName(),
+                                       find: {_id: 0},
+                                       to: "shard0000",
+                                       maxTimeMS: 1000*60*60*24}),
+                     "expected moveChunk to fail in mongod due to maxTimeAlwaysTimeOut fail point");
+
+// Negative test for "moveChunk".
+configureMaxTimeAlwaysTimeOut("off");
+assert.commandWorked(admin.runCommand({moveChunk: coll.getFullName(),
+                                       find: {_id: 0},
+                                       to: "shard0000",
+                                       maxTimeMS: 1000*60*60*24}),
+                     "expected moveChunk to not hit time limit in mongod");
+
+// TODO Test additional commmands.
+
 st.stop();