Update upstream source from tag 'upstream/6.0.0'master

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

1 files changed, 49 insertions, 21 deletions

diff --git a/src/mongo/db/read_write_concern_defaults_test.cpp b/src/mongo/db/read_write_concern_defaults_test.cpp
index 1aecbc2c413..9ff5cb9b9cb 100644
--- a/src/mongo/db/read_write_concern_defaults_test.cpp
+++ b/src/mongo/db/read_write_concern_defaults_test.cpp
@@ -1033,29 +1033,57 @@ TEST_F(ReadWriteConcernDefaultsTestWithClusterTime,
 }
 
 TEST_F(ReadWriteConcernDefaultsTestWithClusterTime,
-       TestGenerateNewCWRWCToBeSavedOnDiskInvalidSetWriteConcernWithoutWField) {
-    setupOldDefaults();
-    ASSERT_THROWS_CODE(_rwcd.generateNewCWRWCToBeSavedOnDisk(
-                           operationContext(),
-                           boost::none,
-                           uassertStatusOK(WriteConcernOptions::parse(BSON("j" << true)))),
-                       AssertionException,
-                       ErrorCodes::BadValue);
+       TestGenerateNewCWRWCToBeSavedOnDiskValidSetWriteConcernWithOnlyJ) {
+    auto oldDefaults = setupOldDefaults();
+    auto defaults = _rwcd.generateNewCWRWCToBeSavedOnDisk(
+        operationContext(),
+        boost::none,
+        uassertStatusOK(WriteConcernOptions::parse(BSON("j" << true))));
+    ASSERT(oldDefaults.getDefaultReadConcern()->getLevel() ==
+           defaults.getDefaultReadConcern()->getLevel());
+    ASSERT(!defaults.getDefaultReadConcernSource());
+    ASSERT(stdx::holds_alternative<int64_t>(defaults.getDefaultWriteConcern()->w));
+    ASSERT_EQ(1, stdx::get<int64_t>(defaults.getDefaultWriteConcern()->w));
+    ASSERT_EQ(WriteConcernOptions::kNoTimeout, defaults.getDefaultWriteConcern()->wTimeout);
+    ASSERT(WriteConcernOptions::SyncMode::JOURNAL == defaults.getDefaultWriteConcern()->syncMode);
+    ASSERT_LT(*oldDefaults.getUpdateOpTime(), *defaults.getUpdateOpTime());
+    ASSERT_LT(*oldDefaults.getUpdateWallClockTime(), *defaults.getUpdateWallClockTime());
+    // Default write concern source is not saved on disk.
+    ASSERT(!defaults.getDefaultWriteConcernSource());
 
-    ASSERT_THROWS_CODE(_rwcd.generateNewCWRWCToBeSavedOnDisk(
-                           operationContext(),
-                           boost::none,
-                           uassertStatusOK(WriteConcernOptions::parse(BSON("wtimeout" << 12345)))),
-                       AssertionException,
-                       ErrorCodes::BadValue);
+    _lookupMock.setLookupCallReturnValue(std::move(defaults));
+    _rwcd.refreshIfNecessary(operationContext());
+    auto newDefaults = _rwcd.getDefault(operationContext());
+    ASSERT_LT(oldDefaults.localUpdateWallClockTime(), newDefaults.localUpdateWallClockTime());
+    // Default write concern source is calculated through 'getDefault'.
+    ASSERT(newDefaults.getDefaultWriteConcernSource() == DefaultWriteConcernSourceEnum::kGlobal);
+}
 
-    ASSERT_THROWS_CODE(
-        _rwcd.generateNewCWRWCToBeSavedOnDisk(
-            operationContext(),
-            boost::none,
-            uassertStatusOK(WriteConcernOptions::parse(BSON("j" << true << "wtimeout" << 12345)))),
-        AssertionException,
-        ErrorCodes::BadValue);
+TEST_F(ReadWriteConcernDefaultsTestWithClusterTime,
+       TestGenerateNewCWRWCToBeSavedOnDiskValidSetWriteConcernWithOnlyWtimeout) {
+    auto oldDefaults = setupOldDefaults();
+    auto defaults = _rwcd.generateNewCWRWCToBeSavedOnDisk(
+        operationContext(),
+        boost::none,
+        uassertStatusOK(WriteConcernOptions::parse(BSON("wtimeout" << 12345))));
+    ASSERT(oldDefaults.getDefaultReadConcern()->getLevel() ==
+           defaults.getDefaultReadConcern()->getLevel());
+    ASSERT(!defaults.getDefaultReadConcernSource());
+    ASSERT(stdx::holds_alternative<int64_t>(defaults.getDefaultWriteConcern()->w));
+    ASSERT_EQ(1, stdx::get<int64_t>(defaults.getDefaultWriteConcern()->w));
+    ASSERT_EQ(Milliseconds(12345), defaults.getDefaultWriteConcern()->wTimeout);
+    ASSERT(WriteConcernOptions::SyncMode::UNSET == defaults.getDefaultWriteConcern()->syncMode);
+    ASSERT_LT(*oldDefaults.getUpdateOpTime(), *defaults.getUpdateOpTime());
+    ASSERT_LT(*oldDefaults.getUpdateWallClockTime(), *defaults.getUpdateWallClockTime());
+    // Default write concern source is not saved on disk.
+    ASSERT(!defaults.getDefaultWriteConcernSource());
+
+    _lookupMock.setLookupCallReturnValue(std::move(defaults));
+    _rwcd.refreshIfNecessary(operationContext());
+    auto newDefaults = _rwcd.getDefault(operationContext());
+    ASSERT_LT(oldDefaults.localUpdateWallClockTime(), newDefaults.localUpdateWallClockTime());
+    // Default write concern source is calculated through 'getDefault'.
+    ASSERT(newDefaults.getDefaultWriteConcernSource() == DefaultWriteConcernSourceEnum::kGlobal);
 }
 
 TEST_F(ReadWriteConcernDefaultsTestWithClusterTime, TestRefreshDefaultsWithDeletedDefaults) {