SERVER-49151 Fix malformed LOGV2 and assertion IDs

(cherry picked from commit d4e7ea57599b44353b5393afedee8ae5670837b3)

11 files changed, 25 insertions, 25 deletions

diff --git a/src/mongo/client/sdam/server_selector.cpp b/src/mongo/client/sdam/server_selector.cpp
index d21cab07545..d25cc535684 100644
--- a/src/mongo/client/sdam/server_selector.cpp
+++ b/src/mongo/client/sdam/server_selector.cpp
@@ -218,7 +218,7 @@ void SdamServerSelector::filterTags(std::vector<ServerDescriptionPtr>* servers,
                 }
             } else {
                 LOGV2_WARNING(
-                    46712002,
+                    4671202,
                     "Invalid tags specified for server selection; tags should be specified as "
                     "bson Objects",
                     "tag"_attr = *it);
diff --git a/src/mongo/client/server_is_master_monitor.cpp b/src/mongo/client/server_is_master_monitor.cpp
index 5e4ab62207c..08fff6468e7 100644
--- a/src/mongo/client/server_is_master_monitor.cpp
+++ b/src/mongo/client/server_is_master_monitor.cpp
@@ -226,7 +226,7 @@ void SingleServerIsMasterMonitor::_doRemoteCommand() {
 
     if (!swCbHandle.isOK()) {
         _onIsMasterFailure(swCbHandle.getStatus(), BSONObj());
-        uasserted(46156012, swCbHandle.getStatus().toString());
+        uasserted(4615612, swCbHandle.getStatus().toString());
     }
 
     _isMasterOutstanding = true;
diff --git a/src/mongo/db/auth/sasl_mechanism_registry.cpp b/src/mongo/db/auth/sasl_mechanism_registry.cpp
index b2c47eed923..667fa7a811e 100644
--- a/src/mongo/db/auth/sasl_mechanism_registry.cpp
+++ b/src/mongo/db/auth/sasl_mechanism_registry.cpp
@@ -189,7 +189,7 @@ ServiceContext::ConstructorActionRegisterer SASLServerMechanismRegistryValidatio
         for (const auto& mech : saslGlobalParams.authenticationMechanisms) {
             auto it = std::find(supportedMechanisms.cbegin(), supportedMechanisms.cend(), mech);
             if (it == supportedMechanisms.end()) {
-                LOGV2_ERROR(47429001,
+                LOGV2_ERROR(4742901,
                             "SASL Mechanism '{mechanism}' is not supported",
                             "Unsupported SASL mechanism",
                             "mechanism"_attr = mech);
diff --git a/src/mongo/db/catalog/index_catalog_entry_impl.cpp b/src/mongo/db/catalog/index_catalog_entry_impl.cpp
index dca74a0730e..d684dc4798e 100644
--- a/src/mongo/db/catalog/index_catalog_entry_impl.cpp
+++ b/src/mongo/db/catalog/index_catalog_entry_impl.cpp
@@ -362,7 +362,7 @@ void IndexCatalogEntryImpl::_catalogSetMultikey(OperationContext* opCtx,
         }
     }
     if (indexMetadataHasChanged && _queryInfo) {
-        LOGV2_DEBUG(47187005,
+        LOGV2_DEBUG(4718705,
                     1,
                     "Index set to multi key, clearing query plan cache",
                     "namespace"_attr = ns(),
diff --git a/src/mongo/db/catalog/index_consistency.cpp b/src/mongo/db/catalog/index_consistency.cpp
index c01b9a54f63..e016a27ebea 100644
--- a/src/mongo/db/catalog/index_consistency.cpp
+++ b/src/mongo/db/catalog/index_consistency.cpp
@@ -210,7 +210,7 @@ void IndexConsistency::addDocKey(OperationContext* opCtx,
         indexInfo->numRecords++;
 
         if (MONGO_unlikely(_validateState->extraLoggingForTest())) {
-            LOGV2(46666002, "[validate](record) {hash_num}", "hash_num"_attr = hash);
+            LOGV2(4666602, "[validate](record) {hash_num}", "hash_num"_attr = hash);
             const BSONObj& keyPatternBson = indexInfo->keyPattern;
             auto keyStringBson = KeyString::toBsonSafe(
                 ks.getBuffer(), ks.getSize(), indexInfo->ord, ks.getTypeBits());
@@ -253,7 +253,7 @@ void IndexConsistency::addIndexKey(const KeyString::Value& ks,
         indexInfo->numKeys++;
 
         if (MONGO_unlikely(_validateState->extraLoggingForTest())) {
-            LOGV2(46666003, "[validate](index) {hash_num}", "hash_num"_attr = hash);
+            LOGV2(4666603, "[validate](index) {hash_num}", "hash_num"_attr = hash);
             const BSONObj& keyPatternBson = indexInfo->keyPattern;
             auto keyStringBson = KeyString::toBsonSafe(
                 ks.getBuffer(), ks.getSize(), indexInfo->ord, ks.getTypeBits());
diff --git a/src/mongo/db/catalog/validate_adaptor.cpp b/src/mongo/db/catalog/validate_adaptor.cpp
index b8f502325a3..2a47dd62f82 100644
--- a/src/mongo/db/catalog/validate_adaptor.cpp
+++ b/src/mongo/db/catalog/validate_adaptor.cpp
@@ -74,7 +74,7 @@ Status ValidateAdaptor::validateRecord(OperationContext* opCtx,
     }
 
     if (MONGO_unlikely(_validateState->extraLoggingForTest())) {
-        LOGV2(46666001, "[validate]", "recordId"_attr = recordId, "recordData"_attr = recordBson);
+        LOGV2(4666601, "[validate]", "recordId"_attr = recordId, "recordData"_attr = recordBson);
     }
 
     const Status status = validateBSON(
diff --git a/src/mongo/db/commands/killoperations_common.h b/src/mongo/db/commands/killoperations_common.h
index faf0f7bea5c..6d18fe8e5a7 100644
--- a/src/mongo/db/commands/killoperations_common.h
+++ b/src/mongo/db/commands/killoperations_common.h
@@ -64,7 +64,7 @@ public:
             auto opKeys = Base::request().getOperationKeys();
 
             for (auto& opKey : opKeys) {
-                LOGV2(46156011, "Attempting to kill operation", "operationKey"_attr = opKey);
+                LOGV2(4615602, "Attempting to kill operation", "operationKey"_attr = opKey);
                 opKiller.killOperation(OperationKey(opKey));
             }
             Derived::killCursors(opCtx, opKeys);
diff --git a/src/mongo/db/repl/repl_set_config.cpp b/src/mongo/db/repl/repl_set_config.cpp
index 90b52b7818d..fc65ba021fa 100644
--- a/src/mongo/db/repl/repl_set_config.cpp
+++ b/src/mongo/db/repl/repl_set_config.cpp
@@ -838,7 +838,7 @@ void ReplSetConfig::_addInternalWriteConcernModes() {
     } else if (status != ErrorCodes::NoSuchKey) {
         // NoSuchKey means we have no $voter-tagged nodes in this config;
         // other errors are unexpected.
-        fassert(46712003, status);
+        fassert(4671203, status);
     }
 
     // $stepDownCheck: one electable node plus ourselves
diff --git a/src/mongo/db/repl/replication_consistency_markers_impl.cpp b/src/mongo/db/repl/replication_consistency_markers_impl.cpp
index 4c7fc04517b..9c1047c5513 100644
--- a/src/mongo/db/repl/replication_consistency_markers_impl.cpp
+++ b/src/mongo/db/repl/replication_consistency_markers_impl.cpp
@@ -514,7 +514,7 @@ ReplicationConsistencyMarkersImpl::refreshOplogTruncateAfterPointIfPrimary(
     invariant(truncateOplogEntryBSON, "Found no oplog entry lte " + truncateTimestamp.toString());
 
     return fassert(
-        44555001,
+        4455501,
         OpTimeAndWallTime::parseOpTimeAndWallTimeFromOplogEntry(truncateOplogEntryBSON.get()));
 }
 
diff --git a/src/mongo/db/startup_warnings_common.cpp b/src/mongo/db/startup_warnings_common.cpp
index 3951a9e17d6..aa7dafc5cf8 100644
--- a/src/mongo/db/startup_warnings_common.cpp
+++ b/src/mongo/db/startup_warnings_common.cpp
@@ -51,7 +51,7 @@ bool CheckPrivilegeEnabled(const wchar_t* name) {
     LUID luid;
     if (!LookupPrivilegeValueW(nullptr, name, &luid)) {
         auto str = errnoWithPrefix("Failed to LookupPrivilegeValue");
-        LOGV2_WARNING(47187001, "{str}", "str"_attr = str);
+        LOGV2_WARNING(4718701, "{str}", "str"_attr = str);
         return false;
     }
 
@@ -59,7 +59,7 @@ bool CheckPrivilegeEnabled(const wchar_t* name) {
     HANDLE accessToken;
     if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &accessToken)) {
         auto str = errnoWithPrefix("Failed to OpenProcessToken");
-        LOGV2_WARNING(47187002, "{str}", "str"_attr = str);
+        LOGV2_WARNING(4718702, "{str}", "str"_attr = str);
         return false;
     }
 
@@ -75,7 +75,7 @@ bool CheckPrivilegeEnabled(const wchar_t* name) {
 
     if (!PrivilegeCheck(accessToken, &privileges, &ret)) {
         auto str = errnoWithPrefix("Failed to PrivilegeCheck");
-        LOGV2_WARNING(47187003, "{str}", "str"_attr = str);
+        LOGV2_WARNING(4718703, "{str}", "str"_attr = str);
         return false;
     }
 
@@ -168,7 +168,7 @@ void logCommonStartupWarnings(const ServerGlobalParams& serverParams) {
 #ifdef _WIN32
     if (!CheckPrivilegeEnabled(SE_INC_WORKING_SET_NAME)) {
         LOGV2_OPTIONS(
-            47187004,
+            4718704,
             {logv2::LogTag::kStartupWarnings},
             "SeIncreaseWorkingSetPrivilege privilege is not granted to the process. Secure memory "
             "allocation for SCRAM and/or Encrypted Storage Engine may fail.");
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
index bcc002700d1..05892938383 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
@@ -896,7 +896,7 @@ WiredTigerKVEngine::WiredTigerKVEngine(const std::string& canonicalName,
                   "config"_attr = config);
             int ret = wiredtiger_open(
                 path.c_str(), _eventHandler.getWtEventHandler(), config.c_str(), &_conn);
-            LOGV2(47959011, "Recovery complete", "duration"_attr = Date_t::now() - start);
+            LOGV2(4795911, "Recovery complete", "duration"_attr = Date_t::now() - start);
             if (ret == EINVAL) {
                 fassertFailedNoTrace(28717);
             } else if (ret != 0) {
@@ -905,7 +905,7 @@ WiredTigerKVEngine::WiredTigerKVEngine(const std::string& canonicalName,
             }
             start = Date_t::now();
             invariantWTOK(_conn->close(_conn, nullptr));
-            LOGV2(47959010,
+            LOGV2(4795910,
                   "WiredTiger closed. Removing journal files",
                   "duration"_attr = Date_t::now() - start);
             // After successful recovery, remove the journal directory.
@@ -921,7 +921,7 @@ WiredTigerKVEngine::WiredTigerKVEngine(const std::string& canonicalName,
                             "duration"_attr = Date_t::now() - start);
                 throw;
             }
-            LOGV2(47959008, "Journal files removed", "duration"_attr = Date_t::now() - start);
+            LOGV2(4795908, "Journal files removed", "duration"_attr = Date_t::now() - start);
         }
         // This setting overrides the earlier setting because it is later in the config string.
         ss << ",log=(enabled=false),";
@@ -931,7 +931,7 @@ WiredTigerKVEngine::WiredTigerKVEngine(const std::string& canonicalName,
     LOGV2(22315, "Opening WiredTiger", "config"_attr = config);
     auto startTime = Date_t::now();
     _openWiredTiger(path, config);
-    LOGV2(47959006, "WiredTiger opened", "duration"_attr = Date_t::now() - startTime);
+    LOGV2(4795906, "WiredTiger opened", "duration"_attr = Date_t::now() - startTime);
     _eventHandler.setStartupSuccessful();
     _wtOpenConfig = config;
 
@@ -1060,7 +1060,7 @@ void WiredTigerKVEngine::_openWiredTiger(const std::string& path, const std::str
             // file.
             StorageRepairObserver::get(getGlobalServiceContext())->onRepairDone(nullptr);
         }
-        LOGV2_FATAL(46712005,
+        LOGV2_FATAL(4671205,
                     "This version of MongoDB is too recent to start up on the existing data files. "
                     "Try MongoDB 4.2 or earlier.");
         fassertFailedNoTrace(46712006);
@@ -1187,23 +1187,23 @@ void WiredTigerKVEngine::cleanShutdown() {
               "Closing WiredTiger in preparation for reconfiguring",
               "closeConfig"_attr = closeConfig);
         invariantWTOK(_conn->close(_conn, closeConfig.c_str()));
-        LOGV2(47959005, "WiredTiger closed", "duration"_attr = Date_t::now() - startTime);
+        LOGV2(4795905, "WiredTiger closed", "duration"_attr = Date_t::now() - startTime);
 
         startTime = Date_t::now();
         invariantWTOK(wiredtiger_open(
             _path.c_str(), _eventHandler.getWtEventHandler(), _wtOpenConfig.c_str(), &_conn));
-        LOGV2(47959004, "WiredTiger re-opened", "duration"_attr = Date_t::now() - startTime);
+        LOGV2(4795904, "WiredTiger re-opened", "duration"_attr = Date_t::now() - startTime);
 
         startTime = Date_t::now();
         LOGV2(22325, "Reconfiguring", "newConfig"_attr = _fileVersion.getDowngradeString());
         invariantWTOK(_conn->reconfigure(_conn, _fileVersion.getDowngradeString().c_str()));
-        LOGV2(47959003, "Reconfigure complete", "duration"_attr = Date_t::now() - startTime);
+        LOGV2(4795903, "Reconfigure complete", "duration"_attr = Date_t::now() - startTime);
     }
 
     auto startTime = Date_t::now();
-    LOGV2(47959002, "Closing WiredTiger", "closeConfig"_attr = closeConfig);
+    LOGV2(4795902, "Closing WiredTiger", "closeConfig"_attr = closeConfig);
     invariantWTOK(_conn->close(_conn, closeConfig.c_str()));
-    LOGV2(47959001, "WiredTiger closed", "duration"_attr = Date_t::now() - startTime);
+    LOGV2(4795901, "WiredTiger closed", "duration"_attr = Date_t::now() - startTime);
     _conn = nullptr;
 }
 
@@ -1653,7 +1653,7 @@ Status WiredTigerKVEngine::recoverOrphanedIdent(OperationContext* opCtx,
     WT_SESSION* session = sessionWrapper.getSession();
     status =
         wtRCToStatus(session->salvage(session, _uri(ident).c_str(), nullptr), "Salvage failed: ");
-    LOGV2(47959007, "Salvage complete", "duration"_attr = Date_t::now() - start);
+    LOGV2(4795907, "Salvage complete", "duration"_attr = Date_t::now() - start);
     if (status.isOK()) {
         return {ErrorCodes::DataModifiedByRepair,
                 str::stream() << "Salvaged data for ident " << ident};