diff options
author | Dianna Hohensee <dianna.hohensee@10gen.com> | 2017-10-19 14:45:17 -0400 |
---|---|---|
committer | Dianna Hohensee <dianna.hohensee@10gen.com> | 2017-10-20 14:06:02 -0400 |
commit | 258691ffb9ee561c48e897e1df6a1bc10ae376d6 (patch) | |
tree | a8bf3a8b78d2259dddff7f5f9ed6ef4bdba52bdf | |
parent | 999d491ed3b27d47dd0a8d9d86b4f7359f2dfae3 (diff) | |
download | mongo-258691ffb9ee561c48e897e1df6a1bc10ae376d6.tar.gz |
SERVER-31615 add tag to queryoptimizer3.js so it doesn't run in sharded passthrough suites
6 files changed, 18 insertions, 5 deletions
diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml index 627d1e9af6c..21648575d6f 100644 --- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml @@ -160,6 +160,8 @@ selector: - jstests/core/views/views_stats.js - jstests/core/orf.js #explain.executionStats is not CC - jstests/core/rename7.js + exclude_with_any_tags: + - assumes_against_mongod_not_mongos executor: config: diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml index fa5596c6606..a3eaa46d3fd 100644 --- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml +++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml @@ -181,6 +181,8 @@ selector: - jstests/core/list_all_local_sessions.js # Too many users authenticated - jstests/core/list_all_sessions.js # Too many users authenticated - jstests/core/list_sessions.js # Too many users authenticated + exclude_with_any_tags: + - assumes_against_mongod_not_mongos executor: config: diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml index a7c40ba8356..03b04f5b050 100644 --- a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml @@ -76,9 +76,8 @@ selector: - jstests/core/mr1.js - jstests/core/mr3.js - jstests/core/mr4.js - # TODO: SERVER-30052 - - jstests/core/queryoptimizer3.js exclude_with_any_tags: + - assumes_against_mongod_not_mongos # Tests tagged with the following will fail because they assume collections are not sharded. - assumes_no_implicit_collection_creation_after_drop - assumes_no_implicit_index_creation diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml index fd219e98359..13d7efd7319 100644 --- a/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml @@ -48,7 +48,8 @@ selector: # TODO: SERVER-27269: mongos can't establish cursor if view has $collStats and views another view. - jstests/core/views/views_coll_stats.js - jstests/core/killop_drop_collection.js # Uses fsyncLock. - + exclude_with_any_tags: + - assumes_against_mongod_not_mongos executor: config: diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml index c91b20b482d..2059124e280 100644 --- a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml @@ -31,7 +31,6 @@ selector: - jstests/core/max_time_ms.js # sleep, SERVER-2212. - jstests/core/notablescan.js # notablescan. - jstests/core/profile*.js # profiling. - - jstests/core/queryoptimizer3.js # SERVER-31557 - jstests/core/repair_database.js # repairDatabase - jstests/core/repair_database_input_validation.js # repairDatabase - jstests/core/repair_server12955.js # repairDatabase @@ -49,7 +48,8 @@ selector: # TODO: SERVER-27269: mongos can't establish cursor if view has $collStats and views another view. - jstests/core/views/views_coll_stats.js - jstests/core/killop_drop_collection.js # Uses fsyncLock. - + exclude_with_any_tags: + - assumes_against_mongod_not_mongos executor: config: diff --git a/jstests/core/queryoptimizer3.js b/jstests/core/queryoptimizer3.js index eff49442645..6d35e3085a9 100644 --- a/jstests/core/queryoptimizer3.js +++ b/jstests/core/queryoptimizer3.js @@ -1,4 +1,13 @@ // Validates cases where index scans are aborted due to the collection being dropped (SERVER-4400) +// +// Drop and other sharding commands can conflict with LockBusy errors in a sharding passthrough +// suite. This is because drop against a mongos takes distlocks, whereas drop against a mongod does +// not. Due to the huge number of parallel drops in this test, the other thead is very likely to be +// starved frequently. +// Note: this tag can be safely removed once PM-697 is complete and replaces distlocks with a +// LockManager that has a fairness policy, which distlocks lack. +// @tags: [assumes_against_mongod_not_mongos] + (function() { 'use strict'; |