diff options
17 files changed, 22 insertions, 60 deletions
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml index 83467144c4c..7e4e48ed066 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml @@ -9,9 +9,6 @@ selector: - jstests/concurrency/fsm_workloads/distinct_noindex.js - jstests/concurrency/fsm_workloads/distinct_projection.js - # SERVER-17397 Drops of sharded namespaces may not fully succeed - - jstests/concurrency/fsm_workloads/create_database.js - # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded # collections'. This bug is problematic for these workloads because they assert on count() # values: 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 3bfbf5175bd..ff7501c54de 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml @@ -9,9 +9,6 @@ selector: - jstests/concurrency/fsm_workloads/distinct_noindex.js - jstests/concurrency/fsm_workloads/distinct_projection.js - # SERVER-17397 Drops of sharded namespaces may not fully succeed - - jstests/concurrency/fsm_workloads/create_database.js - # SERVER-14669 Multi-removes that use $where miscount removed documents - jstests/concurrency/fsm_workloads/remove_where.js diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_kill_primary_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_kill_primary_with_balancer.yml index 18452678c0c..f2e6a544dea 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_kill_primary_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_kill_primary_with_balancer.yml @@ -9,9 +9,6 @@ selector: - jstests/concurrency/fsm_workloads/distinct_noindex.js - jstests/concurrency/fsm_workloads/distinct_projection.js - # SERVER-17397 Drops of sharded namespaces may not fully succeed - - jstests/concurrency/fsm_workloads/create_database.js - # SERVER-14669 Multi-removes that use $where miscount removed documents - jstests/concurrency/fsm_workloads/remove_where.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 index a904a527bc6..7f0ce597620 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 @@ -13,9 +13,6 @@ selector: - jstests/concurrency/fsm_workloads/distinct_noindex.js - jstests/concurrency/fsm_workloads/distinct_projection.js - # SERVER-17397 Drops of sharded namespaces may not fully succeed - - jstests/concurrency/fsm_workloads/create_database.js - # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded # collections'. This bug is problematic for these workloads because they assert on count() # values: 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 b629f4d1971..ca3e87dde52 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 @@ -13,9 +13,6 @@ selector: - jstests/concurrency/fsm_workloads/distinct_noindex.js - jstests/concurrency/fsm_workloads/distinct_projection.js - # SERVER-17397 Drops of sharded namespaces may not fully succeed - - jstests/concurrency/fsm_workloads/create_database.js - # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded # collections'. This bug is problematic for these workloads because they assert on count() # values: diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml index 0d711ca421c..66a8a47b4d6 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml @@ -13,9 +13,6 @@ selector: - jstests/concurrency/fsm_workloads/distinct_noindex.js - jstests/concurrency/fsm_workloads/distinct_projection.js - # SERVER-17397 Drops of sharded namespaces may not fully succeed - - jstests/concurrency/fsm_workloads/create_database.js - # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded # collections'. This bug is problematic for these workloads because they assert on count() # values: diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml index e3280f20994..aa1599a3d1e 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml @@ -18,9 +18,6 @@ selector: - jstests/concurrency/fsm_workloads/distinct_noindex.js - jstests/concurrency/fsm_workloads/distinct_projection.js - # SERVER-17397 Drops of sharded namespaces may not fully succeed - - jstests/concurrency/fsm_workloads/create_database.js - # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded # collections'. This bug is problematic for these workloads because they assert on count() # values: diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml index 17bf8eb2ccf..cc53c9d8b91 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml @@ -18,9 +18,6 @@ selector: - jstests/concurrency/fsm_workloads/distinct_noindex.js - jstests/concurrency/fsm_workloads/distinct_projection.js - # SERVER-17397 Drops of sharded namespaces may not fully succeed - - jstests/concurrency/fsm_workloads/create_database.js - # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded # collections'. This bug is problematic for these workloads because they assert on count() # values: 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 84d7c942484..1920a225dd0 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 @@ -13,9 +13,6 @@ selector: - jstests/concurrency/fsm_workloads/distinct_noindex.js - jstests/concurrency/fsm_workloads/distinct_projection.js - # SERVER-17397 Drops of sharded namespaces may not fully succeed - - jstests/concurrency/fsm_workloads/create_database.js - # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded # collections'. This bug is problematic for these workloads because they assert on count() # values: 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 index 88a29447a8e..609de156c2e 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml @@ -18,9 +18,6 @@ selector: - jstests/concurrency/fsm_workloads/distinct_noindex.js - jstests/concurrency/fsm_workloads/distinct_projection.js - # SERVER-17397 Drops of sharded namespaces may not fully succeed - - jstests/concurrency/fsm_workloads/create_database.js - # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded # collections'. This bug is problematic for these workloads because they assert on count() # values: diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml index f2e8e9a06b1..02d2c081cfb 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml @@ -9,10 +9,6 @@ selector: - jstests/concurrency/fsm_workloads/distinct_noindex.js - jstests/concurrency/fsm_workloads/distinct_projection.js - # SERVER-17397 Drops of sharded namespaces may not fully succeed - - jstests/concurrency/fsm_workloads/create_database.js - - jstests/concurrency/fsm_workloads/map_reduce_drop.js - # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded # collections'. This bug is problematic for these workloads because they assert on count() # values: diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml index 0d104100f9d..7fede223baa 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml @@ -9,10 +9,6 @@ selector: - jstests/concurrency/fsm_workloads/distinct_noindex.js - jstests/concurrency/fsm_workloads/distinct_projection.js - # SERVER-17397 Drops of sharded namespaces may not fully succeed - - jstests/concurrency/fsm_workloads/create_database.js - - jstests/concurrency/fsm_workloads/map_reduce_drop.js - # SERVER-14669 Multi-removes that use $where miscount removed documents - jstests/concurrency/fsm_workloads/remove_where.js diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml index 41e0539bbc3..a276ebf9d67 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml @@ -9,9 +9,6 @@ selector: - jstests/concurrency/fsm_workloads/distinct_noindex.js - jstests/concurrency/fsm_workloads/distinct_projection.js - # SERVER-17397 Drops of sharded namespaces may not fully succeed - - jstests/concurrency/fsm_workloads/create_database.js - # SERVER-14669 Multi-removes that use $where miscount removed documents - jstests/concurrency/fsm_workloads/remove_where.js diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml index fe148c981c7..f075f53951b 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml @@ -9,10 +9,6 @@ selector: - jstests/concurrency/fsm_workloads/distinct_noindex.js - jstests/concurrency/fsm_workloads/distinct_projection.js - # SERVER-17397 Drops of sharded namespaces may not fully succeed - - jstests/concurrency/fsm_workloads/create_database.js - - jstests/concurrency/fsm_workloads/map_reduce_drop.js - # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded # collections'. This bug is problematic for these workloads because they assert on count() # values: 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 f4e9fad96fc..58a638ba149 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml @@ -9,10 +9,6 @@ selector: - jstests/concurrency/fsm_workloads/distinct_noindex.js - jstests/concurrency/fsm_workloads/distinct_projection.js - # SERVER-17397 Drops of sharded namespaces may not fully succeed - - jstests/concurrency/fsm_workloads/create_database.js - - jstests/concurrency/fsm_workloads/map_reduce_drop.js - # SERVER-14669 Multi-removes that use $where miscount removed documents - jstests/concurrency/fsm_workloads/remove_where.js diff --git a/buildscripts/resmokeconfig/suites/simulate_crash_concurrency_replication.yml b/buildscripts/resmokeconfig/suites/simulate_crash_concurrency_replication.yml index 312f8249245..2bb1f11d621 100644 --- a/buildscripts/resmokeconfig/suites/simulate_crash_concurrency_replication.yml +++ b/buildscripts/resmokeconfig/suites/simulate_crash_concurrency_replication.yml @@ -19,6 +19,9 @@ selector: - jstests/concurrency/fsm_workloads/reindex_background.js - jstests/concurrency/fsm_workloads/reindex_writeconflict.js + # TODO SERVER-73435 re-enable test + - jstests/concurrency/fsm_workloads/create_database.js + exclude_with_any_tags: - requires_sharding diff --git a/jstests/concurrency/fsm_workloads/create_database.js b/jstests/concurrency/fsm_workloads/create_database.js index 8391a6fb5dc..585c945029e 100644 --- a/jstests/concurrency/fsm_workloads/create_database.js +++ b/jstests/concurrency/fsm_workloads/create_database.js @@ -18,22 +18,30 @@ load("jstests/concurrency/fsm_workload_helpers/assert_handle_fail_in_transaction var $config = (function() { let data = { checkCommandResult: function checkCommandResult(mayFailWithDatabaseDifferCase, res) { - if (mayFailWithDatabaseDifferCase && !res.ok) + if (mayFailWithDatabaseDifferCase) assertWorkedOrFailedHandleTxnErrors( res, - [ErrorCodes.IndexBuildAlreadyInProgress, ErrorCodes.DatabaseDifferCase], - ErrorCodes.DatabaseDifferCase); + [ + ErrorCodes.StaleDbVersion, + ErrorCodes.IndexBuildAlreadyInProgress, + ErrorCodes.DatabaseDifferCase + ], + [ErrorCodes.StaleDbVersion, ErrorCodes.DatabaseDifferCase]); else assertWorkedHandleTxnErrors(res, ErrorCodes.IndexBuildAlreadyInProgress); return res; }, checkWriteResult: function checkWriteResult(mayFailWithDatabaseDifferCase, res) { - if (mayFailWithDatabaseDifferCase && res.hasWriteError()) - assertAlways.writeErrorWithCode(res, ErrorCodes.DatabaseDifferCase); - else - assertAlways.commandWorked(res); - return res; + let expectedWriteErrors = [ErrorCodes.NoProgressMade]; + if (mayFailWithDatabaseDifferCase) { + expectedWriteErrors.push(ErrorCodes.DatabaseDifferCase); + } + try { + return assert.commandWorked(res); + } catch (e) { + return assert.commandFailedWithCode(res, expectedWriteErrors); + } } }; @@ -93,8 +101,8 @@ var $config = (function() { }, dropDatabase: function dropDatabase(db, collName) { - if (this.created) - assertAlways.commandWorked(this.myDB.dropDatabase()); + assertAlways.commandWorkedOrFailedWithCode(this.myDB.dropDatabase(), + ErrorCodes.StaleDbVersion); }, listDatabases: function listDatabases(db, collName) { @@ -140,7 +148,7 @@ var $config = (function() { // We only run a few iterations to reduce the amount of data cumulatively // written to disk. threadCount: 10, - iterations: 120, + iterations: 50, states, transitions, }; |