Update upstream source from tag 'upstream/6.0.0'master

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

1 files changed, 4 insertions, 5 deletions

diff --git a/src/mongo/dbtests/repltests.cpp b/src/mongo/dbtests/repltests.cpp
index da3611735e8..dde6c946431 100644
--- a/src/mongo/dbtests/repltests.cpp
+++ b/src/mongo/dbtests/repltests.cpp
@@ -36,7 +36,7 @@
 #include "mongo/db/catalog/collection.h"
 #include "mongo/db/catalog/index_catalog.h"
 #include "mongo/db/client.h"
-#include "mongo/db/concurrency/exception_util.h"
+#include "mongo/db/concurrency/write_conflict_exception.h"
 #include "mongo/db/db_raii.h"
 #include "mongo/db/dbdirectclient.h"
 #include "mongo/db/json.h"
@@ -73,7 +73,6 @@ repl::OplogEntry makeOplogEntry(repl::OpTime opTime,
                                 nss,                        // namespace
                                 boost::none,                // uuid
                                 boost::none,                // fromMigrate
-                                boost::none,                // checkExistenceForDiffInsert
                                 OplogEntry::kOplogVersion,  // version
                                 object,                     // o
                                 object2,                    // o2
@@ -375,12 +374,12 @@ protected:
     virtual void reset() const = 0;
 };
 
-// Some operations are only idempotent when in RECOVERING from unstable checkpoint, not in
-// SECONDARY.  This includes duplicate inserts and deletes.
+// Some operations are only idempotent when in RECOVERING, not in SECONDARY.  This includes
+// duplicate inserts and deletes.
 class Recovering : public Base {
 protected:
     virtual OplogApplication::Mode getOplogApplicationMode() {
-        return OplogApplication::Mode::kUnstableRecovering;
+        return OplogApplication::Mode::kRecovering;
     }
 };