SERVER-21489 enableSharding should return error if sharding is already enabled

1 files changed, 12 insertions, 4 deletions

diff --git a/jstests/sharding/top_chunk_autosplit.js b/jstests/sharding/top_chunk_autosplit.js
index 7d001f9bcb5..4c431da75f7 100644
--- a/jstests/sharding/top_chunk_autosplit.js
+++ b/jstests/sharding/top_chunk_autosplit.js
@@ -24,9 +24,7 @@ function runTest(test) {
     jsTest.log(tojson(test));
 
     // Setup
-    // Enable sharding, set primary shard and shard collection
-    assert.commandWorked(db.adminCommand({enableSharding: dbName}));
-    db.adminCommand({movePrimary: dbName, to: 'shard0000'});
+    // Shard collection
     assert.commandWorked(db.adminCommand({shardCollection: coll + "", key: {x: 1}}));
 
     // Pre-split, move chunks & create tags
@@ -235,6 +233,9 @@ var tests = [
     }
 ];
 
+assert.commandWorked(db.adminCommand({enableSharding: dbName}));
+db.adminCommand({movePrimary: dbName, to: 'shard0000'});
+
 // Execute all test objects
 for (var i = 0; i < tests.length; i++) {
     runTest(tests[i]);
@@ -267,6 +268,9 @@ var singleNodeTests = [
     }
 ];
 
+assert.commandWorked(db.adminCommand({enableSharding: dbName}));
+db.adminCommand({movePrimary: dbName, to: 'shard0000'});
+
 // Execute all test objects
 for (var i = 0; i < singleNodeTests.length; i++) {
     runTest(singleNodeTests[i]);
@@ -310,11 +314,15 @@ var maxSizeTests = [
     }
 ];
 
-// Execute all test objects
 // SERVER-17070 Auto split moves to shard node running WiredTiger, if exceeding maxSize
 var unsupported = ["wiredTiger", "rocksdb"];
 if (unsupported.indexOf(st.d0.adminCommand({serverStatus : 1}).storageEngine.name) == -1 &&
     unsupported.indexOf(st.d1.adminCommand({serverStatus : 1}).storageEngine.name) == -1) {
+
+    assert.commandWorked(db.adminCommand({enableSharding: dbName}));
+    db.adminCommand({movePrimary: dbName, to: 'shard0000'});
+
+    // Execute all test objects
     for (var i = 0; i < maxSizeTests.length; i++) {
         runTest(maxSizeTests[i]);
     }