summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Swanson <charlie.swanson@mongodb.com>2019-06-21 12:54:32 -0400
committerCharlie Swanson <charlie.swanson@mongodb.com>2019-06-21 17:16:30 -0400
commit6818e33e2be70baf04147bf6168287c58e4faa81 (patch)
treeecd03f8857d89790eeade18d80ac54463dca2d67
parentfdedc9902c471e73ff2b8d9251772344df8bcf58 (diff)
downloadmongo-6818e33e2be70baf04147bf6168287c58e4faa81.tar.gz
SERVER-41860 Blacklist plan cache tests from the transactions passthroughs
(cherry picked from commit 491d4e528a91b04e8b20f2ddf0d1d88758599d6a)
-rw-r--r--buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml3
-rw-r--r--buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml3
-rw-r--r--buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml2
-rw-r--r--jstests/core/plan_cache_list_plans.js5
-rw-r--r--jstests/core/wildcard_index_cached_plans.js17
13 files changed, 39 insertions, 7 deletions
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
index b2250a370b4..8b6001fb74e 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
@@ -340,6 +340,8 @@ selector:
- assumes_no_implicit_index_creation
- assumes_unsharded_collection
- cannot_create_unique_index_when_using_hashed_shard_key
+ # Retrying a query can change whether a plan cache entry is active.
+ - inspects_whether_plan_cache_entry_is_active
executor:
archive:
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
index aea19356838..693a29f76ba 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
@@ -367,6 +367,8 @@ selector:
- assumes_no_implicit_index_creation
- assumes_unsharded_collection
- cannot_create_unique_index_when_using_hashed_shard_key
+ # Retrying a query can change whether a plan cache entry is active.
+ - inspects_whether_plan_cache_entry_is_active
executor:
archive:
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
index b8631bb3d20..d4e3cf62f58 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
@@ -414,6 +414,9 @@ selector:
# "Cowardly fail if unbounded dataSize is run with a mongod that had an unclean shutdown: ..."
- requires_datasize
+ # Retrying a query can change whether a plan cache entry is active.
+ - inspects_whether_plan_cache_entry_is_active
+
executor:
archive:
hooks:
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
index 2fc3339b7ef..68bca7241a3 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
@@ -423,6 +423,9 @@ selector:
# "Cowardly fail if unbounded dataSize is run with a mongod that had an unclean shutdown: ..."
- requires_datasize
+ # Retrying a query can change whether a plan cache entry is active.
+ - inspects_whether_plan_cache_entry_is_active
+
executor:
archive:
hooks:
diff --git a/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml b/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
index bbde718e809..f950cc7360c 100644
--- a/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
+++ b/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
@@ -386,6 +386,8 @@ selector:
- cannot_create_unique_index_when_using_hashed_shard_key
- assumes_balancer_off
- requires_fastcount
+ # Retrying a query can change whether a plan cache entry is active.
+ - inspects_whether_plan_cache_entry_is_active
executor:
archive:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
index ecb6490e3cc..b410d992b46 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
@@ -270,6 +270,8 @@ selector:
- assumes_write_concern_unchanged
# Transactions are not allowed to operate on capped collections.
- requires_capped
+ # Retrying a query can change whether a plan cache entry is active.
+ - inspects_whether_plan_cache_entry_is_active
executor:
archive:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml
index d9de79e009f..c9d51f2778b 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml
@@ -361,6 +361,8 @@ selector:
- operations_longer_than_stepdown_interval_in_txns
# Transactions are not allowed to operate on capped collections.
- requires_capped
+ # Retrying a query can change whether a plan cache entry is active.
+ - inspects_whether_plan_cache_entry_is_active
executor:
archive:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml
index 1cccc9726bb..f7d0e6f0122 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml
@@ -340,6 +340,8 @@ selector:
- operations_longer_than_stepdown_interval_in_txns
# Transactions are not allowed to operate on capped collections.
- requires_capped
+ # Retrying a query can change whether a plan cache entry is active.
+ - inspects_whether_plan_cache_entry_is_active
executor:
archive:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml
index ea85a1270d1..526cbdd0f13 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml
@@ -349,6 +349,8 @@ selector:
- operations_longer_than_stepdown_interval_in_txns
# Transactions are not allowed to operate on capped collections.
- requires_capped
+ # Retrying a query can change whether a plan cache entry is active.
+ - inspects_whether_plan_cache_entry_is_active
executor:
archive:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml
index 8bffc6057f3..219ad7a5c9c 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml
@@ -116,6 +116,8 @@ selector:
## The next tag corresponds to long running-operations, as they may exhaust their number
# of retries and result in a network error being thrown.
- operations_longer_than_stepdown_interval
+ # Retrying a query can change whether a plan cache entry is active.
+ - inspects_whether_plan_cache_entry_is_active
executor:
archive:
diff --git a/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
index 4285f9ea501..1c5e2052f5c 100644
--- a/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
@@ -310,6 +310,8 @@ selector:
- assumes_against_mongod_not_mongos
# Transactions are not allowed to operate on capped collections.
- requires_capped
+ # Retrying a query can change whether a plan cache entry is active.
+ - inspects_whether_plan_cache_entry_is_active
executor:
archive:
diff --git a/jstests/core/plan_cache_list_plans.js b/jstests/core/plan_cache_list_plans.js
index 51c200dbeeb..b0ae8497ba4 100644
--- a/jstests/core/plan_cache_list_plans.js
+++ b/jstests/core/plan_cache_list_plans.js
@@ -4,11 +4,12 @@
// # This test attempts to perform queries and introspect the server's plan cache entries. The
// # former operation may be routed to a secondary in the replica set, whereas the latter must be
// # routed to the primary.
-// # If the balancer is on and chunks are moved, the plan cache can have entries with isActive:
-// # false when the test assumes they are true because the query has already been run many times.
// assumes_read_preference_unchanged,
// does_not_support_stepdowns,
+// # If the balancer is on and chunks are moved, the plan cache can have entries with isActive:
+// # false when the test assumes they are true because the query has already been run many times.
// assumes_balancer_off,
+// inspects_whether_plan_cache_entry_is_active,
// ]
(function() {
diff --git a/jstests/core/wildcard_index_cached_plans.js b/jstests/core/wildcard_index_cached_plans.js
index 96b8cfa4055..634b7cb0368 100644
--- a/jstests/core/wildcard_index_cached_plans.js
+++ b/jstests/core/wildcard_index_cached_plans.js
@@ -1,11 +1,18 @@
/**
* Test that cached plans which use wildcard indexes work.
*
- * This test attempts to perform queries and introspect the server's plan cache entries using the
- * $planCacheStats aggregation source. Both operations must be routed to the primary, and the latter
- * only supports 'local' readConcern.
- * @tags: [assumes_read_preference_unchanged, assumes_read_concern_unchanged,
- * does_not_support_stepdowns, assumes_balancer_off]
+ * @tags: [
+ * # This test attempts to perform queries and introspect the server's plan cache entries using
+ * # the $planCacheStats aggregation source. Both operations must be routed to the primary, and
+ * # the latter only supports 'local' readConcern.
+ * assumes_read_preference_unchanged,
+ * assumes_read_concern_unchanged,
+ * does_not_support_stepdowns,
+ * # If the balancer is on and chunks are moved, the plan cache can have entries with isActive:
+ * # false when the test assumes they are true because the query has already been run many times.
+ * assumes_balancer_off,
+ * inspects_whether_plan_cache_entry_is_active,
+ * ]
*/
(function() {
"use strict";