SERVER-36849 Disable new shard collection path on v4.0r4.0.2-rc0r4.0.2

15 files changed, 31 insertions, 3 deletions

diff --git a/buildscripts/resmokeconfig/suites/sharding.yml b/buildscripts/resmokeconfig/suites/sharding.yml
index ce952617352..0bf8709c63b 100644
--- a/buildscripts/resmokeconfig/suites/sharding.yml
+++ b/buildscripts/resmokeconfig/suites/sharding.yml
@@ -3,6 +3,9 @@ test_kind: js_test
 selector:
   roots:
   - jstests/sharding/*.js
+  exclude_files:
+  # Enable when SERVER-36634 is fixed.
+  - jstests/sharding/shard_collection_existing_zones.js
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth.yml b/buildscripts/resmokeconfig/suites/sharding_auth.yml
index f7698454d30..36bbeaf24e8 100644
--- a/buildscripts/resmokeconfig/suites/sharding_auth.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_auth.yml
@@ -35,6 +35,8 @@ selector:
   - jstests/sharding/migration_critical_section_concurrency.js        # SERVER-21713
   # Runs with auth enabled.
   - jstests/sharding/mongod_returns_no_cluster_time_without_keys.js
+  # Enable when SERVER-36634 is fixed.
+  - jstests/sharding/shard_collection_existing_zones.js
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml
index a1a469b1b98..515b8123596 100644
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml
@@ -35,6 +35,8 @@ selector:
   - jstests/sharding/migration_critical_section_concurrency.js        # SERVER-21713
   # Runs with auth enabled.
   - jstests/sharding/mongod_returns_no_cluster_time_without_keys.js
+  # Enable when SERVER-36634 is fixed.
+  - jstests/sharding/shard_collection_existing_zones.js
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit_misc.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit_misc.yml
index 89903d3d42f..3f638d9da7b 100644
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit_misc.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_auth_audit_misc.yml
@@ -373,6 +373,8 @@ selector:
   - jstests/sharding/user_flags_sharded.js
   - jstests/sharding/move_chunk_with_session_helper.js
   - jstests/sharding/movechunk_include.js
+  # Enable when SERVER-36634 is fixed.
+  - jstests/sharding/shard_collection_existing_zones.js
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_misc.yml b/buildscripts/resmokeconfig/suites/sharding_auth_misc.yml
index b8843ad0d2b..320eb11e17c 100644
--- a/buildscripts/resmokeconfig/suites/sharding_auth_misc.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_auth_misc.yml
@@ -372,6 +372,8 @@ selector:
   - jstests/sharding/user_flags_sharded.js
   - jstests/sharding/move_chunk_with_session_helper.js
   - jstests/sharding/movechunk_include.js
+  # Enable when SERVER-36634 is fixed.
+  - jstests/sharding/shard_collection_existing_zones.js
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
index 433e198f1ab..c8735859bda 100644
--- a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
@@ -168,6 +168,8 @@ selector:
   # Checks for an exact number of matching entries in the profiler, which will fail if a command
   # gets retried due to a stepdown.
   - jstests/sharding/database_and_shard_versioning_all_commands.js
+  # Enable when SERVER-36634 is fixed.
+  - jstests/sharding/shard_collection_existing_zones.js
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/sharding_ese.yml b/buildscripts/resmokeconfig/suites/sharding_ese.yml
index d8d620384a1..71af0b6f742 100644
--- a/buildscripts/resmokeconfig/suites/sharding_ese.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_ese.yml
@@ -7,6 +7,9 @@ test_kind: js_test
 selector:
   roots:
   - jstests/sharding/*.js
+  exclude_files:
+  # Enable when SERVER-36634 is fixed.
+  - jstests/sharding/shard_collection_existing_zones.js
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/sharding_ese_misc.yml b/buildscripts/resmokeconfig/suites/sharding_ese_misc.yml
index 1e56f09f2f1..4ba960c4416 100644
--- a/buildscripts/resmokeconfig/suites/sharding_ese_misc.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_ese_misc.yml
@@ -382,6 +382,8 @@ selector:
   - jstests/sharding/movechunk_include.js
   - jstests/sharding/user_flags_sharded.js
   - jstests/sharding/move_chunk_with_session_helper.js
+  # Enable when SERVER-36634 is fixed.
+  - jstests/sharding/shard_collection_existing_zones.js
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml
index a150217bc2b..3ad59a9f73d 100644
--- a/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml
@@ -60,6 +60,7 @@ selector:
   # we expect a second drop to return status OK. 
   - jstests/core/drop.js
   - jstests/core/explain_upsert.js
+
   exclude_with_any_tags:
   - assumes_against_mongod_not_mongos
 
diff --git a/buildscripts/resmokeconfig/suites/sharding_misc.yml b/buildscripts/resmokeconfig/suites/sharding_misc.yml
index 1362c9cc318..93551faabbd 100644
--- a/buildscripts/resmokeconfig/suites/sharding_misc.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_misc.yml
@@ -375,6 +375,8 @@ selector:
   - jstests/sharding/movechunk_include.js
   - jstests/sharding/user_flags_sharded.js
   - jstests/sharding/move_chunk_with_session_helper.js
+  # Enable when SERVER-36634 is fixed.
+  - jstests/sharding/shard_collection_existing_zones.js
 
 executor:
   config:
diff --git a/buildscripts/templates/generate_resmoke_suites/sharding.yml.j2 b/buildscripts/templates/generate_resmoke_suites/sharding.yml.j2
index f680444cbbc..9acfb534188 100644
--- a/buildscripts/templates/generate_resmoke_suites/sharding.yml.j2
+++ b/buildscripts/templates/generate_resmoke_suites/sharding.yml.j2
@@ -19,6 +19,9 @@ selector:
 {% endfor %}
 {% if is_misc is defined %}
   - jstests/sharding/*.js
+  exclude_files:
+  # Enable when SERVER-36634 is fixed.
+  - jstests/sharding/shard_collection_existing_zones.js
 {% endif %}
 {% if excluded_tests is defined %}
   exclude_files:
diff --git a/buildscripts/templates/generate_resmoke_suites/sharding_auth.yml.j2 b/buildscripts/templates/generate_resmoke_suites/sharding_auth.yml.j2
index 86d41ade5f6..c585ee513f0 100644
--- a/buildscripts/templates/generate_resmoke_suites/sharding_auth.yml.j2
+++ b/buildscripts/templates/generate_resmoke_suites/sharding_auth.yml.j2
@@ -52,6 +52,8 @@ selector:
   - jstests/sharding/migration_critical_section_concurrency.js        # SERVER-21713
   # Runs with auth enabled.
   - jstests/sharding/mongod_returns_no_cluster_time_without_keys.js
+  # Enable when SERVER-36634 is fixed.
+  - jstests/sharding/shard_collection_existing_zones.js
 {% if excluded_tests is defined %}
 {% for test in excluded_tests %}
   - {{ test }}
diff --git a/buildscripts/templates/generate_resmoke_suites/sharding_auth_audit.yml.j2 b/buildscripts/templates/generate_resmoke_suites/sharding_auth_audit.yml.j2
index 0a46cb4585f..326cbd10ecf 100644
--- a/buildscripts/templates/generate_resmoke_suites/sharding_auth_audit.yml.j2
+++ b/buildscripts/templates/generate_resmoke_suites/sharding_auth_audit.yml.j2
@@ -53,6 +53,8 @@ selector:
   - jstests/sharding/migration_critical_section_concurrency.js        # SERVER-21713
   # Runs with auth enabled.
   - jstests/sharding/mongod_returns_no_cluster_time_without_keys.js
+  # Enable when SERVER-36634 is fixed.
+  - jstests/sharding/shard_collection_existing_zones.js
 {% if excluded_tests is defined %}
 {% for test in excluded_tests %}
   - {{ test }}
diff --git a/buildscripts/templates/generate_resmoke_suites/sharding_ese.yml.j2 b/buildscripts/templates/generate_resmoke_suites/sharding_ese.yml.j2
index 16cd54389e4..10ef110b1a5 100644
--- a/buildscripts/templates/generate_resmoke_suites/sharding_ese.yml.j2
+++ b/buildscripts/templates/generate_resmoke_suites/sharding_ese.yml.j2
@@ -25,6 +25,8 @@ selector:
 {% if is_misc is defined %}
   - jstests/sharding/*.js
   exclude_files:
+  # Enable when SERVER-36634 is fixed.
+  - jstests/sharding/shard_collection_existing_zones.js
 {% if excluded_tests is defined %}
 {% for test in excluded_tests %}
   - {{ test }}
diff --git a/src/mongo/db/s/config/configsvr_shard_collection_command.cpp b/src/mongo/db/s/config/configsvr_shard_collection_command.cpp
index 9815e076626..f3ff26fe19e 100644
--- a/src/mongo/db/s/config/configsvr_shard_collection_command.cpp
+++ b/src/mongo/db/s/config/configsvr_shard_collection_command.cpp
@@ -755,9 +755,7 @@ public:
         bool isEmpty = (conn->count(nss.ns()) == 0);
         boost::optional<UUID> uuid;
 
-        if (serverGlobalParams.featureCompatibility.getVersion() ==
-            ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo40) {
-
+        if (false) {
             // The primary shard will read the config.tags collection so we need to lock the zone
             // mutex.
             Lock::ExclusiveLock lk = catalogManager->lockZoneMutex(opCtx);