summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/evergreen.yml60
-rw-r--r--jstests/concurrency/fsm_all.js1
-rw-r--r--jstests/concurrency/fsm_all_simultaneous.js1
-rw-r--r--jstests/parallel/basic.js1
-rw-r--r--jstests/parallel/basicPlus.js1
-rw-r--r--jstests/parallel/del.js1
-rw-r--r--jstests/parallel/repl.js1
-rw-r--r--jstests/serial_run/index_multi.js1
-rw-r--r--src/mongo/dbtests/indexupdatetests.cpp6
-rw-r--r--src/mongo/dbtests/oplogstarttests.cpp33
-rw-r--r--src/mongo/dbtests/query_plan_executor.cpp12
-rw-r--r--src/mongo/dbtests/querytests.cpp6
-rw-r--r--src/mongo/dbtests/repltests.cpp32
13 files changed, 156 insertions, 0 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 3c3bf1d1e1e..4b65743f37a 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -8234,8 +8234,14 @@ buildvariants:
- name: aggregation
- name: aggregation_auth
- name: aggregation_facet_unwind_passthrough
+ - name: audit
- name: auth
- name: auth_audit
+ - name: dbtest
+ - name: concurrency
+ distros:
+ - rhel62-large # Some workloads require a lot of memory, use a bigger machine for this suite.
+ - name: concurrency_simultaneous
- name: disk_mobile
- name: failpoints
- name: failpoints_auth
@@ -8250,11 +8256,65 @@ buildvariants:
- name: aggregation_fuzzer
- name: noPassthrough
- name: noPassthroughWithMongod
+ - name: parallel
+ - name: parallel_compatibility
- name: rlp
- name: sasl
+ - name: serial_run
- name: session_jscore_passthrough
- name: snmp
+- name: enterprise-osx-1010-mobile
+ display_name: Enterprise OS X 10.10 (mobile)
+ modules:
+ - enterprise
+ run_on:
+ - macos-1012
+ batchtime: 1440 # 1 day
+ expansions:
+ push_path: osx
+ push_bucket: downloads.10gen.com
+ push_name: osx
+ push_arch: x86_64-enterprise
+ gorootvars: CGO_CPPFLAGS=-I/opt/mongodbtoolchain/v2/include CGO_CFLAGS=-mmacosx-version-min=10.10 CGO_LDFLAGS=-mmacosx-version-min=10.10
+ tooltags: "-tags 'ssl sasl'"
+ test_flags: --storageEngine=mobile --excludeWithAnyTags=requires_mmapv1,requires_wiredtiger,requires_sharding,requires_replication,SERVER-32709,SERVER-32710,SERVER-32675
+ compile_env: DEVELOPER_DIR=/Applications/Xcode8.3.app
+ compile_flags: --ssl -j$(sysctl -n hw.logicalcpu) --release --libc++ CCFLAGS="-mmacosx-version-min=10.10" LINKFLAGS="-mmacosx-version-min=10.10" CPPPATH=/opt/mongodbtoolchain/v2/include
+ num_jobs_available: 1
+ build_mongoreplay: true
+ tasks:
+ - name: compile
+ - name: compile_all
+ - name: aggregation
+ - name: aggregation_auth
+ - name: aggregation_facet_unwind_passthrough
+ - name: audit
+ - name: auth
+ - name: auth_audit
+ - name: dbtest
+ - name: concurrency
+ - name: concurrency_simultaneous
+ - name: disk_mobile
+ - name: failpoints
+ - name: failpoints_auth
+ - name: integration_tests_standalone
+ - name: jsCore
+ - name: jsCore_auth
+ - name: jsCore_compatibility
+ - name: jsCore_decimal
+ - name: jsCore_minimum_batch_size
+ - name: jsCore_op_query
+ - name: jsonSchema
+ - name: aggregation_fuzzer
+ - name: noPassthrough
+ - name: noPassthroughWithMongod
+ - name: parallel
+ - name: parallel_compatibility
+ - name: sasl
+ - name: serial_run
+ - name: session_jscore_passthrough
+
- name: linux-64-ephemeralForTest
display_name: Linux (ephemeralForTest)
run_on:
diff --git a/jstests/concurrency/fsm_all.js b/jstests/concurrency/fsm_all.js
index 35031becb89..80f8905e87e 100644
--- a/jstests/concurrency/fsm_all.js
+++ b/jstests/concurrency/fsm_all.js
@@ -1,3 +1,4 @@
+// @tags: [SERVER-32675]
'use strict';
load('jstests/concurrency/fsm_libs/runner.js');
diff --git a/jstests/concurrency/fsm_all_simultaneous.js b/jstests/concurrency/fsm_all_simultaneous.js
index f390f262e97..513f9b93113 100644
--- a/jstests/concurrency/fsm_all_simultaneous.js
+++ b/jstests/concurrency/fsm_all_simultaneous.js
@@ -1,3 +1,4 @@
+// @tags: [SERVER-32675]
'use strict';
load('jstests/concurrency/fsm_libs/runner.js');
diff --git a/jstests/parallel/basic.js b/jstests/parallel/basic.js
index 1c6ea0e5d7e..ac06a68a89d 100644
--- a/jstests/parallel/basic.js
+++ b/jstests/parallel/basic.js
@@ -1,4 +1,5 @@
// perform basic js tests in parallel
+// @tags: [SERVER-32675]
load('jstests/libs/parallelTester.js');
Random.setRandomSeed();
diff --git a/jstests/parallel/basicPlus.js b/jstests/parallel/basicPlus.js
index 54d6260002e..23d91c3054e 100644
--- a/jstests/parallel/basicPlus.js
+++ b/jstests/parallel/basicPlus.js
@@ -1,4 +1,5 @@
// perform basic js tests in parallel & some other tasks as well
+// @tags: [SERVER-32675]
load('jstests/libs/parallelTester.js');
var c = db.jstests_parallel_basicPlus;
diff --git a/jstests/parallel/del.js b/jstests/parallel/del.js
index 3128f89d05e..93471d599a6 100644
--- a/jstests/parallel/del.js
+++ b/jstests/parallel/del.js
@@ -1,3 +1,4 @@
+// @tags: [SERVER-32675]
load('jstests/libs/parallelTester.js');
N = 1000;
diff --git a/jstests/parallel/repl.js b/jstests/parallel/repl.js
index 314cd4df335..c10f5078e78 100644
--- a/jstests/parallel/repl.js
+++ b/jstests/parallel/repl.js
@@ -1,4 +1,5 @@
// test basic operations in parallel, with replication
+// @tags: [requires_replication]
load('jstests/libs/parallelTester.js');
baseName = "parallel_repl";
diff --git a/jstests/serial_run/index_multi.js b/jstests/serial_run/index_multi.js
index a09b20fee96..32808e99dcb 100644
--- a/jstests/serial_run/index_multi.js
+++ b/jstests/serial_run/index_multi.js
@@ -1,4 +1,5 @@
// Attempt to build 63 indexes simultaneously
+// @tags: [SERVER-32675]
Random.setRandomSeed();
diff --git a/src/mongo/dbtests/indexupdatetests.cpp b/src/mongo/dbtests/indexupdatetests.cpp
index dd1c75faf09..66dcc332585 100644
--- a/src/mongo/dbtests/indexupdatetests.cpp
+++ b/src/mongo/dbtests/indexupdatetests.cpp
@@ -808,6 +808,12 @@ public:
IndexUpdateTests() : Suite("indexupdate") {}
void setupTests() {
+ // SERVER-32702: Skip this test for Mobile SE.
+ // This test should run successfully after fixing the server ticket.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
+
add<InsertBuildIgnoreUnique<true>>();
add<InsertBuildIgnoreUnique<false>>();
add<InsertBuildEnforceUnique<true>>();
diff --git a/src/mongo/dbtests/oplogstarttests.cpp b/src/mongo/dbtests/oplogstarttests.cpp
index 5decab5fe43..e9626b8a9d5 100644
--- a/src/mongo/dbtests/oplogstarttests.cpp
+++ b/src/mongo/dbtests/oplogstarttests.cpp
@@ -46,6 +46,11 @@ static const NamespaceString nss("unittests.oplogstarttests");
class Base {
public:
Base() : _lk(&_opCtx), _context(&_opCtx, nss.ns()), _client(&_opCtx) {
+ // Replication is not supported by mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
+
Collection* c = _context.db()->getCollection(&_opCtx, nss);
if (!c) {
WriteUnitOfWork wuow(&_opCtx);
@@ -56,6 +61,10 @@ public:
}
~Base() {
+ // Replication is not supported by mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
client()->dropCollection(nss.ns());
// The OplogStart stage is not allowed to outlive it's RecoveryUnit.
@@ -116,6 +125,10 @@ private:
class OplogStartIsOldest : public Base {
public:
void run() {
+ // Replication is not supported by mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
for (int i = 0; i < 10; ++i) {
client()->insert(nss.ns(), BSON("_id" << i << "ts" << Timestamp(1000, i)));
}
@@ -140,6 +153,10 @@ public:
class OplogStartIsNewest : public Base {
public:
void run() {
+ // Replication is not supported by mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
for (int i = 0; i < 10; ++i) {
client()->insert(nss.ns(), BSON("_id" << i << "ts" << Timestamp(1000, i)));
}
@@ -167,6 +184,10 @@ public:
class OplogStartIsNewestExtentHop : public Base {
public:
void run() {
+ // Replication is not supported by mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
for (int i = 0; i < 10; ++i) {
client()->insert(nss.ns(), BSON("_id" << i << "ts" << Timestamp(1000, i)));
}
@@ -189,13 +210,25 @@ public:
class SizedExtentHopBase : public Base {
public:
SizedExtentHopBase() {
+ // Replication is not supported by mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
client()->dropCollection(nss.ns());
}
virtual ~SizedExtentHopBase() {
+ // Replication is not supported by mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
client()->dropCollection(nss.ns());
}
void run() {
+ // Replication is not supported by mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
buildCollection();
WorkingSetID id = WorkingSet::INVALID_ID;
diff --git a/src/mongo/dbtests/query_plan_executor.cpp b/src/mongo/dbtests/query_plan_executor.cpp
index 8f8025e4b9d..6e8d248725f 100644
--- a/src/mongo/dbtests/query_plan_executor.cpp
+++ b/src/mongo/dbtests/query_plan_executor.cpp
@@ -193,6 +193,12 @@ private:
* PlanExecutor is doing a collection scan.
*/
TEST_F(PlanExecutorTest, DropCollScan) {
+ // SERVER-32675: Skip this test for Mobile SE.
+ // This test should run successfully after fixing the server ticket.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
+
OldClientWriteContext ctx(&_opCtx, nss.ns());
insert(BSON("_id" << 1));
insert(BSON("_id" << 2));
@@ -215,6 +221,12 @@ TEST_F(PlanExecutorTest, DropCollScan) {
* Test dropping the collection while the PlanExecutor is doing an index scan.
*/
TEST_F(PlanExecutorTest, DropIndexScan) {
+ // SERVER-32675: Skip this test for Mobile SE.
+ // This test should run successfully after fixing the server ticket.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
+
OldClientWriteContext ctx(&_opCtx, nss.ns());
insert(BSON("_id" << 1 << "a" << 6));
insert(BSON("_id" << 2 << "a" << 7));
diff --git a/src/mongo/dbtests/querytests.cpp b/src/mongo/dbtests/querytests.cpp
index 3f3c9d4ee78..8590b47988a 100644
--- a/src/mongo/dbtests/querytests.cpp
+++ b/src/mongo/dbtests/querytests.cpp
@@ -1291,6 +1291,12 @@ public:
_n = 0;
}
void run() {
+ // SERVER-32698 Skipping this test for mobile SE:
+ // Capped collection isn't properly supported yet with mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
+
string err;
OldClientWriteContext ctx(&_opCtx, ns());
diff --git a/src/mongo/dbtests/repltests.cpp b/src/mongo/dbtests/repltests.cpp
index c8d076480bf..bdf6e7a34b0 100644
--- a/src/mongo/dbtests/repltests.cpp
+++ b/src/mongo/dbtests/repltests.cpp
@@ -103,6 +103,10 @@ protected:
public:
Base()
: _client(&_opCtx), _defaultReplSettings(getGlobalReplicationCoordinator()->getSettings()) {
+ // Replication is not supported by mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
ReplSettings replSettings;
replSettings.setOplogSizeBytes(10 * 1024 * 1024);
replSettings.setMaster(true);
@@ -131,6 +135,10 @@ public:
wuow.commit();
}
~Base() {
+ // Replication is not supported by mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
try {
deleteAll(ns());
deleteAll(cllNS());
@@ -299,6 +307,10 @@ protected:
class LogBasic : public Base {
public:
void run() {
+ // Replication is not supported by mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
ASSERT_EQUALS(2, opCount());
_client.insert(ns(), fromjson("{\"a\":\"b\"}"));
ASSERT_EQUALS(3, opCount());
@@ -311,6 +323,10 @@ class Base : public ReplTests::Base {
public:
virtual ~Base() {}
void run() {
+ // Replication is not supported by mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
reset();
doIt();
int nOps = opCount();
@@ -1292,6 +1308,10 @@ public:
class DeleteOpIsIdBased : public Base {
public:
void run() {
+ // Replication is not supported by mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
insert(BSON("_id" << 0 << "a" << 10));
insert(BSON("_id" << 1 << "a" << 11));
insert(BSON("_id" << 3 << "a" << 10));
@@ -1311,6 +1331,10 @@ public:
class DatabaseIgnorerBasic {
public:
void run() {
+ // Replication is not supported by mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
DatabaseIgnorer d;
ASSERT(!d.ignoreAt("a", Timestamp(4, 0)));
d.doIgnoreUntilAfter("a", Timestamp(5, 0));
@@ -1327,6 +1351,10 @@ public:
class DatabaseIgnorerUpdate {
public:
void run() {
+ // Replication is not supported by mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
DatabaseIgnorer d;
d.doIgnoreUntilAfter("a", Timestamp(5, 0));
d.doIgnoreUntilAfter("a", Timestamp(6, 0));
@@ -1364,6 +1392,10 @@ public:
class FetchAndInsertMissingDocument : public Base {
public:
void run() {
+ // Replication is not supported by mobile SE.
+ if (mongo::storageGlobalParams.engine == "mobile") {
+ return;
+ }
bool threw = false;
auto oplogEntry = makeOplogEntry(OpTime(Timestamp(100, 1), 1LL), // optime
OpTypeEnum::kUpdate, // op type
View Lorry Controller Status