diff options
Diffstat (limited to 'jstests/sharding/libs/mongos_api_params_util.js')
| -rw-r--r-- | jstests/sharding/libs/mongos_api_params_util.js | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/jstests/sharding/libs/mongos_api_params_util.js b/jstests/sharding/libs/mongos_api_params_util.js index 7de6a36dcda..e1ca18df3e6 100644 --- a/jstests/sharding/libs/mongos_api_params_util.js +++ b/jstests/sharding/libs/mongos_api_params_util.js @@ -75,7 +75,7 @@ let MongosAPIParametersUtil = (function() { function awaitRemoveShard(shardName) { assert.commandWorked(st.startBalancer()); - st.awaitBalancerRound(); + st.waitForBalancer(true, 60000); assert.soon(() => { const res = st.s.adminCommand({removeShard: shardName}); jsTestLog(`removeShard result: ${tojson(res)}`); @@ -789,11 +789,7 @@ let MongosAPIParametersUtil = (function() { jsTestLog(`Waiting for "find" on "${st.rs0.name}" ` + `with comment ${uuidStr} in currentOp`); assert.soon(() => { - const filter = { - "command.find": "collection", - "command.comment": uuidStr, - shard: st.rs0.name - }; + const filter = {"command.comment": uuidStr, shard: st.rs0.name}; const inprog = adminDb.currentOp(filter).inprog; if (inprog.length === 1) { jsTestLog(`Found it! findOpId ${inprog[0].opid}`); @@ -1219,8 +1215,9 @@ let MongosAPIParametersUtil = (function() { } }, { - commandName: "setProfilingFilterGlobally", - skip: "executes locally on mongos (not sent to any remote node)", + commandName: "setFreeMonitoring", + skip: "explicitly fails for mongos, primary mongod only", + conditional: true }, { commandName: "setParameter", @@ -1412,7 +1409,7 @@ let MongosAPIParametersUtil = (function() { }; }); - const st = new ShardingTest({mongos: 1, shards: 2, config: 1, rs: {nodes: 1}}); + const st = new ShardingTest({mongos: 1, shards: 2, rs: {nodes: 1}}); const listCommandsRes = st.s0.adminCommand({listCommands: 1}); assert.commandWorked(listCommandsRes); |