summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Rassi <rassi@10gen.com>2015-10-05 13:17:51 -0400
committerJason Rassi <rassi@10gen.com>2015-10-12 17:25:02 -0400
commit2116eec9f6459751306dcb93740806fe82abf702 (patch)
tree08c40d2a86a7b2b8e6153b1dd4b13cfe00acc844
parent0da3d37f6c8ada55e523b7176378ca047a0fa985 (diff)
downloadmongo-2116eec9f6459751306dcb93740806fe82abf702.tar.gz
SERVER-19410 Delete test verifying maxTimeMS tracking for mongos ops
-rw-r--r--jstests/sharding/max_time_ms_sharded.js20
1 files changed, 5 insertions, 15 deletions
diff --git a/jstests/sharding/max_time_ms_sharded.js b/jstests/sharding/max_time_ms_sharded.js
index a722dc02aa3..cc3d87505ec 100644
--- a/jstests/sharding/max_time_ms_sharded.js
+++ b/jstests/sharding/max_time_ms_sharded.js
@@ -84,25 +84,15 @@ assert.doesNotThrow(function() { cursor.next() },
// Test that mongos correctly times out max time sharded getmore operations. Uses
// maxTimeNeverTimeOut to ensure mongod doesn't enforce a time limit.
//
+// TODO: This is unimplemented. A test for this functionality should be written as
+// part of the work for SERVER-19410.
+//
configureMaxTimeNeverTimeOut("alwaysOn");
-// Positive test. ~10s operation, 5s limit. The operation takes ~10s because each shard processes
-// 25 batches of ~200ms each, and mongos never runs getmore in parallel on shards.
-// TODO: Re-enable once SERVER-19410 is implemented.
-/*
-cursor = coll.find({$where: function() { sleep(100); return true; }});
-cursor.batchSize(2);
-cursor.maxTimeMS(5*1000);
-assert.doesNotThrow(function() { cursor.next(); },
- [],
- "did not expect mongos to time out first batch of query");
-assert.throws(function() { cursor.itcount(); },
- [],
- "expected mongos to abort getmore due to time limit");
-*/
+// Positive test. TODO: see above.
-// Negative test. Same as above (~10s operation), with a high (1-day) limit.
+// Negative test. ~10s operation, with a high (1-day) limit.
cursor = coll.find({$where: function() { sleep(100); return true; }});
cursor.batchSize(2);
cursor.maxTimeMS(1000*60*60*24);