diff options
| author | Charlie Swanson <charlie.swanson@mongodb.com> | 2015-11-23 10:25:07 -0500 |
|---|---|---|
| committer | Charlie Swanson <charlie.swanson@mongodb.com> | 2015-11-24 13:29:57 -0500 |
| commit | cc8f75d1cfc9b2b4b0c0f8a213c960e928174ce7 (patch) | |
| tree | 8931b0efdb446a6786a850775bd9107057a65330 | |
| parent | 327660ff3324dfcb3ea38fc63a4fc7f1cdcb9078 (diff) | |
| download | mongo-cc8f75d1cfc9b2b4b0c0f8a213c960e928174ce7.tar.gz | |
SERVER-21384 Enable concurrency suites with ephemeral storage engines
| -rw-r--r-- | etc/evergreen.yml | 16 | ||||
| -rw-r--r-- | jstests/concurrency/fsm_workloads/convert_to_capped_collection.js | 4 |
2 files changed, 12 insertions, 8 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 7b97f210640..5f63d791a66 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -4906,9 +4906,11 @@ buildvariants: - name: bulk_gle_passthrough - name: parallel - name: parallel_compatibility -# - name: concurrency -# - name: concurrency_replication -# - name: concurrency_sharded + - 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 @@ -4950,9 +4952,11 @@ buildvariants: - name: bulk_gle_passthrough - name: parallel - name: parallel_compatibility -# - name: concurrency -# - name: concurrency_replication -# - name: concurrency_sharded + - 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 diff --git a/jstests/concurrency/fsm_workloads/convert_to_capped_collection.js b/jstests/concurrency/fsm_workloads/convert_to_capped_collection.js index 9f28512a837..92000e0e164 100644 --- a/jstests/concurrency/fsm_workloads/convert_to_capped_collection.js +++ b/jstests/concurrency/fsm_workloads/convert_to_capped_collection.js @@ -42,7 +42,7 @@ var $config = (function() { assertWhenOwnDB(!db[this.threadCollName].isCapped()); assertWhenOwnDB.commandWorked(db[this.threadCollName].convertToCapped(this.size)); assertWhenOwnDB(db[this.threadCollName].isCapped()); - assertWhenOwnDB(isMultiple256(db[this.threadCollName].storageSize())); + assertWhenOwnDB(isMultiple256(db[this.threadCollName].stats().maxSize)); } function convertToCapped(db, collName) { @@ -52,7 +52,7 @@ var $config = (function() { assertWhenOwnDB.commandWorked(db[this.threadCollName].convertToCapped(this.size)); assertWhenOwnDB(db[this.threadCollName].isCapped()); - assertWhenOwnDB(isMultiple256(db[this.threadCollName].storageSize())); + assertWhenOwnDB(isMultiple256(db[this.threadCollName].stats().maxSize)); // only the _id index should remain after running convertToCapped var indexKeys = db[this.threadCollName].getIndexKeys(); |