summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Abrahams <jonathan@mongodb.com>2015-06-04 00:00:08 -0400
committerJonathan Abrahams <jonathan@mongodb.com>2015-06-04 00:00:08 -0400
commit167d6de7241570e8bc73bcd8878fe91f1f77c12a (patch)
treead0e62c742d5967f44acadfe664a3437e56df1a7
parent99167a78d937ceaf7917f1f759d5291cbe2f5b66 (diff)
downloadmongo-167d6de7241570e8bc73bcd8878fe91f1f77c12a.tar.gz
SERVER-18495 Enable FSM replication tests
Increase oplogSize for tests to 100MB from 40MB (default)
-rw-r--r--jstests/concurrency/fsm_all_replication.js12
-rw-r--r--jstests/concurrency/fsm_libs/cluster.js5
2 files changed, 11 insertions, 6 deletions
diff --git a/jstests/concurrency/fsm_all_replication.js b/jstests/concurrency/fsm_all_replication.js
index 552cd2a91dc..1fef4e08ab4 100644
--- a/jstests/concurrency/fsm_all_replication.js
+++ b/jstests/concurrency/fsm_all_replication.js
@@ -6,11 +6,12 @@ var dir = 'jstests/concurrency/fsm_workloads';
var blacklist = [
// Disabled due to known bugs
- 'agg_sort_external.js', // SERVER-16700 Deadlock on WiredTiger LSM
- 'findAndModify_update_grow.js', // SERVER-17021 Perf. Regression for WT overflow items
+ 'reindex_background.js', // SERVER-17923 Multiple background indexes can cause fatal error
'yield_sort.js', // SERVER-17011 Cursor can return objects out of order if updated during query
// Disabled due to MongoDB restrictions and/or workload restrictions
+ 'agg_group_external.js', // uses >100MB of data, and is flaky
+ 'agg_sort_external.js', // uses >100MB of data, and is flaky
// These workloads sometimes trigger 'Could not lock auth data update lock'
// errors because the AuthorizationManager currently waits for only five
@@ -21,7 +22,6 @@ var blacklist = [
'auth_drop_user.js', // SERVER-16739 OpenSSL libcrypto crash
].map(function(file) { return dir + '/' + file; });
-// SERVER-16196 re-enable executing workloads against replica sets
-// runWorkloadsSerially(ls(dir).filter(function(file) {
-// return !Array.contains(blacklist, file);
-// }), { replication: true });
+runWorkloadsSerially(ls(dir).filter(function(file) {
+ return !Array.contains(blacklist, file);
+}), { replication: true });
diff --git a/jstests/concurrency/fsm_libs/cluster.js b/jstests/concurrency/fsm_libs/cluster.js
index 18e4056e5f8..52f46699993 100644
--- a/jstests/concurrency/fsm_libs/cluster.js
+++ b/jstests/concurrency/fsm_libs/cluster.js
@@ -86,6 +86,9 @@ var Cluster = function(options) {
if (options.replication) {
shardConfig.rs = {
nodes: 3,
+ // Increase the oplog size (in MB) to prevent rollover
+ // during write-heavy workloads
+ oplogSize: 1024,
verbose: verbosityLevel
};
}
@@ -133,6 +136,8 @@ var Cluster = function(options) {
// TODO: allow 'options' to specify the number of nodes
var replSetConfig = {
nodes: 3,
+ // Increase the oplog size (in MB) to prevent rollover during write-heavy workloads
+ oplogSize: 1024,
nodeOptions: { verbose: verbosityLevel }
};