Update upstream source from tag 'upstream/6.0.0'master

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

1 files changed, 1 insertions, 24 deletions

diff --git a/src/mongo/db/read_write_concern_defaults_cache_lookup_mongod.cpp b/src/mongo/db/read_write_concern_defaults_cache_lookup_mongod.cpp
index 39a20115f7b..08f95264959 100644
--- a/src/mongo/db/read_write_concern_defaults_cache_lookup_mongod.cpp
+++ b/src/mongo/db/read_write_concern_defaults_cache_lookup_mongod.cpp
@@ -65,7 +65,7 @@ boost::optional<RWConcernDefault> readWriteConcernDefaultsCacheLookupMongoD(
         getPersistedDefaultRWConcernDocument(opCtx));
 }
 
-void readWriteConcernDefaultsMongodStartupChecks(OperationContext* opCtx, bool isReplicaSet) {
+void readWriteConcernDefaultsMongodStartupChecks(OperationContext* opCtx) {
     if (serverGlobalParams.clusterRole == ClusterRole::ShardServer) {
         DBDirectClient client(opCtx);
         const auto numPersistedDocuments =
@@ -85,29 +85,6 @@ void readWriteConcernDefaultsMongodStartupChecks(OperationContext* opCtx, bool i
                 "configSettingsNamespace"_attr = NamespaceString::kConfigSettingsNamespace);
         }
     }
-
-    // We used to allow setting CWWC with only 'wtimeout,' and it defaulted the 'w' field to 1.
-    // Therefore, we issue a warning on startup if a node has CWWC with 'w' field set to 1 and
-    // 'wtimeout' is greater than 0.
-    // Can't retrieve CWWC if 'failRWCDefaultsLookup' is enabled.
-    if (!MONGO_unlikely(failRWCDefaultsLookup.shouldFail()) &&
-        (serverGlobalParams.clusterRole == ClusterRole::ConfigServer ||
-         serverGlobalParams.clusterRole == ClusterRole::None) &&
-        isReplicaSet && ReadWriteConcernDefaults::get(opCtx).isCWWCSet(opCtx)) {
-        auto wcDefault = ReadWriteConcernDefaults::get(opCtx).getDefaultWriteConcern(opCtx);
-        if (wcDefault && stdx::holds_alternative<int64_t>(wcDefault->w) &&
-            stdx::get<int64_t>(wcDefault->w) == 1 &&
-            wcDefault->wTimeout != WriteConcernOptions::kNoTimeout) {
-            LOGV2_WARNING_OPTIONS(
-                8036300,
-                {logv2::LogTag::kStartupWarnings},
-                "The default cluster-wide write concern is configured with the 'w' field set to 1 "
-                "and 'wtimeout' set to a value greater than 0, although it's important to note "
-                "that 'wtimeout' is only applicable for 'w' values greater than 1."
-                "Please verify if this is intentional; if not, consider making the appropriate "
-                "adjustments.");
-        }
-    }
 }
 
 }  // namespace mongo