diff options
| author | Mathias Stearn <mathias@10gen.com> | 2015-10-05 15:32:48 -0400 |
|---|---|---|
| committer | Mathias Stearn <mathias@10gen.com> | 2015-10-08 12:06:52 -0400 |
| commit | 5be08a11886329994ee73950f031c2ee3b4c9309 (patch) | |
| tree | fef315b7f81e70c59af2e1fd6db1e0a2f08747f7 /buildscripts | |
| parent | 804ad14001e1a58538974a327e9943c338fd0925 (diff) | |
| download | mongo-5be08a11886329994ee73950f031c2ee3b4c9309.tar.gz | |
SERVER-20707 Add --enableMajorityReadConcern option
Diffstat (limited to 'buildscripts')
3 files changed, 1 insertions, 2 deletions
diff --git a/buildscripts/resmokeconfig/suites/core_small_oplog_rs.yml b/buildscripts/resmokeconfig/suites/core_small_oplog_rs.yml index a0171d528f6..5ff41284a6a 100644 --- a/buildscripts/resmokeconfig/suites/core_small_oplog_rs.yml +++ b/buildscripts/resmokeconfig/suites/core_small_oplog_rs.yml @@ -5,7 +5,6 @@ selector: exclude_files: # These tests are not expected to pass with replica-sets: - jstests/core/dbadmin.js - - jstests/core/read_majority_mmap.js - jstests/core/opcounters_write_cmd.js - jstests/core/read_after_optime.js diff --git a/buildscripts/resmokeconfig/suites/read_concern_majority_passthrough.yml b/buildscripts/resmokeconfig/suites/read_concern_majority_passthrough.yml index d8ab491018e..34963ef9641 100644 --- a/buildscripts/resmokeconfig/suites/read_concern_majority_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/read_concern_majority_passthrough.yml @@ -48,6 +48,7 @@ executor: mongod_options: set_parameters: enableTestCommands: 1 + enableMajorityReadConcern: '' # Running with one node until SERVER-20260 in place. Allows us to use a much smaller sleep. # Bring up to two or three once fixed. num_nodes: 1 diff --git a/buildscripts/resmokelib/testing/fixtures/shardedcluster.py b/buildscripts/resmokelib/testing/fixtures/shardedcluster.py index 92659e3338f..4b3d61949a1 100644 --- a/buildscripts/resmokelib/testing/fixtures/shardedcluster.py +++ b/buildscripts/resmokelib/testing/fixtures/shardedcluster.py @@ -176,7 +176,6 @@ class ShardedClusterFixture(interface.Fixture): mongod_options["configsvr"] = "" mongod_options["dbpath"] = os.path.join(self._dbpath_prefix, "config") mongod_options["replSet"] = ShardedClusterFixture._CONFIGSVR_REPLSET_NAME - mongod_options["set_parameters"]["enableReplSnapshotThread"] = 1 mongod_options["storageEngine"] = "wiredTiger" return replicaset.ReplicaSetFixture(mongod_logger, |