diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded.yml
|
index b5bd8b7..132aba3 100644
|
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded.yml
|
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded.yml
|
@@ -9,4 +9,3 @@ executor:
|
config:
|
shell_options:
|
nodb: ''
|
- readMode: commands
|
diff --git a/jstests/concurrency/fsm_libs/assert.js b/jstests/concurrency/fsm_libs/assert.js
|
index d6de79b..15196b3 100644
|
--- a/jstests/concurrency/fsm_libs/assert.js
|
+++ b/jstests/concurrency/fsm_libs/assert.js
|
@@ -29,6 +29,7 @@ var AssertLevel = (function() {
|
}
|
|
return {
|
+ NONE: new AssertLevel(-1),
|
ALWAYS: new AssertLevel(0),
|
OWN_COLL: new AssertLevel(1),
|
OWN_DB: new AssertLevel(2),
|
diff --git a/jstests/concurrency/fsm_libs/cluster.js b/jstests/concurrency/fsm_libs/cluster.js
|
index 6e6738e..464acfb 100644
|
--- a/jstests/concurrency/fsm_libs/cluster.js
|
+++ b/jstests/concurrency/fsm_libs/cluster.js
|
@@ -146,11 +146,6 @@ var Cluster = function(options) {
|
oplogSize: 1024,
|
verbose: verbosityLevel
|
};
|
- shardConfig.rsOptions = {
|
- // Specify a longer timeout for replSetInitiate, to ensure that
|
- // slow hardware has sufficient time for file pre-allocation.
|
- initiateTimeout: REPL_SET_INITIATE_TIMEOUT_MS,
|
- }
|
}
|
|
st = new ShardingTest(shardConfig);
|
diff --git a/jstests/concurrency/fsm_libs/runner.js b/jstests/concurrency/fsm_libs/runner.js
|
index e3240a3..e6beb78 100644
|
--- a/jstests/concurrency/fsm_libs/runner.js
|
+++ b/jstests/concurrency/fsm_libs/runner.js
|
@@ -595,9 +595,6 @@ var runner = (function() {
|
var bgThreadMgr = new ThreadManager(clusterOptions, { composed: false });
|
|
var cluster = new Cluster(clusterOptions);
|
- if (cluster.isSharded()) {
|
- useDropDistLockFailPoint(cluster, clusterOptions);
|
- }
|
cluster.setup();
|
|
// Clean up the state left behind by other tests in the concurrency suite
|
diff --git a/jstests/concurrency/fsm_libs/worker_thread.js b/jstests/concurrency/fsm_libs/worker_thread.js
|
index 8fb4130..89ec6f2 100644
|
--- a/jstests/concurrency/fsm_libs/worker_thread.js
|
+++ b/jstests/concurrency/fsm_libs/worker_thread.js
|
@@ -23,7 +23,8 @@ var workerThread = (function() {
|
var myDB;
|
var configs = {};
|
|
- globalAssertLevel = args.globalAssertLevel;
|
+ // Hack to disable assertions in the workloads.
|
+ globalAssertLevel = AssertLevel.NONE;
|
|
try {
|
if (Cluster.isStandalone(args.clusterOptions)) {
|