summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Korshunov <anton.korshunov@mongodb.com>2020-01-17 17:16:53 +0000
committerA. Jesse Jiryu Davis <jesse@mongodb.com>2020-01-27 15:40:40 -0500
commit9438e26658d9e45f49336aadd53d05a7f121674f (patch)
tree4cc4dfd23b6740e02877fcff3069682364720832
parent9ce1fb99ddca608d2bc1d920212dae01adf19b04 (diff)
downloadmongo-9438e26658d9e45f49336aadd53d05a7f121674f.tar.gz
SERVER-44848 improve running time of noPassthrough/merge_max_time_ms.js
-rw-r--r--jstests/noPassthrough/merge_max_time_ms.js12
1 files changed, 7 insertions, 5 deletions
diff --git a/jstests/noPassthrough/merge_max_time_ms.js b/jstests/noPassthrough/merge_max_time_ms.js
index fb55b13604b..cd60ab0053a 100644
--- a/jstests/noPassthrough/merge_max_time_ms.js
+++ b/jstests/noPassthrough/merge_max_time_ms.js
@@ -221,9 +221,11 @@ assert.commandWorked(st.shard0.getDB(kDBName).setProfilingLevel(2));
assert.commandWorked(st.shard1.getDB(kDBName).setProfilingLevel(2));
// // Run the test with 'destColl' unsharded.
-withEachMergeMode(
- (mode) => runShardedTest(
- mode.whenMatchedMode, mode.whenNotMatchedMode, st.s, st.shard0, mode + "_unshardedDest"));
+withEachMergeMode((mode) => runShardedTest(mode.whenMatchedMode,
+ mode.whenNotMatchedMode,
+ st.s,
+ st.shard0,
+ tojson(mode) + "_unshardedDest"));
// Run the test with 'destColl' sharded. This means that writes will be sent to both
// shards, and if either one hangs, the MaxTimeMS will expire.
@@ -239,14 +241,14 @@ withEachMergeMode((mode) => runShardedTest(mode.whenMatchedMode,
mode.whenNotMatchedMode,
st.s,
st.shard0,
- mode + "_shardedDest_" + st.shard0.name));
+ tojson(mode) + "_shardedDest_" + st.shard0.name));
jsTestLog("Running test forcing shard " + st.shard1.name + " to hang");
withEachMergeMode((mode) => runShardedTest(mode.whenMatchedMode,
mode.whenNotMatchedMode,
st.s,
st.shard1,
- mode + "_shardedDest_" + st.shard1.name));
+ tojson(mode) + "_shardedDest_" + st.shard1.name));
st.stop();
})();