SERVER-47040 LOGV2_FATAL also fasserts

Added LOGV2_FATAL_NOTRACE and LOGV2_CONTINUE to have different behavior.

3 files changed, 24 insertions, 24 deletions

diff --git a/src/mongo/s/client/shard_registry.cpp b/src/mongo/s/client/shard_registry.cpp
index 9bfa02546e9..532f926c734 100644
--- a/src/mongo/s/client/shard_registry.cpp
+++ b/src/mongo/s/client/shard_registry.cpp
@@ -240,11 +240,10 @@ void ShardRegistry::startup(OperationContext* opCtx) {
     }
 
     if (!status.isOK()) {
-        LOGV2_FATAL(22737,
+        LOGV2_FATAL(40252,
                     "Error scheduling shard registry reload caused by {error}",
                     "Error scheduling shard registry reload",
                     "error"_attr = redact(status.getStatus()));
-        fassertFailed(40252);
     }
 }
 
@@ -285,11 +284,10 @@ void ShardRegistry::_internalReload(const CallbackArgs& cbArgs) {
     }
 
     if (!status.isOK()) {
-        LOGV2_FATAL(22738,
+        LOGV2_FATAL(40253,
                     "Error scheduling shard registry reload caused by {error}",
                     "Error scheduling shard registry reload",
                     "error"_attr = redact(status.getStatus()));
-        fassertFailed(40253);
     }
 }
 
diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp
index 04600263475..281d7eecccf 100644
--- a/src/mongo/s/server.cpp
+++ b/src/mongo/s/server.cpp
@@ -818,11 +818,12 @@ ExitCode mongoSMain(int argc, char* argv[], char** envp) {
 
     Status status = runGlobalInitializers(argc, argv, envp);
     if (!status.isOK()) {
-        LOGV2_FATAL_OPTIONS(22865,
-                            {logComponentV1toV2(LogComponent::kDefault)},
-                            "Error during global initialization: {error}",
-                            "Error during global initialization",
-                            "error"_attr = status);
+        LOGV2_FATAL_OPTIONS(
+            22865,
+            logv2::LogOptions(logv2::LogComponent::kDefault, logv2::FatalMode::kContinue),
+            "Error during global initialization: {error}",
+            "Error during global initialization",
+            "error"_attr = status);
         return EXIT_ABRUPT;
     }
 
@@ -830,11 +831,12 @@ ExitCode mongoSMain(int argc, char* argv[], char** envp) {
         setGlobalServiceContext(ServiceContext::make());
     } catch (...) {
         auto cause = exceptionToStatus();
-        LOGV2_FATAL_OPTIONS(22866,
-                            {logComponentV1toV2(LogComponent::kDefault)},
-                            "Error creating service context: {error}",
-                            "Error creating service context",
-                            "error"_attr = redact(cause));
+        LOGV2_FATAL_OPTIONS(
+            22866,
+            logv2::LogOptions(logv2::LogComponent::kDefault, logv2::FatalMode::kContinue),
+            "Error creating service context: {error}",
+            "Error creating service context",
+            "error"_attr = redact(cause));
         return EXIT_ABRUPT;
     }
 
diff --git a/src/mongo/s/sharding_task_executor.cpp b/src/mongo/s/sharding_task_executor.cpp
index aeb21e740db..704c4b45166 100644
--- a/src/mongo/s/sharding_task_executor.cpp
+++ b/src/mongo/s/sharding_task_executor.cpp
@@ -191,15 +191,15 @@ StatusWith<TaskExecutor::CallbackHandle> ShardingTaskExecutor::scheduleRemoteCom
             }
 
             if (isMongos() && args.response.status == ErrorCodes::IncompatibleWithUpgradedServer) {
-                LOGV2_FATAL(22873,
-                            "This mongos server must be upgraded. It is attempting to communicate "
-                            "with "
-                            "an upgraded cluster with which it is incompatible. Error: "
-                            "'{args_response_status}' Crashing in order to bring attention to the "
-                            "incompatibility, rather "
-                            "than erroring endlessly.",
-                            "args_response_status"_attr = args.response.status.toString());
-                fassertNoTrace(50710, false);
+                LOGV2_FATAL_NOTRACE(
+                    50710,
+                    "This mongos server must be upgraded. It is attempting to communicate "
+                    "with "
+                    "an upgraded cluster with which it is incompatible. Error: "
+                    "'{args_response_status}' Crashing in order to bring attention to the "
+                    "incompatibility, rather "
+                    "than erroring endlessly.",
+                    "args_response_status"_attr = args.response.status.toString());
             }
 
             if (shard) {
@@ -238,7 +238,7 @@ StatusWith<TaskExecutor::CallbackHandle> ShardingTaskExecutor::scheduleRemoteCom
 
                 auto shardConn = ConnectionString::parse(target.toString());
                 if (!shardConn.isOK()) {
-                    LOGV2_FATAL(22874,
+                    LOGV2_ERROR(22874,
                                 "got bad host string in saveGLEStats: {target}",
                                 "target"_attr = target);
                 }