diff options
14 files changed, 9 insertions, 34 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 16119940230..22b0347cf98 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -11889,11 +11889,10 @@ buildvariants: - name: .auth !.multiversion !.audit !.sharding - name: .misc_js - name: concurrency - # SERVER-36709: Disabled due to excessive memory usage - # concurrency_replication - # concurrency_replication_causal_consistency - # concurrency_simultaneous - # concurrency_simultaneous_replication + - name: concurrency_replication + - name: concurrency_replication_causal_consistency + - name: concurrency_simultaneous + - name: concurrency_simultaneous_replication - name: .integration !.audit - name: .jscore .common !.txns !.decimal - name: jsCore_op_query diff --git a/jstests/concurrency/fsm_workloads/agg_group_external.js b/jstests/concurrency/fsm_workloads/agg_group_external.js index 5eab0316463..adb7a787e20 100644 --- a/jstests/concurrency/fsm_workloads/agg_group_external.js +++ b/jstests/concurrency/fsm_workloads/agg_group_external.js @@ -7,8 +7,6 @@ * * The data passed to the $group is greater than 100MB, which should force * disk to be used. - * SERVER-36709: Disabled for ephemeralForTest due to excessive memory usage - * @tags: [incompatible_with_eft] */ load('jstests/concurrency/fsm_libs/extend_workload.js'); // for extendWorkload load('jstests/concurrency/fsm_workloads/agg_base.js'); // for $config diff --git a/jstests/concurrency/fsm_workloads/agg_sort_external.js b/jstests/concurrency/fsm_workloads/agg_sort_external.js index 1fac22dbaa3..b8cbad826bb 100644 --- a/jstests/concurrency/fsm_workloads/agg_sort_external.js +++ b/jstests/concurrency/fsm_workloads/agg_sort_external.js @@ -7,9 +7,6 @@ * by a $sort on a field containing a random float. * * The data returned by the $match is greater than 100MB, which should force an external sort. - * - * SERVER-36709: Disabled for ephemeralForTest due to excessive memory usage - * @tags: [incompatible_with_eft] */ load('jstests/concurrency/fsm_libs/extend_workload.js'); // for extendWorkload load('jstests/concurrency/fsm_workloads/agg_base.js'); // for $config diff --git a/jstests/concurrency/fsm_workloads/create_index_background_unique_capped.js b/jstests/concurrency/fsm_workloads/create_index_background_unique_capped.js index b16ac3d25a3..c1f0da117f2 100644 --- a/jstests/concurrency/fsm_workloads/create_index_background_unique_capped.js +++ b/jstests/concurrency/fsm_workloads/create_index_background_unique_capped.js @@ -5,8 +5,7 @@ * * Creates multiple unique background indexes in parallel, on capped collections. * - * SERVER-36709: Disabled for ephemeralForTest due to excessive memory usage - * @tags: [creates_background_indexes, requires_capped, incompatible_with_eft] + * @tags: [creates_background_indexes, requires_capped] */ load('jstests/concurrency/fsm_libs/extend_workload.js'); // for extendWorkload diff --git a/jstests/concurrency/fsm_workloads/create_index_background_wildcard.js b/jstests/concurrency/fsm_workloads/create_index_background_wildcard.js index b370b2f3d99..46f37adb3ee 100644 --- a/jstests/concurrency/fsm_workloads/create_index_background_wildcard.js +++ b/jstests/concurrency/fsm_workloads/create_index_background_wildcard.js @@ -3,8 +3,7 @@ /** * Executes the create_index_background.js workload, but with a wildcard index. * - * SERVER-36709: Disabled for ephemeralForTest due to excessive memory usage - * @tags: [creates_background_indexes, incompatible_with_eft] + * @tags: [creates_background_indexes] */ load('jstests/concurrency/fsm_libs/extend_workload.js'); // For extendWorkload. load('jstests/concurrency/fsm_workloads/create_index_background.js'); // For $config. diff --git a/jstests/concurrency/fsm_workloads/findAndModify_remove_queue_unindexed.js b/jstests/concurrency/fsm_workloads/findAndModify_remove_queue_unindexed.js index 38718206bae..981568904ad 100644 --- a/jstests/concurrency/fsm_workloads/findAndModify_remove_queue_unindexed.js +++ b/jstests/concurrency/fsm_workloads/findAndModify_remove_queue_unindexed.js @@ -12,9 +12,6 @@ * trying to remove the same document from the queue. * * This workload was designed to reproduce SERVER-21434. - * - * SERVER-36709: Disabled for ephemeralForTest due to excessive memory usage - * @tags: [incompatible_with_eft] */ load('jstests/concurrency/fsm_libs/extend_workload.js'); // for extendWorkload load('jstests/concurrency/fsm_workloads/findAndModify_remove_queue.js'); // for $config diff --git a/jstests/concurrency/fsm_workloads/reindex_background.js b/jstests/concurrency/fsm_workloads/reindex_background.js index 6d7fa0c66d2..575cf89400e 100644 --- a/jstests/concurrency/fsm_workloads/reindex_background.js +++ b/jstests/concurrency/fsm_workloads/reindex_background.js @@ -8,8 +8,7 @@ * that because indexes are initially built in the background, reindexing is also done in the * background. * - * SERVER-36709: Disabled for ephemeralForTest due to excessive memory usage - * @tags: [SERVER-40561, creates_background_indexes, incompatible_with_eft] + * @tags: [SERVER-40561, creates_background_indexes] */ load('jstests/concurrency/fsm_libs/extend_workload.js'); // for extendWorkload diff --git a/jstests/noPassthrough/geo_mnypts_plus_fields.js b/jstests/noPassthrough/geo_mnypts_plus_fields.js index c3e8aa5d316..467c46e3698 100644 --- a/jstests/noPassthrough/geo_mnypts_plus_fields.js +++ b/jstests/noPassthrough/geo_mnypts_plus_fields.js @@ -1,6 +1,4 @@ // Test sanity of geo queries with a lot of points -// SERVER-36709: Disabled for ephemeralForTest due to excessive memory usage -// @tags: [incompatible_with_eft] (function() { "use strict"; diff --git a/jstests/noPassthroughWithMongod/bench_test_crud_commands.js b/jstests/noPassthroughWithMongod/bench_test_crud_commands.js index d9649b5b0f8..cf34fff73a7 100644 --- a/jstests/noPassthroughWithMongod/bench_test_crud_commands.js +++ b/jstests/noPassthroughWithMongod/bench_test_crud_commands.js @@ -1,6 +1,4 @@ // Tests the "writeCmd" and "readCmd" options to benchRun(). -// SERVER-36709: Disabled for ephemeralForTest due to excessive memory usage -// @tags: [incompatible_with_eft] (function() { "use strict"; diff --git a/jstests/noPassthroughWithMongod/dup_bgindex.js b/jstests/noPassthroughWithMongod/dup_bgindex.js index b5748e3327c..02ac4bf7870 100644 --- a/jstests/noPassthroughWithMongod/dup_bgindex.js +++ b/jstests/noPassthroughWithMongod/dup_bgindex.js @@ -1,6 +1,4 @@ // Try to create two identical indexes, via background. Shouldn't be allowed by the server. -// SERVER-36709: Disabled for ephemeralForTest due to excessive memory usage -// @tags: [incompatible_with_eft] (function() { var t = db.duplIndexTest; t.drop(); diff --git a/jstests/noPassthroughWithMongod/geo_mnypts.js b/jstests/noPassthroughWithMongod/geo_mnypts.js index 53e19e24eba..d3ae714b69b 100644 --- a/jstests/noPassthroughWithMongod/geo_mnypts.js +++ b/jstests/noPassthroughWithMongod/geo_mnypts.js @@ -1,6 +1,4 @@ // Test sanity of geo queries with a lot of points -// SERVER-36709: Disabled for ephemeralForTest due to excessive memory usage -// @tags: [incompatible_with_eft] var coll = db.testMnyPts; coll.drop(); diff --git a/jstests/noPassthroughWithMongod/geo_polygon.js b/jstests/noPassthroughWithMongod/geo_polygon.js index 80ff03fc63a..ce7f9ebf67c 100644 --- a/jstests/noPassthroughWithMongod/geo_polygon.js +++ b/jstests/noPassthroughWithMongod/geo_polygon.js @@ -1,6 +1,5 @@ // -// SERVER-36709: Disabled for ephemeralForTest due to excessive memory usage -// @tags: [SERVER-40561, incompatible_with_eft] +// @tags: [SERVER-40561] // t = db.geo_polygon4; diff --git a/jstests/noPassthroughWithMongod/indexbg_interrupts.js b/jstests/noPassthroughWithMongod/indexbg_interrupts.js index 2f0694547c0..a1bf783f032 100644 --- a/jstests/noPassthroughWithMongod/indexbg_interrupts.js +++ b/jstests/noPassthroughWithMongod/indexbg_interrupts.js @@ -7,8 +7,7 @@ * active. The problem is that this is timing dependent and the current test setup * tries to achieve this by inserting insane amount of documents. * - * SERVER-36709: Disabled for ephemeralForTest due to excessive memory usage - * @tags: [requires_replication, incompatible_with_eft] + * @tags: [requires_replication] */ /** diff --git a/jstests/slow1/conc_update.js b/jstests/slow1/conc_update.js index 64332cee57f..34398d91f3f 100644 --- a/jstests/slow1/conc_update.js +++ b/jstests/slow1/conc_update.js @@ -1,6 +1,3 @@ -// SERVER-36709: Disabled for ephemeralForTest due to excessive memory usage -// @tags: [incompatible_with_eft] - (function() { "use strict"; |