summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/repl_set_commands.cpp
diff options
context:
space:
mode:
authorLucas de Castro Borges <lucas@gnuabordo.com.br>2025-02-11 15:07:35 -0300
committerLucas de Castro Borges <lucas@gnuabordo.com.br>2025-02-11 15:07:35 -0300
commit4cb8841196d0625dfa3825aa326f071cd27c7b8b (patch)
tree1682a647d4463397c119183369ae6f750d5fdcff /src/mongo/db/repl/repl_set_commands.cpp
parentaa03c6362cbaa767638e6eed9b031d86dd2643d1 (diff)
parent8f0827553e09872941945a093b647a4211a9db7f (diff)
Update upstream source from tag 'upstream/6.0.0'master
Update to upstream version '6.0.0' with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322
Diffstat (limited to 'src/mongo/db/repl/repl_set_commands.cpp')
-rw-r--r--src/mongo/db/repl/repl_set_commands.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/mongo/db/repl/repl_set_commands.cpp b/src/mongo/db/repl/repl_set_commands.cpp
index a7e27182584..2724219e764 100644
--- a/src/mongo/db/repl/repl_set_commands.cpp
+++ b/src/mongo/db/repl/repl_set_commands.cpp
@@ -47,6 +47,7 @@
#include "mongo/db/auth/authorization_session.h"
#include "mongo/db/commands.h"
#include "mongo/db/commands/server_status_metric.h"
+#include "mongo/db/concurrency/write_conflict_exception.h"
#include "mongo/db/dbhelpers.h"
#include "mongo/db/op_observer.h"
#include "mongo/db/repl/drop_pending_collection_reaper.h"
@@ -153,17 +154,14 @@ public:
result.append("lastStableRecoveryTimestamp", ts.get());
}
} else {
- LOGV2_WARNING(
- 6100700,
- "Failed to get last stable recovery timestamp due to lock acquire timeout. "
- "Note this is expected if shutdown is in progress.");
+ LOGV2_WARNING(6100700,
+ "Failed to get last stable recovery timestamp due to {error}",
+ "error"_attr = "lock acquire timeout"_sd);
}
} catch (const ExceptionForCat<ErrorCategory::Interruption>& ex) {
- LOGV2_WARNING(
- 6100701,
- "Failed to get last stable recovery timestamp due to cancellation error. Note "
- "this is expected if shutdown is in progress.",
- "error"_attr = redact(ex));
+ LOGV2_WARNING(6100701,
+ "Failed to get last stable recovery timestamp due to {error}",
+ "error"_attr = redact(ex));
}
return true;
} else if (cmdObj.hasElement("restartHeartbeats")) {