SERVER-99462 Exclude timeseries_group_aggregations.js from unnecessary passthroughs with long test runtime (#33126)

GitOrigin-RevId: 2177695f5100a75f8649fc220b8289ce8a4d4d8d
2025-03-06 16:12:37 -05:00 · 2025-03-06 16:12:37 -05:00 · aee456b5f9
parent 028c6eeef6
commit aee456b5f9
24 changed files with 44 additions and 16 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -304,6 +304,7 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot

 # The following patterns are parsed from ./jstests/aggregation/timeseries/OWNERS.yml
 /jstests/aggregation/timeseries/**/* @10gen/query-integration-timeseries @svc-auto-approve-bot
+/jstests/aggregation/timeseries/**/timeseries_group_aggregations.js @10gen/query-execution-sbe @svc-auto-approve-bot
 /jstests/aggregation/timeseries/**/OWNERS.yml @10gen/query-integration-staff-leads @svc-auto-approve-bot

 # The following patterns are parsed from ./jstests/aggregation/variables/OWNERS.yml
--- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/aggregation_mongos_pqs_fallback.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/aggregation_mongos_pqs_fallback.yml
@ -53,6 +53,7 @@ selector:
    - jstests/aggregation/sources/unionWith/unionWith_query_stats.js
    - jstests/aggregation/sources/lookup/lookup_single_solution_cache.js
    - jstests/aggregation/sources/bucket/collation_bucket.js
+    - jstests/aggregation/timeseries/timeseries_group_aggregations.js
  exclude_with_any_tags:
    - assumes_against_mongod_not_mongos
    - requires_profiling
--- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/aggregation_mongos_pqs_hints.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/aggregation_mongos_pqs_hints.yml
@ -55,6 +55,7 @@ selector:
    - jstests/aggregation/sources/unionWith/unionWith_query_stats.js
    - jstests/aggregation/sources/lookup/lookup_single_solution_cache.js
    - jstests/aggregation/sources/bucket/collation_bucket.js
+    - jstests/aggregation/timeseries/timeseries_group_aggregations.js
  exclude_with_any_tags:
    - assumes_against_mongod_not_mongos
    - requires_profiling
--- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/aggregation_pqs_fallback.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/aggregation_pqs_fallback.yml
@ -41,6 +41,7 @@ selector:
    - jstests/aggregation/sources/unionWith/unionWith_query_stats.js
    - jstests/aggregation/sources/lookup/lookup_single_solution_cache.js
    - jstests/aggregation/sources/bucket/collation_bucket.js
+    - jstests/aggregation/timeseries/timeseries_group_aggregations.js
  exclude_with_any_tags:
    - assumes_standalone_mongod
    - does_not_support_repeated_reads
--- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/aggregation_pqs_hints.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/aggregation_pqs_hints.yml
@ -44,6 +44,7 @@ selector:
    - jstests/aggregation/sources/unionWith/unionWith_query_stats.js
    - jstests/aggregation/sources/lookup/lookup_single_solution_cache.js
    - jstests/aggregation/sources/bucket/collation_bucket.js
+    - jstests/aggregation/timeseries/timeseries_group_aggregations.js
  exclude_with_any_tags:
    - assumes_standalone_mongod
    - does_not_support_repeated_reads
--- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/aggregation_sharded_collections_pqs_fallback.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/aggregation_sharded_collections_pqs_fallback.yml
@ -57,6 +57,7 @@ selector:
    - jstests/aggregation/sources/unionWith/unionWith_query_stats.js
    - jstests/aggregation/sources/lookup/lookup_single_solution_cache.js
    - jstests/aggregation/sources/bucket/collation_bucket.js
+    - jstests/aggregation/timeseries/timeseries_group_aggregations.js
  exclude_with_any_tags:
    - assumes_no_implicit_collection_creation_on_get_collection
    - assumes_against_mongod_not_mongos
--- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/aggregation_sharded_collections_pqs_hints.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/aggregation_sharded_collections_pqs_hints.yml
@ -59,6 +59,7 @@ selector:
    - jstests/aggregation/sources/unionWith/unionWith_query_stats.js
    - jstests/aggregation/sources/lookup/lookup_single_solution_cache.js
    - jstests/aggregation/sources/bucket/collation_bucket.js
+    - jstests/aggregation/timeseries/timeseries_group_aggregations.js
  exclude_with_any_tags:
    - assumes_no_implicit_collection_creation_on_get_collection
    - assumes_against_mongod_not_mongos
--- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/aggregation_sharded_collections_query_shape_hash_stability.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/aggregation_sharded_collections_query_shape_hash_stability.yml
@ -52,6 +52,7 @@ selector:
    - jstests/aggregation/sources/unionWith/unionWith_query_stats.js
    - jstests/aggregation/sources/lookup/lookup_single_solution_cache.js
    - jstests/aggregation/sources/bucket/collation_bucket.js
+    - jstests/aggregation/timeseries/timeseries_group_aggregations.js
    - jstests/aggregation/sources/unwind/unwind_preserve_null_and_empty_arrays.js
    - jstests/aggregation/sources/sample/sample_optimization.js
    - jstests/aggregation/sources/setWindowFields/min_max_scalar_parsing.js
--- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_pqs_fallback.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_pqs_fallback.yml
@ -90,7 +90,6 @@ selector:
    - jstests/core/query/sbe/plan_cache_sbe_with_or_queries.js
    - jstests/core/query/sbe/sbe_plan_cache_autoparameterize_collscan.js
    - jstests/core/query/sbe/sbe_plan_cache_duplicate_or_clauses.js
-    - jstests/core/timeseries/query/timeseries_group_aggregations.js
  exclude_with_any_tags:
    - assumes_standalone_mongod
    - requires_profiling
--- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_pqs_fallback.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_pqs_fallback.yml
@ -119,7 +119,6 @@ selector:
    - jstests/core/query/sbe/plan_cache_sbe_with_or_queries.js
    - jstests/core/query/sbe/sbe_plan_cache_autoparameterize_collscan.js
    - jstests/core/query/sbe/sbe_plan_cache_duplicate_or_clauses.js
-    - jstests/core/timeseries/query/timeseries_group_aggregations.js
  exclude_with_any_tags:
    - assumes_standalone_mongod
    - assumes_against_mongod_not_mongos
--- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_pqs_fallback.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_pqs_fallback.yml
@ -96,7 +96,6 @@ selector:
    - jstests/core/query/sbe/plan_cache_sbe_with_or_queries.js
    - jstests/core/query/sbe/sbe_plan_cache_autoparameterize_collscan.js
    - jstests/core/query/sbe/sbe_plan_cache_duplicate_or_clauses.js
-    - jstests/core/timeseries/query/timeseries_group_aggregations.js
  exclude_with_any_tags:
    - assumes_standalone_mongod
    - assumes_against_mongod_not_mongos
--- a/buildscripts/resmokeconfig/matrix_suites/overrides/query_settings.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/overrides/query_settings.yml
@ -66,6 +66,9 @@
      # This test performs an '{_id: <id>}' query with a collator. This will not pass query settings validation. This
      # is a design decision due to mongos lacking collation information.
      - jstests/aggregation/sources/bucket/collation_bucket.js
+      # This test runs many aggregations, and the PQS passthroughs slow down queries just enough to
+      # hit the timeout more easily.
+      - jstests/aggregation/timeseries/timeseries_group_aggregations.js
    exclude_with_any_tags:
      - assumes_standalone_mongod
      - does_not_support_repeated_reads
@ -129,9 +132,6 @@
      - jstests/core/query/sbe/plan_cache_sbe_with_or_queries.js
      - jstests/core/query/sbe/sbe_plan_cache_autoparameterize_collscan.js
      - jstests/core/query/sbe/sbe_plan_cache_duplicate_or_clauses.js
-      # This test runs many aggregations, and the PQS passthroughs slow down queries just enough to
-      # hit the timeout more easily.
-      - jstests/core/timeseries/query/timeseries_group_aggregations.js
    exclude_with_any_tags:
      - uses_parallel_shell # interferes with plan cache check

--- a/buildscripts/resmokeconfig/suites/aggregation_one_shard_sharded_collections.yml
+++ b/buildscripts/resmokeconfig/suites/aggregation_one_shard_sharded_collections.yml
@ -9,6 +9,9 @@ selector:
    # TODO: Remove when SERVER-23229 is fixed.
    - jstests/aggregation/sources/group/groupMissing.js
    - jstests/aggregation/sources/graphLookup/variables.js
+    # This test executes many queries and has a long runtime. Since this passthrough doesn't provide
+    # additional valuable coverage, we can exclude it.
+    - jstests/aggregation/timeseries/timeseries_group_aggregations.js
  exclude_with_any_tags:
    # This passthrough implicitly shards the accessed collections. Do not run tests where collections
    # can't be created on `getCollection` call.
--- a/buildscripts/resmokeconfig/suites/aggregation_sharded_collections_causally_consistent_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/aggregation_sharded_collections_causally_consistent_passthrough.yml
@ -22,6 +22,9 @@ selector:
    - jstests/aggregation/optimization/use_query_projection.js
    - jstests/aggregation/optimization/use_query_sort.js
    - jstests/aggregation/sources/graphLookup/variables.js
+    # This test runs many aggregations, and is especially slow in this passthrough. Since it doesn't
+    # provide additional useful coverage in this passthrough we can exclude it.
+    - jstests/aggregation/timeseries/timeseries_group_aggregations.js
  exclude_with_any_tags:
    # The next tag corresponds to the special error thrown by the set_read_preference_secondary.js
    # override when it refuses to replace the readPreference of a particular command. Above each tag
--- a/buildscripts/resmokeconfig/suites/aggregation_unsplittable_collections_on_random_shard_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/aggregation_unsplittable_collections_on_random_shard_passthrough.yml
@ -25,6 +25,10 @@ selector:
    # Includes expectations on failpoints being hit on specific shards.
    - jstests/aggregation/sources/indexStats/verify_index_stats_output.js

+    # This test runs many aggregations, and is especially slow in this passthrough. Since it doesn't
+    # provide additional useful coverage in this passthrough we can exclude it.
+    - jstests/aggregation/timeseries/timeseries_group_aggregations.js
+
  exclude_with_any_tags:
    - assumes_against_mongod_not_mongos
    - requires_profiling
--- a/buildscripts/resmokeconfig/suites/aggregation_unsplittable_collections_on_random_shard_passthrough_with_config_transitions.yml
+++ b/buildscripts/resmokeconfig/suites/aggregation_unsplittable_collections_on_random_shard_passthrough_with_config_transitions.yml
@ -109,6 +109,10 @@ selector:
    # This test expects a stable collection UUID, which isn't true with background moveCollections.
    - jstests/aggregation/sources/collection_uuid_coll_stats_index_stats.js

+    # This test runs many aggregations, and is especially slow in this passthrough. Since it doesn't
+    # provide additional useful coverage in this passthrough we can exclude it.
+    - jstests/aggregation/timeseries/timeseries_group_aggregations.js
+
  exclude_with_any_tags:
    - assumes_against_mongod_not_mongos
    - requires_profiling
--- a/buildscripts/resmokeconfig/suites/query_cbr_histogram_aggregation_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/query_cbr_histogram_aggregation_passthrough.yml
@ -29,6 +29,10 @@ selector:
    # TODO SERVER-100610: Test directly or indirectly asserts on specific plan chosen
    - jstests/aggregation/sources/unionWith/unionWith.js

+    # This test runs many queries. This passthrough runs analyze for each indexed field on every query,
+    # causing a > 1 hour runtime. Exclude this test to keep the suite runtime reasonable.
+    - jstests/aggregation/timeseries/timeseries_group_aggregations.js
+
  exclude_with_any_tags:
    # Profiler entries will have different shape in CBR
    - requires_profiling
--- a/buildscripts/resmokeconfig/suites/query_cbr_histogram_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/query_cbr_histogram_jscore_passthrough.yml
@ -33,9 +33,6 @@ selector:
    - jstests/core/catalog/views/views_all_commands.js
    - jstests/core/catalog/agg_internal_list_collections_stage.js
    - jstests/core/catalog/agg_list_cluster_catalog_with_match.js
-    # This test runs many queries. This passthrough runs analyze for each indexed field on every query,
-    # causing a > 1 hour runtime. Exclude this test to keep the suite runtime reasonable.
-    - jstests/core/timeseries/query/timeseries_group_aggregations.js

    # TODO SERVER-100451: $elemMatch estimation using histograms
    - jstests/core/query/boolean_expression_simplification.js
--- a/buildscripts/resmokeconfig/suites/query_stats_mongos_aggregation_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/query_stats_mongos_aggregation_passthrough.yml
@ -26,6 +26,9 @@ selector:
    - jstests/aggregation/sources/unionWith/unionWith_explain.js
    # TODO SERVER-96515 Re-enable this test.
    - jstests/aggregation/expressions/expression_set_field_null_chars.js
+    # This test runs many aggregations, and is especially slow in this passthrough. Since it doesn't
+    # provide additional useful coverage in this passthrough we can exclude it.
+    - jstests/aggregation/timeseries/timeseries_group_aggregations.js
  exclude_with_any_tags:
    # The following tests start their own ShardingTest or ReplSetTest, respectively.
    - requires_sharding
--- a/buildscripts/resmokeconfig/suites/replica_sets_uninitialized_fcv_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_uninitialized_fcv_jscore_passthrough.yml
@ -43,8 +43,6 @@ selector:
    - jstests/core/testing/failcommand_failpoint.js
    # Starts MongoCryptD instead of mongod nodes
    - src/mongo/db/modules/*/jstests/fle2/fle2_bulk_write.js
-    # These tests run many aggregations, and the override slows them down enough to hit the evergreen timeout.
-    - jstests/core/timeseries/query/timeseries_group_aggregations.js
    - jstests/core/query/plan_cache/cache_correctness_pbt.js
    - jstests/core/query/index_correctness_pbt.js
    - jstests/core/query/run_all_plans_pbt.js
--- a/buildscripts/resmokeconfig/suites/sharded_collections_uninitialized_fcv_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_collections_uninitialized_fcv_jscore_passthrough.yml
@ -95,8 +95,6 @@ selector:
    - jstests/core/testing/failcommand_failpoint.js
    # Starts MongoCryptD instead of mongod nodes
    - src/mongo/db/modules/*/jstests/fle2/fle2_bulk_write.js
-    # These tests run many aggregations, and the override slows them down enough to hit the evergreen timeout.
-    - jstests/core/timeseries/query/timeseries_group_aggregations.js
    - jstests/core/query/plan_cache/cache_correctness_pbt.js
    - jstests/core/query/index_correctness_pbt.js
    - jstests/core/query/run_all_plans_pbt.js
--- a/buildscripts/resmokeconfig/suites/sharding_uninitialized_fcv_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_uninitialized_fcv_jscore_passthrough.yml
@ -70,8 +70,6 @@ selector:
    - src/mongo/db/modules/*/jstests/fle2/fle2_bulk_write.js
    # analyzeShardKey cannot run directly on a shard replica set
    - jstests/core_sharding/analyze_shard_key/*.js
-    # These tests run many aggregations, and the override slows them down enough to hit the evergreen timeout.
-    - jstests/core/timeseries/query/timeseries_group_aggregations.js
    - jstests/core/query/plan_cache/cache_correctness_pbt.js
    - jstests/core/query/index_correctness_pbt.js
    - jstests/core/query/run_all_plans_pbt.js
--- a/jstests/aggregation/timeseries/OWNERS.yml
+++ b/jstests/aggregation/timeseries/OWNERS.yml
@ -3,6 +3,9 @@ filters:
  - "*":
    approvers:
      - 10gen/query-integration-timeseries
+  - "timeseries_group_aggregations.js":
+    approvers:
+      - 10gen/query-execution-sbe
  - "OWNERS.yml":
    approvers:
      - 10gen/query-integration-staff-leads
--- a/jstests/aggregation/timeseries/timeseries_group_aggregations.js
+++ b/jstests/aggregation/timeseries/timeseries_group_aggregations.js
@ -6,9 +6,17 @@
 *
 * @tags: [
 *      requires_timeseries,
+ *       # We modify the value of a query knob. setParameter is not persistent.
 *      does_not_support_stepdowns,
+ *      # This test runs commands that are not allowed with security token: setParameter.
 *      not_allowed_with_signed_security_token,
- *      assumes_read_concern_unchanged
+ *      # Change in read concern and upgrade/downgrade make this test very expensive, and don't
+ *      # provide additional valuable coverage.
+ *      assumes_read_concern_unchanged,
+ *      cannot_run_during_upgrade_downgrade,
+ *      # This test runs many queries, and multiplanning single solutions in addition to repeating
+ *      # the queries is slow. Plan cache coverage is provided by other $group tests.
+ *      does_not_support_multiplanning_single_solutions,
 * ]
 */
 import {isSlowBuild} from "jstests/libs/query/aggregation_pipeline_utils.js";