From 0dc74f5dc61a5a093ece56887083f8a934a45140 Mon Sep 17 00:00:00 2001 From: Gregory Wlodarek Date: Mon, 10 Aug 2020 15:33:17 -0400 Subject: SERVER-36709 Enable previously disabled tests due to excessive memory usage --- jstests/concurrency/fsm_workloads/agg_group_external.js | 2 -- jstests/concurrency/fsm_workloads/agg_sort_external.js | 3 --- .../concurrency/fsm_workloads/create_index_background_unique_capped.js | 3 +-- jstests/concurrency/fsm_workloads/create_index_background_wildcard.js | 3 +-- .../concurrency/fsm_workloads/findAndModify_remove_queue_unindexed.js | 3 --- jstests/concurrency/fsm_workloads/reindex_background.js | 3 +-- 6 files changed, 3 insertions(+), 14 deletions(-) (limited to 'jstests/concurrency') 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 -- cgit v1.2.1