Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 11 insertions, 19 deletions

diff --git a/jstests/concurrency/fsm_workloads/create_database.js b/jstests/concurrency/fsm_workloads/create_database.js
index 585c945029e..8391a6fb5dc 100644
--- a/jstests/concurrency/fsm_workloads/create_database.js
+++ b/jstests/concurrency/fsm_workloads/create_database.js
@@ -18,30 +18,22 @@ load("jstests/concurrency/fsm_workload_helpers/assert_handle_fail_in_transaction
 var $config = (function() {
     let data = {
         checkCommandResult: function checkCommandResult(mayFailWithDatabaseDifferCase, res) {
-            if (mayFailWithDatabaseDifferCase)
+            if (mayFailWithDatabaseDifferCase && !res.ok)
                 assertWorkedOrFailedHandleTxnErrors(
                     res,
-                    [
-                        ErrorCodes.StaleDbVersion,
-                        ErrorCodes.IndexBuildAlreadyInProgress,
-                        ErrorCodes.DatabaseDifferCase
-                    ],
-                    [ErrorCodes.StaleDbVersion, ErrorCodes.DatabaseDifferCase]);
+                    [ErrorCodes.IndexBuildAlreadyInProgress, ErrorCodes.DatabaseDifferCase],
+                    ErrorCodes.DatabaseDifferCase);
             else
                 assertWorkedHandleTxnErrors(res, ErrorCodes.IndexBuildAlreadyInProgress);
             return res;
         },
 
         checkWriteResult: function checkWriteResult(mayFailWithDatabaseDifferCase, res) {
-            let expectedWriteErrors = [ErrorCodes.NoProgressMade];
-            if (mayFailWithDatabaseDifferCase) {
-                expectedWriteErrors.push(ErrorCodes.DatabaseDifferCase);
-            }
-            try {
-                return assert.commandWorked(res);
-            } catch (e) {
-                return assert.commandFailedWithCode(res, expectedWriteErrors);
-            }
+            if (mayFailWithDatabaseDifferCase && res.hasWriteError())
+                assertAlways.writeErrorWithCode(res, ErrorCodes.DatabaseDifferCase);
+            else
+                assertAlways.commandWorked(res);
+            return res;
         }
     };
 
@@ -101,8 +93,8 @@ var $config = (function() {
         },
 
         dropDatabase: function dropDatabase(db, collName) {
-            assertAlways.commandWorkedOrFailedWithCode(this.myDB.dropDatabase(),
-                                                       ErrorCodes.StaleDbVersion);
+            if (this.created)
+                assertAlways.commandWorked(this.myDB.dropDatabase());
         },
 
         listDatabases: function listDatabases(db, collName) {
@@ -148,7 +140,7 @@ var $config = (function() {
         // We only run a few iterations to reduce the amount of data cumulatively
         // written to disk.
         threadCount: 10,
-        iterations: 50,
+        iterations: 120,
         states,
         transitions,
     };