SERVER-38979 Shard by thread id in update_upsert_multi fsm workloads

12 files changed, 6 insertions, 41 deletions

diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml
index 32a868ea255..ca3a3ddfc65 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml
@@ -93,10 +93,6 @@ selector:
   - jstests/concurrency/fsm_workloads/rename_collection_dbname_droptarget.js
   - jstests/concurrency/fsm_workloads/rename_collection_droptarget.js
 
-  # our update queries lack shard keys
-  - jstests/concurrency/fsm_workloads/update_upsert_multi.js
-  - jstests/concurrency/fsm_workloads/update_upsert_multi_noindex.js
-
   # cannot use upsert command with $where with sharded collections
   - jstests/concurrency/fsm_workloads/upsert_where.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
index 6b491b83b41..95a0c2aa4cf 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml
@@ -96,10 +96,6 @@ selector:
   - jstests/concurrency/fsm_workloads/rename_collection_dbname_droptarget.js
   - jstests/concurrency/fsm_workloads/rename_collection_droptarget.js
 
-  # our update queries lack shard keys
-  - jstests/concurrency/fsm_workloads/update_upsert_multi.js
-  - jstests/concurrency/fsm_workloads/update_upsert_multi_noindex.js
-
   # cannot use upsert command with $where with sharded collections
   - jstests/concurrency/fsm_workloads/upsert_where.js
 
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml
index 2721d6cf7aa..713ff6286d4 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml
@@ -91,10 +91,6 @@ selector:
   - jstests/concurrency/fsm_workloads/rename_collection_dbname_droptarget.js
   - jstests/concurrency/fsm_workloads/rename_collection_droptarget.js
 
-  # our update queries lack shard keys
-  - jstests/concurrency/fsm_workloads/update_upsert_multi.js
-  - jstests/concurrency/fsm_workloads/update_upsert_multi_noindex.js
-
   # cannot use upsert command with $where with sharded collections
   - jstests/concurrency/fsm_workloads/upsert_where.js
 
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_local_read_write_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_local_read_write_multi_stmt_txn.yml
index 67601c7e133..003d4d34cfb 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_local_read_write_multi_stmt_txn.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_local_read_write_multi_stmt_txn.yml
@@ -94,10 +94,6 @@ selector:
   - jstests/concurrency/fsm_workloads/rename_collection_dbname_droptarget.js
   - jstests/concurrency/fsm_workloads/rename_collection_droptarget.js
 
-  # our update queries lack shard keys
-  - jstests/concurrency/fsm_workloads/update_upsert_multi.js
-  - jstests/concurrency/fsm_workloads/update_upsert_multi_noindex.js
-
   # cannot use upsert command with $where with sharded collections
   - jstests/concurrency/fsm_workloads/upsert_where.js
 
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_local_read_write_multi_stmt_txn_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_local_read_write_multi_stmt_txn_with_balancer.yml
index 472e572a2b7..70c7541c276 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_local_read_write_multi_stmt_txn_with_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_local_read_write_multi_stmt_txn_with_balancer.yml
@@ -94,10 +94,6 @@ selector:
   - jstests/concurrency/fsm_workloads/rename_collection_dbname_droptarget.js
   - jstests/concurrency/fsm_workloads/rename_collection_droptarget.js
 
-  # our update queries lack shard keys
-  - jstests/concurrency/fsm_workloads/update_upsert_multi.js
-  - jstests/concurrency/fsm_workloads/update_upsert_multi_noindex.js
-
   # cannot use upsert command with $where with sharded collections
   - jstests/concurrency/fsm_workloads/upsert_where.js
 
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_multi_stmt_txn.yml
index 5acec1ac89f..c928781de03 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_multi_stmt_txn.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_multi_stmt_txn.yml
@@ -94,10 +94,6 @@ selector:
   - jstests/concurrency/fsm_workloads/rename_collection_dbname_droptarget.js
   - jstests/concurrency/fsm_workloads/rename_collection_droptarget.js
 
-  # our update queries lack shard keys
-  - jstests/concurrency/fsm_workloads/update_upsert_multi.js
-  - jstests/concurrency/fsm_workloads/update_upsert_multi_noindex.js
-
   # cannot use upsert command with $where with sharded collections
   - jstests/concurrency/fsm_workloads/upsert_where.js
 
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_multi_stmt_txn_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_multi_stmt_txn_with_balancer.yml
index cfa05b22e02..f0f7ac2b179 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_multi_stmt_txn_with_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_multi_stmt_txn_with_balancer.yml
@@ -94,10 +94,6 @@ selector:
   - jstests/concurrency/fsm_workloads/rename_collection_dbname_droptarget.js
   - jstests/concurrency/fsm_workloads/rename_collection_droptarget.js
 
-  # our update queries lack shard keys
-  - jstests/concurrency/fsm_workloads/update_upsert_multi.js
-  - jstests/concurrency/fsm_workloads/update_upsert_multi_noindex.js
-
   # cannot use upsert command with $where with sharded collections
   - jstests/concurrency/fsm_workloads/upsert_where.js
 
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml
index c8f785f3c4a..2ddd8e0ee05 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml
@@ -94,10 +94,6 @@ selector:
   - jstests/concurrency/fsm_workloads/rename_collection_dbname_droptarget.js
   - jstests/concurrency/fsm_workloads/rename_collection_droptarget.js
 
-  # our update queries lack shard keys
-  - jstests/concurrency/fsm_workloads/update_upsert_multi.js
-  - jstests/concurrency/fsm_workloads/update_upsert_multi_noindex.js
-
   # cannot use upsert command with $where with sharded collections
   - jstests/concurrency/fsm_workloads/upsert_where.js
 
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml
index 64f439cfc01..1e1cd5f5318 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml
@@ -87,10 +87,6 @@ selector:
   - jstests/concurrency/fsm_workloads/rename_collection_dbname_droptarget.js
   - jstests/concurrency/fsm_workloads/rename_collection_droptarget.js
 
-  # our update queries lack shard keys
-  - jstests/concurrency/fsm_workloads/update_upsert_multi.js
-  - jstests/concurrency/fsm_workloads/update_upsert_multi_noindex.js
-
   # cannot use upsert command with $where with sharded collections
   - jstests/concurrency/fsm_workloads/upsert_where.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
index 32930453211..ac96886c3c9 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml
@@ -90,10 +90,6 @@ selector:
   - jstests/concurrency/fsm_workloads/rename_collection_dbname_droptarget.js
   - jstests/concurrency/fsm_workloads/rename_collection_droptarget.js
 
-  # our update queries lack shard keys
-  - jstests/concurrency/fsm_workloads/update_upsert_multi.js
-  - jstests/concurrency/fsm_workloads/update_upsert_multi_noindex.js
-
   # cannot use upsert command with $where with sharded collections
   - jstests/concurrency/fsm_workloads/upsert_where.js
 
diff --git a/jstests/concurrency/fsm_workloads/update_upsert_multi.js b/jstests/concurrency/fsm_workloads/update_upsert_multi.js
index 61e7f84f2e9..3b32f166d3f 100644
--- a/jstests/concurrency/fsm_workloads/update_upsert_multi.js
+++ b/jstests/concurrency/fsm_workloads/update_upsert_multi.js
@@ -8,6 +8,8 @@
  * The 'update' state uses a query that will match one or more documents, causing a multi-update.
  * Both states use { multi: true, upsert: true }, but only one option will ever take effect,
  * depending on whether 0 or more than 0 documents match the query.
+ *
+ * @tags: [requires_non_retryable_writes]
  */
 var $config = (function() {
 
@@ -74,7 +76,8 @@ var $config = (function() {
         states: states,
         startState: 'insert',
         transitions: transitions,
-        data: {counter: 0},
+        // Shard by tid when run in a sharded cluster because upserts require the shard key.
+        data: {counter: 0, shardKey: {tid: 1}},
         setup: setup
     };
 
diff --git a/jstests/concurrency/fsm_workloads/update_upsert_multi_noindex.js b/jstests/concurrency/fsm_workloads/update_upsert_multi_noindex.js
index 9841a2e91af..be943cf7b02 100644
--- a/jstests/concurrency/fsm_workloads/update_upsert_multi_noindex.js
+++ b/jstests/concurrency/fsm_workloads/update_upsert_multi_noindex.js
@@ -5,6 +5,8 @@
  *
  * Executes the update_upsert_multi.js workload after dropping all non-_id
  * indexes on the collection.
+ *
+ * @tags: [requires_non_retryable_writes]
  */
 load('jstests/concurrency/fsm_libs/extend_workload.js');                 // for extendWorkload
 load('jstests/concurrency/fsm_workloads/update_upsert_multi.js');        // for $config