diff options
| -rw-r--r-- | etc/evergreen.yml | 99 | ||||
| -rw-r--r-- | jstests/auth/auth_helpers.js | 3 | ||||
| -rw-r--r-- | jstests/auth/mr_auth.js | 3 | ||||
| -rw-r--r-- | jstests/auth/server-4892.js | 5 | ||||
| -rw-r--r-- | jstests/gle/gle_explicit_optime.js | 5 | ||||
| -rw-r--r-- | jstests/gle/gle_sharded_wc.js | 4 | ||||
| -rw-r--r-- | jstests/gle/sync1.js | 4 | ||||
| -rw-r--r-- | jstests/httpinterface/sharding_configdb_on_default_ports.js | 13 | ||||
| -rw-r--r-- | jstests/ssl/libs/ssl_helpers.js | 1 | ||||
| -rw-r--r-- | jstests/ssl/upgrade_to_x509_ssl.js | 3 | ||||
| -rw-r--r-- | jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js | 3 |
11 files changed, 111 insertions, 32 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 8bea6f8fffc..1eb176f2a94 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -991,6 +991,15 @@ tasks: run_multiple_jobs: true - <<: *task_template + name: jsCore_inMem + commands: + - func: "do setup" + - func: "run tests" + vars: + resmoke_args: --suites=core --storageEngine=inMemory + run_multiple_jobs: true + +- <<: *task_template name: jsCore_WT commands: - func: "do setup" @@ -1077,15 +1086,6 @@ tasks: run_multiple_jobs: true - <<: *task_template - name: ephemeralForTest - commands: - - func: "do setup" - - func: "run tests" - vars: - resmoke_args: --suites=core --storageEngine=ephemeralForTest - run_multiple_jobs: true - -- <<: *task_template name: jsCore_small_oplog depends_on: - name: jsCore @@ -2158,7 +2158,6 @@ buildvariants: - name: sharding_gle_auth_basics_passthrough_WT - name: sharding_gle_auth_basics_passthrough_write_cmd - name: sharding_gle_auth_basics_passthrough_write_cmd_WT - - name: ephemeralForTest - name: jsCore - name: jsCore_WT - name: jsCore_auth @@ -4810,42 +4809,68 @@ buildvariants: - name: compile distros: - rhel62-build - - name: aggregation + - name: aggregation_WT + - name: aggregation_auth + - name: aggregation_read_concern_majority_passthrough_WT + - name: audit + - name: auth + - name: auth_audit + - name: bulk_gle_passthrough + - name: concurrency + distros: + - rhel62-build # Some workloads require a lot of memory, use a bigger machine for this suite. + - name: concurrency_replication + - name: concurrency_sharded - name: dbtest - name: failpoints - name: failpoints_auth + - name: gle_auth + - name: gle_auth_basics_passthrough + - name: gle_auth_basics_passthrough_write_cmd + - name: gle_auth_write_cmd + - name: integration_tests_replset + - name: integration_tests_standalone - name: jsCore + - name: jsCore_WT - name: jsCore_auth - name: jsCore_compatibility + - name: jsCore_op_query - name: jsCore_small_oplog - name: jsCore_small_oplog_rs - name: jstestfuzz_WT - name: jstestfuzz_replication_WT - name: jstestfuzz_sharded_WT - - name: bulk_gle_passthrough + - name: mongosTest - name: noPassthrough - name: noPassthroughWithMongod - name: parallel - name: parallel_compatibility - - name: concurrency - distros: - - rhel62-build # Some workloads require a lot of memory, use a bigger machine for this suite. - - name: concurrency_replication - - name: concurrency_sharded + - name: read_concern_majority_passthrough_WT - name: replicasets_WT - name: replicasets_auth - name: replicasets_legacy - name: replication_WT - name: replication_auth + - name: rlp + - name: sasl + - name: sharded_collections_jscore_passthrough - name: sharding - name: sharding_auth - name: sharding_auth_audit_WT + - name: sharding_gle_auth_basics_passthrough + - name: sharding_gle_auth_basics_passthrough_write_cmd + - name: sharding_jscore_passthrough + - name: sharding_jscore_passthrough_wire_ops_WT - name: sharding_legacy - name: sharding_legacy_op_query_WT - name: sharding_op_query_WT - name: slow1 -# - name: slow2 - - name: sharding_jscore_passthrough + - name: slow2 + - name: snmp + - name: ssl + - name: sslSpecial + - name: tool + - name: unittests - name: linux-64-ephemeralForTest display_name: Linux (ephemeralForTest) @@ -4864,28 +4889,44 @@ buildvariants: - name: compile distros: - rhel55 - - name: aggregation + - name: aggregation_WT + - name: aggregation_auth + - name: auth + - name: concurrency + distros: + - rhel62-build # Some workloads require a lot of memory, use a bigger machine for this suite. + - name: concurrency_replication + - name: concurrency_sharded - name: dbtest - name: failpoints - name: failpoints_auth + - name: gle_auth + - name: gle_auth_write_cmd + - name: gle_auth_basics_passthrough + - name: gle_auth_basics_passthrough_write_cmd + - name: httpinterface + - name: integration_tests_standalone + - name: integration_tests_replset + - name: sharding_gle_auth_basics_passthrough + - name: sharding_gle_auth_basics_passthrough_write_cmd - name: jsCore + - name: jsCore_WT - name: jsCore_auth + - name: jsCore_op_query - name: jsCore_compatibility - name: jsCore_small_oplog - name: jsCore_small_oplog_rs - name: jstestfuzz_WT - name: jstestfuzz_replication_WT - name: jstestfuzz_sharded_WT + - name: mongosTest + - name: noPassthrough + - name: noPassthroughWithMongod - name: bulk_gle_passthrough - name: noPassthrough - name: noPassthroughWithMongod - name: parallel - name: parallel_compatibility - - name: concurrency - distros: - - rhel62-build # Some workloads require a lot of memory, use a bigger machine for this suite. - - name: concurrency_replication - - name: concurrency_sharded - name: replicasets_WT - name: replicasets_auth - name: replicasets_legacy @@ -4897,8 +4938,12 @@ buildvariants: - name: sharding_legacy_op_query_WT - name: sharding_op_query_WT - name: slow1 -# - name: slow2 + - name: slow2 + - name: sharded_collections_jscore_passthrough - name: sharding_jscore_passthrough + - name: sharding_jscore_passthrough_wire_ops_WT + - name: tool + - name: unittests - name: ubuntu1404-rocksdb display_name: Ubuntu 14.04 (RocksDB) @@ -5016,6 +5061,7 @@ buildvariants: - name: integration_tests_replset - name: jsCore - name: jsCore_WT + - name: jsCore_inMem - name: jsCore_auth - name: jsCore_compatibility - name: jsCore_compatibility_WT @@ -5025,7 +5071,6 @@ buildvariants: - name: jsCore_small_oplog_rs_WT - name: mmap - name: mongosTest - - name: multiversion - name: noPassthrough - name: noPassthroughWithMongod - name: noPassthroughWithMongod_WT diff --git a/jstests/auth/auth_helpers.js b/jstests/auth/auth_helpers.js index 313c633fc08..fc26372ba0d 100644 --- a/jstests/auth/auth_helpers.js +++ b/jstests/auth/auth_helpers.js @@ -1,4 +1,7 @@ // Test the db.auth() shell helper. +// +// This test requires users to persist across a restart. +// @tags: [requires_persistence] var conn = MongoRunner.runMongod({ smallfiles: ""}); diff --git a/jstests/auth/mr_auth.js b/jstests/auth/mr_auth.js index 8fc556db101..6ef85be9b7b 100644 --- a/jstests/auth/mr_auth.js +++ b/jstests/auth/mr_auth.js @@ -1,4 +1,7 @@ // MapReduce executed by a read-only user when --auth enabled should only be able to use inline mode. Other modes require writing to an output collection which is not allowed. SERVER-3345 +// +// This test requires users to persist across a restart. +// @tags: [requires_persistence] baseName = "jstests_mr_auth"; dbName = "test"; diff --git a/jstests/auth/server-4892.js b/jstests/auth/server-4892.js index 3053fcab4dc..16e4b8b6f64 100644 --- a/jstests/auth/server-4892.js +++ b/jstests/auth/server-4892.js @@ -1,8 +1,11 @@ -/* +/** * Regression test for SERVER-4892. * * Verify that a client can delete cursors that it creates, when mongod is running with "auth" * enabled. + * + * This test requires users to persist across a restart. + * @tags: [requires_persistence] */ var baseName = 'jstests_auth_server4892'; diff --git a/jstests/gle/gle_explicit_optime.js b/jstests/gle/gle_explicit_optime.js index 77c526e981d..7bc9e35b3a9 100644 --- a/jstests/gle/gle_explicit_optime.js +++ b/jstests/gle/gle_explicit_optime.js @@ -1,6 +1,9 @@ // // Tests the use of the wOpTime option in getLastError // +// This test requires fsync to lock the secondary, so cannot be run on storage engines which do not +// support the command. +// @tags: [requires_fsync] var rst = new ReplSetTest({ nodes : 2 }); rst.startSet(); @@ -18,7 +21,7 @@ assert.eq( null, gleObj.err ); var opTimeBeforeFailure = gleObj.lastOp; // Lock the secondary -secondary.getDB("admin").fsyncLock(); +assert.commandWorked(secondary.getDB("admin").fsyncLock()); // Insert a doc and replicate it to the primary only coll.insert({ some : "doc" }); diff --git a/jstests/gle/gle_sharded_wc.js b/jstests/gle/gle_sharded_wc.js index bdde00cab25..7cff8b20433 100644 --- a/jstests/gle/gle_sharded_wc.js +++ b/jstests/gle/gle_sharded_wc.js @@ -1,5 +1,9 @@ // Tests of sharded GLE enforcing write concern against operations in a cluster // Basic sharded GLE operation is tested elsewhere. +// +// This test asserts that a journaled write to a mongod running with --nojournal should be rejected, +// so cannot be run on the ephemeralForTest storage engine, as it accepts all journaled writes. +// @tags: [SERVER-21420] (function() { diff --git a/jstests/gle/sync1.js b/jstests/gle/sync1.js index 83d26d1e71f..c840ff8fac5 100644 --- a/jstests/gle/sync1.js +++ b/jstests/gle/sync1.js @@ -1,4 +1,8 @@ // TODO: remove test after we deprecate SyncClusterConnection +// +// This test involves restarting a standalone shard, so cannot be run on ephemeral storage engines. +// A restarted standalone will lose all data when using an ephemeral storage engine. +// @tags: [requires_persistence] var test = new SyncCCTest( "sync1" ); diff --git a/jstests/httpinterface/sharding_configdb_on_default_ports.js b/jstests/httpinterface/sharding_configdb_on_default_ports.js index c11e3ce06af..9c4f2f8605c 100644 --- a/jstests/httpinterface/sharding_configdb_on_default_ports.js +++ b/jstests/httpinterface/sharding_configdb_on_default_ports.js @@ -17,10 +17,17 @@ } var c1, c2, c3; - c1 = MongoRunner.runMongod({configsvr: "", port: 27019, replSet: "csrs"}); + // The config servers must support readConcern: majority to be run as a replica set, so + // explicitly set storage engine to wiredTiger. + c1 = MongoRunner.runMongod({ + configsvr: "", + port: 27019, + replSet: "csrs", + storageEngine: "wiredTiger" + }); assert.commandWorked(c1.adminCommand("replSetInitiate")); - c2 = MongoRunner.runMongod({configsvr: ""}); - c3 = MongoRunner.runMongod({configsvr: ""}); + c2 = MongoRunner.runMongod({configsvr: "", storageEngine: "wiredTiger"}); + c3 = MongoRunner.runMongod({configsvr: "", storageEngine: "wiredTiger"}); var configstrs = [ getHostPart(c1.host) + "," + c2.host + "," + c3.host, diff --git a/jstests/ssl/libs/ssl_helpers.js b/jstests/ssl/libs/ssl_helpers.js index 2f57c33c6c4..2b7d7afc5b6 100644 --- a/jstests/ssl/libs/ssl_helpers.js +++ b/jstests/ssl/libs/ssl_helpers.js @@ -66,6 +66,7 @@ function mixedShardTest(options1, options2, shouldSucceed) { var r = st.adminCommand({enableSharding: "test"}); assert.eq(r, true, "error enabling sharding for this configuration"); + st.ensurePrimaryShard("test", "shard0000"); r = st.adminCommand({ movePrimary: 'test', to: 'shard0001' }); var db1 = st.getDB("test"); diff --git a/jstests/ssl/upgrade_to_x509_ssl.js b/jstests/ssl/upgrade_to_x509_ssl.js index 2fef4e3c149..fef4d1ca848 100644 --- a/jstests/ssl/upgrade_to_x509_ssl.js +++ b/jstests/ssl/upgrade_to_x509_ssl.js @@ -5,6 +5,9 @@ * NOTE: This test is similar to upgrade_to_x509_ssl_nossl.js in the * sslSpecial test suite. This test uses ssl communication * and therefore cannot test modes that do not allow ssl. + * + * This test requires users to persist across a restart. + * @tags: [requires_persistence] */ function authAllNodes() { diff --git a/jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js b/jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js index 74aae02a896..d6c037f5809 100644 --- a/jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js +++ b/jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js @@ -5,6 +5,9 @@ * NOTE: This test is similar to upgrade_to_x509_ssl.js in the * ssl test suite. This test cannot use ssl communication * and therefore cannot test modes that only allow ssl. + * + * This test requires users to persist across a restart. + * @tags: [requires_persistence] */ load("jstests/ssl/libs/ssl_helpers.js"); |