From 2d5f7632b30fa6b57992cd6db314ab2a5ca076a6 Mon Sep 17 00:00:00 2001 From: Alya Berciu Date: Fri, 20 Aug 2021 13:57:09 +0000 Subject: SERVER-38924 Remove blacklist entries for $lookup and $graphLookup FSM tests --- .../resmokeconfig/suites/concurrency_sharded_causal_consistency.yml | 4 ---- .../suites/concurrency_sharded_causal_consistency_and_balancer.yml | 4 ---- .../suites/concurrency_sharded_kill_primary_with_balancer.yml | 5 +---- .../suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml | 2 +- ...urrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml | 2 +- .../resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml | 2 +- .../suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml | 2 +- .../suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml | 2 +- .../suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml | 2 +- .../suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml | 2 +- .../resmokeconfig/suites/concurrency_sharded_replication.yml | 4 ---- .../suites/concurrency_sharded_replication_with_balancer.yml | 4 ---- .../suites/concurrency_sharded_terminate_primary_with_balancer.yml | 5 +---- .../resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml | 5 +---- .../suites/concurrency_sharded_with_stepdowns_and_balancer.yml | 5 +---- 15 files changed, 11 insertions(+), 39 deletions(-) (limited to 'buildscripts') diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml index 62c7fc189d0..ba43f57c66b 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml @@ -20,10 +20,6 @@ selector: # SERVER-30983 background indexes are incompatible with causal consistency - jstests/concurrency/fsm_workloads/reindex_background.js - # $lookup and $graphLookup are not supported on sharded collections. - - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled due to MongoDB restrictions and/or workload restrictions # These workloads sometimes trigger 'Could not lock auth data update lock' diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml index b267a98ffab..27e838a1b91 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml @@ -23,10 +23,6 @@ selector: # SERVER-30983 background indexes are incompatible with causal consistency - jstests/concurrency/fsm_workloads/reindex_background.js - # $lookup and $graphLookup are not supported on sharded collections. - - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled due to MongoDB restrictions and/or workload restrictions # These workloads sometimes trigger 'Could not lock auth data update lock' diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_kill_primary_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_kill_primary_with_balancer.yml index f3586e85673..2c7f3423e9c 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_kill_primary_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_kill_primary_with_balancer.yml @@ -20,10 +20,6 @@ selector: # values: - jstests/concurrency/fsm_workloads/agg_match.js - # $lookup and $graphLookup are not supported on sharded collections. - - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled because MapReduce can lose cursors if the primary goes down during the operation. - jstests/concurrency/fsm_workloads/map_reduce_drop.js - jstests/concurrency/fsm_workloads/map_reduce_inline.js @@ -148,6 +144,7 @@ selector: - jstests/concurrency/fsm_workloads/invalidated_cursors.js - jstests/concurrency/fsm_workloads/kill_multicollection_aggregation.js - jstests/concurrency/fsm_workloads/view_catalog.js + - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_with_drop.js - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml index 7e5007507fd..3591484ec8e 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml @@ -21,7 +21,7 @@ selector: # values: - jstests/concurrency/fsm_workloads/agg_match.js - # $lookup and $graphLookup are not supported on sharded collections. + # $lookup and $graphLookup are not supported on sharded collections with transactions. - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml index b9fc7578eaf..25ffecb23ae 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml @@ -21,7 +21,7 @@ selector: # values: - jstests/concurrency/fsm_workloads/agg_match.js - # $lookup and $graphLookup are not supported on sharded collections. + # $lookup and $graphLookup are not supported on sharded collections with transactions. - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml index 68cf0faaa21..40293f34fda 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml @@ -21,7 +21,7 @@ selector: # values: - jstests/concurrency/fsm_workloads/agg_match.js - # $lookup and $graphLookup are not supported on sharded collections. + # $lookup and $graphLookup are not supported on sharded collections with transactions. - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml index 0f1eb074c48..37441b625e6 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml @@ -26,7 +26,7 @@ selector: # values: - jstests/concurrency/fsm_workloads/agg_match.js - # $lookup and $graphLookup are not supported on sharded collections. + # $lookup and $graphLookup are not supported on sharded collections with transactions. - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml index 8efdd48b3b3..fb06380d8b9 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml @@ -26,7 +26,7 @@ selector: # values: - jstests/concurrency/fsm_workloads/agg_match.js - # $lookup and $graphLookup are not supported on sharded collections. + # $lookup and $graphLookup are not supported on sharded collections with transactions. - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml index 37721ec8e05..d952f3d39ae 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml @@ -21,7 +21,7 @@ selector: # values: - jstests/concurrency/fsm_workloads/agg_match.js - # $lookup and $graphLookup are not supported on sharded collections. + # $lookup and $graphLookup are not supported on sharded collections with transactions. - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml index 335b0ab31e9..703b885d474 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml @@ -26,7 +26,7 @@ selector: # values: - jstests/concurrency/fsm_workloads/agg_match.js - # $lookup and $graphLookup are not supported on sharded collections. + # $lookup and $graphLookup are not supported on sharded collections with transactions. - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml index cb95938a091..476a40f9749 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml @@ -19,10 +19,6 @@ selector: # values: - jstests/concurrency/fsm_workloads/agg_match.js - # $lookup and $graphLookup are not supported on sharded collections. - - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled due to MongoDB restrictions and/or workload restrictions # These workloads sometimes trigger 'Could not lock auth data update lock' diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml index 1e0566e45f2..eadd4a3edac 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml @@ -21,10 +21,6 @@ selector: # values: - jstests/concurrency/fsm_workloads/agg_match.js - # $lookup and $graphLookup are not supported on sharded collections. - - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled due to MongoDB restrictions and/or workload restrictions # These workloads sometimes trigger 'Could not lock auth data update lock' diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml index e5f6590587a..59f337448ab 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml @@ -20,10 +20,6 @@ selector: # values: - jstests/concurrency/fsm_workloads/agg_match.js - # $lookup and $graphLookup are not supported on sharded collections. - - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled because MapReduce can lose cursors if the primary goes down during the operation. - jstests/concurrency/fsm_workloads/map_reduce_drop.js - jstests/concurrency/fsm_workloads/map_reduce_inline.js @@ -148,6 +144,7 @@ selector: - jstests/concurrency/fsm_workloads/invalidated_cursors.js - jstests/concurrency/fsm_workloads/kill_multicollection_aggregation.js - jstests/concurrency/fsm_workloads/view_catalog.js + - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_with_drop.js - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml index 4e99bff18d4..22a5617f30f 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml @@ -18,10 +18,6 @@ selector: # values: - jstests/concurrency/fsm_workloads/agg_match.js - # $lookup and $graphLookup are not supported on sharded collections. - - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled because MapReduce can lose cursors if the primary steps down. - jstests/concurrency/fsm_workloads/map_reduce_inline.js - jstests/concurrency/fsm_workloads/map_reduce_interrupt.js @@ -138,6 +134,7 @@ selector: - jstests/concurrency/fsm_workloads/invalidated_cursors.js - jstests/concurrency/fsm_workloads/kill_multicollection_aggregation.js - jstests/concurrency/fsm_workloads/view_catalog.js + - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_with_drop.js - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml index 85a0aeba3bc..c26a751e7d0 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml @@ -21,10 +21,6 @@ selector: # values: - jstests/concurrency/fsm_workloads/agg_match.js - # $lookup and $graphLookup are not supported on sharded collections. - - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled because MapReduce can lose cursors if the primary steps down during the operation. - jstests/concurrency/fsm_workloads/map_reduce_inline.js - jstests/concurrency/fsm_workloads/map_reduce_interrupt.js @@ -143,6 +139,7 @@ selector: - jstests/concurrency/fsm_workloads/invalidated_cursors.js - jstests/concurrency/fsm_workloads/kill_multicollection_aggregation.js - jstests/concurrency/fsm_workloads/view_catalog.js + - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_with_drop.js - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js -- cgit v1.2.1