SERVER-42693 Add renameAndPreserveOptions command and allow $out to output to different DB

11 files changed, 30 insertions, 0 deletions

diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml
index aa638310b1f..56969037c28 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml
@@ -95,6 +95,9 @@ selector:
   # TODO Unblacklist (SERVER-35538).
   - jstests/concurrency/fsm_workloads/database_versioning.js
 
+  # TODO SERVER-44652: Investigate and remove blacklist
+  - jstests/concurrency/fsm_workloads/agg_out.js
+
   exclude_with_any_tags:
   - does_not_support_causal_consistency
   - assumes_balancer_on
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 4ed710e4a3a..460c904ccdc 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml
@@ -101,6 +101,9 @@ selector:
   # TODO Unblacklist (SERVER-35538).
   - jstests/concurrency/fsm_workloads/database_versioning.js
 
+  # TODO SERVER-44652: Investigate and remove blacklist
+  - jstests/concurrency/fsm_workloads/agg_out.js
+
   exclude_with_any_tags:
   - does_not_support_causal_consistency
   # This suite uses secondary read preference, which isn't currently compatible with transactions.
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
index f2569bb136e..c2ad6972a36 100644
--- 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
@@ -133,6 +133,9 @@ selector:
   - jstests/concurrency/fsm_workloads/update_rename.js
   - jstests/concurrency/fsm_workloads/update_rename_noindex.js
 
+  # TODO SERVER-44652: Investigate and remove blacklist
+  - jstests/concurrency/fsm_workloads/agg_out.js
+
   exclude_with_any_tags:
   - does_not_support_causal_consistency
   - requires_replication
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
index 3913e53d8e2..b6731ccaa58 100644
--- 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
@@ -133,6 +133,9 @@ selector:
   - jstests/concurrency/fsm_workloads/update_rename.js
   - jstests/concurrency/fsm_workloads/update_rename_noindex.js
 
+  # TODO SERVER-44652: Investigate and remove blacklist
+  - jstests/concurrency/fsm_workloads/agg_out.js
+
   exclude_with_any_tags:
   - assumes_balancer_off
   - does_not_support_causal_consistency
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml
index 8c3c01d7899..bc082e1206e 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml
@@ -133,6 +133,9 @@ selector:
   - jstests/concurrency/fsm_workloads/update_rename.js
   - jstests/concurrency/fsm_workloads/update_rename_noindex.js
 
+  # TODO SERVER-44652: Investigate and remove blacklist
+  - jstests/concurrency/fsm_workloads/agg_out.js
+
   exclude_with_any_tags:
   - does_not_support_causal_consistency
   - requires_replication
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
index 55fab6ab7bb..ccd1fede9af 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml
@@ -133,6 +133,9 @@ selector:
   - jstests/concurrency/fsm_workloads/update_rename.js
   - jstests/concurrency/fsm_workloads/update_rename_noindex.js
 
+  # TODO SERVER-44652: Investigate and remove blacklist
+  - jstests/concurrency/fsm_workloads/agg_out.js
+
   exclude_with_any_tags:
   - assumes_balancer_off
   - does_not_support_causal_consistency
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml
index 5d1f00fe7ac..c17c6192e1d 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml
@@ -105,6 +105,9 @@ selector:
   # router tries to commit, it may not know the full participant list.
   - jstests/concurrency/fsm_workloads/multi_statement_transaction_all_commands_same_session.js
 
+  # TODO SERVER-44652: Investigate and remove blacklist
+  - jstests/concurrency/fsm_workloads/agg_out.js
+
   exclude_with_any_tags:
   - requires_replication
   - assumes_balancer_on
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml
index c83a1cb142a..a466acf6c8d 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml
@@ -110,6 +110,9 @@ selector:
   # router tries to commit, it may not know the full participant list.
   - jstests/concurrency/fsm_workloads/multi_statement_transaction_all_commands_same_session.js
 
+  # TODO SERVER-44652: Investigate and remove blacklist
+  - jstests/concurrency/fsm_workloads/agg_out.js
+
   exclude_with_any_tags:
   - assumes_balancer_off
   - requires_replication
diff --git a/buildscripts/resmokeconfig/suites/core_map_reduce_agg.yaml b/buildscripts/resmokeconfig/suites/core_map_reduce_agg.yaml
index 34f9f15fb35..539a4955508 100644
--- a/buildscripts/resmokeconfig/suites/core_map_reduce_agg.yaml
+++ b/buildscripts/resmokeconfig/suites/core_map_reduce_agg.yaml
@@ -12,6 +12,7 @@ selector:
   - jstests/core/mr_reduce.js
   - jstests/core/mr_sort.js
   - jstests/core/mr_stored.js
+  - jstests/core/mr_output_other_db.js
   - jstests/core/mr_tolerates_js_exception.js
   - jstests/core/mr_use_this_object.js
   - jstests/core/mr_scope.js
diff --git a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
index 8c445c22fa9..5804e2c086c 100644
--- a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
@@ -20,6 +20,10 @@ selector:
   - jstests/sharding/merge_stale_on_fields.js
   - jstests/sharding/refresh_sessions.js
   - jstests/sharding/lookup.js
+  # Enable when 4.4 becomes last stable
+  - jstests/sharding/out_fails_to_replace_sharded_collection.js
+  - jstests/sharding/merge_from_stale_mongos.js
+
 executor:
   config:
     shell_options:
diff --git a/buildscripts/resmokeconfig/suites/sharding_map_reduce_agg.yaml b/buildscripts/resmokeconfig/suites/sharding_map_reduce_agg.yaml
index 1f71cbb0279..10636352343 100644
--- a/buildscripts/resmokeconfig/suites/sharding_map_reduce_agg.yaml
+++ b/buildscripts/resmokeconfig/suites/sharding_map_reduce_agg.yaml
@@ -14,6 +14,7 @@ selector:
   - jstests/sharding/map_reduce_scope.js
   - jstests/sharding/max_time_ms_sharded.js
   - jstests/sharding/mr_and_agg_versioning.js
+  - jstests/sharding/mr_replace_different_db_sharded.js
   - jstests/sharding/mr_shard_version.js
   - jstests/sharding/query_config.js
   - jstests/sharding/shard_targeting.js