SERVER-42330

mvankeulen94 · evergreen · commit b00ddb01418d · 2019-08-28T20:39:19.000Z
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml
@@ -79,6 +79,10 @@ selector:
 
   # reIndex is not supported in mongos.
   - jstests/concurrency/fsm_workloads/reindex.js
+  - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
+
+  # The WTWriteConflictException failpoint is not supported on mongos.
+  - jstests/concurrency/fsm_workloads/collmod_writeconflict.js
 
   # our .remove(query, {justOne: true}) calls lack shard keys
   - jstests/concurrency/fsm_workloads/remove_single_document.js
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml
@@ -82,6 +82,10 @@ selector:
 
   # reIndex is not supported in mongos.
   - jstests/concurrency/fsm_workloads/reindex.js
+  - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
+
+  # The WTWriteConflictException failpoint is not supported on mongos.
+  - jstests/concurrency/fsm_workloads/collmod_writeconflict.js
 
   # our .remove(query, {justOne: true}) calls lack shard keys
   - jstests/concurrency/fsm_workloads/remove_single_document.js
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml
@@ -80,6 +80,10 @@ selector:
   # reIndex is not supported in mongos.
   - jstests/concurrency/fsm_workloads/reindex.js
   - jstests/concurrency/fsm_workloads/reindex_background.js
+  - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
+
+  # The WTWriteConflictException failpoint is not supported on mongos.
+  - jstests/concurrency/fsm_workloads/collmod_writeconflict.js
 
   # our .remove(query, {justOne: true}) calls lack shard keys
   - jstests/concurrency/fsm_workloads/remove_single_document.js
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml
@@ -80,6 +80,10 @@ selector:
   # reIndex is not supported in mongos.
   - jstests/concurrency/fsm_workloads/reindex.js
   - jstests/concurrency/fsm_workloads/reindex_background.js
+  - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
+
+  # The WTWriteConflictException failpoint is not supported on mongos.
+  - jstests/concurrency/fsm_workloads/collmod_writeconflict.js
 
   # our .remove(query, {justOne: true}) calls lack shard keys
   - jstests/concurrency/fsm_workloads/remove_single_document.js
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml
@@ -80,6 +80,10 @@ selector:
   # reIndex is not supported in mongos.
   - jstests/concurrency/fsm_workloads/reindex.js
   - jstests/concurrency/fsm_workloads/reindex_background.js
+  - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
+
+  # The WTWriteConflictException failpoint is not supported on mongos.
+  - jstests/concurrency/fsm_workloads/collmod_writeconflict.js
 
   # our .remove(query, {justOne: true}) calls lack shard keys
   - jstests/concurrency/fsm_workloads/remove_single_document.js
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml
@@ -80,6 +80,10 @@ selector:
   # reIndex is not supported in mongos.
   - jstests/concurrency/fsm_workloads/reindex.js
   - jstests/concurrency/fsm_workloads/reindex_background.js
+  - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
+
+  # The WTWriteConflictException failpoint is not supported on mongos.
+  - jstests/concurrency/fsm_workloads/collmod_writeconflict.js
 
   # our .remove(query, {justOne: true}) calls lack shard keys
   - jstests/concurrency/fsm_workloads/remove_single_document.js
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml
@@ -85,6 +85,7 @@ selector:
   # reIndex is not supported in mongos.
   - jstests/concurrency/fsm_workloads/reindex.js
   - jstests/concurrency/fsm_workloads/reindex_background.js
+  - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
 
   # our .remove(query, {justOne: true}) calls lack shard keys
   - jstests/concurrency/fsm_workloads/remove_single_document.js
@@ -169,6 +170,7 @@ selector:
   - jstests/concurrency/fsm_workloads/agg_sort.js
   - jstests/concurrency/fsm_workloads/collmod.js
   - jstests/concurrency/fsm_workloads/collmod_separate_collections.js
+  - jstests/concurrency/fsm_workloads/collmod_writeconflict.js
   - jstests/concurrency/fsm_workloads/invalidated_cursors.js
   - jstests/concurrency/fsm_workloads/kill_multicollection_aggregation.js
   - jstests/concurrency/fsm_workloads/view_catalog.js
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml
@@ -77,6 +77,10 @@ selector:
   # reIndex is not supported in mongos.
   - jstests/concurrency/fsm_workloads/reindex.js
   - jstests/concurrency/fsm_workloads/reindex_background.js
+  - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
+
+  # The WTWriteConflictException failpoint is not supported on mongos.
+  - jstests/concurrency/fsm_workloads/collmod_writeconflict.js
 
   # our .remove(query, {justOne: true}) calls lack shard keys
   - jstests/concurrency/fsm_workloads/remove_single_document.js
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml
@@ -80,6 +80,10 @@ selector:
   # reIndex is not supported in mongos.
   - jstests/concurrency/fsm_workloads/reindex.js
   - jstests/concurrency/fsm_workloads/reindex_background.js
+  - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
+
+  # The WTWriteConflictException failpoint is not supported on mongos.
+  - jstests/concurrency/fsm_workloads/collmod_writeconflict.js
 
   # our .remove(query, {justOne: true}) calls lack shard keys
   - jstests/concurrency/fsm_workloads/remove_single_document.js
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml
@@ -121,6 +121,7 @@ selector:
   - jstests/concurrency/fsm_workloads/list_indexes.js
   - jstests/concurrency/fsm_workloads/reindex.js
   - jstests/concurrency/fsm_workloads/reindex_background.js
+  - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
   - jstests/concurrency/fsm_workloads/remove_multiple_documents.js
   - jstests/concurrency/fsm_workloads/remove_where.js
   - jstests/concurrency/fsm_workloads/server_status_with_time_out_cursors.js
@@ -150,6 +151,7 @@ selector:
   - jstests/concurrency/fsm_workloads/agg_sort.js
   - jstests/concurrency/fsm_workloads/collmod.js
   - jstests/concurrency/fsm_workloads/collmod_separate_collections.js
+  - jstests/concurrency/fsm_workloads/collmod_writeconflict.js
   - jstests/concurrency/fsm_workloads/agg_out_interrupt_cleanup.js
   - jstests/concurrency/fsm_workloads/invalidated_cursors.js
   - jstests/concurrency/fsm_workloads/kill_multicollection_aggregation.js
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml
@@ -124,6 +124,7 @@ selector:
   - jstests/concurrency/fsm_workloads/list_indexes.js
   - jstests/concurrency/fsm_workloads/reindex.js
   - jstests/concurrency/fsm_workloads/reindex_background.js
+  - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
   - jstests/concurrency/fsm_workloads/remove_multiple_documents.js
   - jstests/concurrency/fsm_workloads/server_status_with_time_out_cursors.js
   - jstests/concurrency/fsm_workloads/touch_base.js
@@ -152,6 +153,7 @@ selector:
   - jstests/concurrency/fsm_workloads/agg_sort.js
   - jstests/concurrency/fsm_workloads/collmod.js
   - jstests/concurrency/fsm_workloads/collmod_separate_collections.js
+  - jstests/concurrency/fsm_workloads/collmod_writeconflict.js
   - jstests/concurrency/fsm_workloads/agg_out_interrupt_cleanup.js
   - jstests/concurrency/fsm_workloads/invalidated_cursors.js
   - jstests/concurrency/fsm_workloads/kill_multicollection_aggregation.js
diff --git a/buildscripts/resmokeconfig/suites/concurrency_simultaneous.yml b/buildscripts/resmokeconfig/suites/concurrency_simultaneous.yml
@@ -23,6 +23,12 @@ selector:
   # SERVER-30644 These tests create/drop/modify views which can deadlock on the ViewCatalog mutex if
   # there's a concurrent operation which acquires a MODE_X lock.
   - jstests/concurrency/fsm_workloads/view_catalog*.js
+
+  # SERVER-43053 These workloads set a failpoint that causes intermittent WriteConflict errors,
+  # which presently can cause other simultaneous workloads to fail.
+  - jstests/concurrency/fsm_workloads/collmod_writeconflict.js
+  - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
+
   exclude_with_any_tags:
   - uses_transactions
   - requires_replication
diff --git a/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication.yml b/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication.yml
@@ -38,6 +38,12 @@ selector:
 
   # This workload assumes no locks are taken outside of the workload.
   - jstests/concurrency/fsm_workloads/access_collection_in_transaction_after_catalog_changes.js
+
+  # SERVER-43053 These workloads set a failpoint that causes intermittent WriteConflict errors,
+  # which presently can cause other simultaneous workloads to fail.
+  - jstests/concurrency/fsm_workloads/collmod_writeconflict.js
+  - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
+
   exclude_with_any_tags:
   - requires_sharding
 
diff --git a/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_cursor_sweeps.yml b/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_cursor_sweeps.yml
@@ -38,6 +38,12 @@ selector:
 
   # This workload assumes no locks are taken outside of the workload.
   - jstests/concurrency/fsm_workloads/access_collection_in_transaction_after_catalog_changes.js
+
+  # SERVER-43053 These workloads set a failpoint that causes intermittent WriteConflict errors,
+  # which presently can cause other simultaneous workloads to fail.
+  - jstests/concurrency/fsm_workloads/collmod_writeconflict.js
+  - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
+
   exclude_with_any_tags:
   - requires_sharding
 
diff --git a/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_eviction_debug.yml b/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_eviction_debug.yml
@@ -38,6 +38,12 @@ selector:
 
   # This workload assumes no locks are taken outside of the workload.
   - jstests/concurrency/fsm_workloads/access_collection_in_transaction_after_catalog_changes.js
+
+  # SERVER-43053 These workloads set a failpoint that causes intermittent WriteConflict errors,
+  # which presently can cause other simultaneous workloads to fail.
+  - jstests/concurrency/fsm_workloads/collmod_writeconflict.js
+  - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
+
   exclude_with_any_tags:
   - requires_sharding
 
diff --git a/jstests/concurrency/fsm_workloads/collmod_writeconflict.js b/jstests/concurrency/fsm_workloads/collmod_writeconflict.js
@@ -0,0 +1,35 @@
+'use strict';
+
+/**
+ * collmod_writeconflict.js
+ *
+ * Ensures collMod successfully handles WriteConflictExceptions.
+ */
+load('jstests/concurrency/fsm_libs/extend_workload.js');  // for extendWorkload
+load('jstests/concurrency/fsm_workloads/collmod.js');     // for $config
+
+var $config = extendWorkload($config, function($config, $super) {
+    $config.data.prefix = 'collmod_writeconflict';
+    $config.setup = function setup(db, collName, cluster) {
+        $super.setup.apply(this, arguments);
+        // Log traces for each WriteConflictException encountered in case they are not handled
+        // properly.
+        assertAlways.commandWorked(
+            db.adminCommand({setParameter: 1, traceWriteConflictExceptions: true}));
+
+        // Set up failpoint to trigger WriteConflictException during write operations.
+        assertAlways.commandWorked(db.adminCommand(
+            {configureFailPoint: 'WTWriteConflictException', mode: {activationProbability: 0.5}}));
+    };
+    $config.teardown = function teardown(db, collName, cluster) {
+        assertAlways.commandWorked(
+            db.adminCommand({configureFailPoint: 'WTWriteConflictException', mode: "off"}));
+        assertAlways.commandWorked(
+            db.adminCommand({setParameter: 1, traceWriteConflictExceptions: false}));
+    };
+
+    $config.threadCount = 2;
+    $config.iterations = 5;
+
+    return $config;
+});
diff --git a/jstests/concurrency/fsm_workloads/reindex_writeconflict.js b/jstests/concurrency/fsm_workloads/reindex_writeconflict.js
@@ -0,0 +1,48 @@
+'use strict';
+
+/**
+ * reindex_writeconflict.js
+ *
+ * Ensures reIndex successfully handles WriteConflictExceptions.
+ */
+var $config = (function() {
+    var states = {
+        reIndex: function reIndex(db, collName) {
+            var res = db[collName].reIndex();
+            assertAlways.commandWorked(res);
+        },
+    };
+
+    var transitions = {reIndex: {reIndex: 1}};
+
+    function setup(db, collName, cluster) {
+        for (var i = 0; i < 1000; ++i) {
+            db[collName].insert({_id: i});
+        }
+        // Log traces for each WriteConflictException encountered in case they are not handled
+        // properly.
+        assertAlways.commandWorked(
+            db.adminCommand({setParameter: 1, traceWriteConflictExceptions: true}));
+
+        // Set up failpoint to trigger WriteConflictException during write operations.
+        assertAlways.commandWorked(db.adminCommand(
+            {configureFailPoint: 'WTWriteConflictException', mode: {activationProbability: 0.5}}));
+    }
+
+    function teardown(db, collName, cluster) {
+        assertAlways.commandWorked(
+            db.adminCommand({configureFailPoint: 'WTWriteConflictException', mode: "off"}));
+        assertAlways.commandWorked(
+            db.adminCommand({setParameter: 1, traceWriteConflictExceptions: false}));
+    }
+
+    return {
+        threadCount: 2,
+        iterations: 5,
+        startState: 'reIndex',
+        states: states,
+        transitions: transitions,
+        setup: setup,
+        teardown: teardown,
+    };
+})();
diff --git a/src/mongo/db/catalog/coll_mod.cpp b/src/mongo/db/catalog/coll_mod.cpp
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript
diff --git a/src/mongo/db/commands/drop_indexes.cpp b/src/mongo/db/commands/drop_indexes.cpp
