summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Nawrocki <brett.nawrocki@mongodb.com>2022-04-14 22:17:07 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-04-14 23:40:42 +0000
commit54dbf25fc257904e66e767fdf46e69759448a36e (patch)
tree8f5256e693a9afa13c36d38245270f6c23849d5b
parentdd0fe8486e5e8a182c53e33aba38bbbad270dea2 (diff)
downloadmongo-54dbf25fc257904e66e767fdf46e69759448a36e.tar.gz
SERVER-64372 Clean up some wording in comments and logs
-rw-r--r--src/mongo/db/s/resharding/resharding_metrics_helpers.cpp5
-rw-r--r--src/mongo/db/s/sharding_data_transform_instance_metrics_test.cpp2
-rw-r--r--src/mongo/s/stale_exception.h2
3 files changed, 4 insertions, 5 deletions
diff --git a/src/mongo/db/s/resharding/resharding_metrics_helpers.cpp b/src/mongo/db/s/resharding/resharding_metrics_helpers.cpp
index a056596d2e7..cd6ca6d32c2 100644
--- a/src/mongo/db/s/resharding/resharding_metrics_helpers.cpp
+++ b/src/mongo/db/s/resharding/resharding_metrics_helpers.cpp
@@ -81,9 +81,8 @@ void onCriticalSectionError(OperationContext* opCtx, const StaleConfigInfo& info
onCriticalSectionErrorThrows(opCtx, info);
} catch (const DBException& e) {
LOGV2(6437201,
- "Exception while recording resharding metrics after an operation failure due to the "
- "critical section being held",
- "Status"_attr = redact(e.toStatus()));
+ "Unable to record resharding critical section metrics for the current operation",
+ "reason"_attr = redact(e.toStatus()));
}
}
diff --git a/src/mongo/db/s/sharding_data_transform_instance_metrics_test.cpp b/src/mongo/db/s/sharding_data_transform_instance_metrics_test.cpp
index 0ffa17ea88e..68b3379a3be 100644
--- a/src/mongo/db/s/sharding_data_transform_instance_metrics_test.cpp
+++ b/src/mongo/db/s/sharding_data_transform_instance_metrics_test.cpp
@@ -204,7 +204,7 @@ TEST_F(ShardingDataTransformInstanceMetricsTest, DonorIncrementWritesDuringCriti
TEST_F(ShardingDataTransformInstanceMetricsTest, CurrentOpReportsCriticalSectionTime) {
const auto roles = {Role::kDonor, Role::kCoordinator};
for (const auto& role : roles) {
- LOGV2(6437200, "CurrentOpReportsCriticalSectionTime", "Role"_attr = role);
+ LOGV2(6437200, "CurrentOpReportsCriticalSectionTime", "role"_attr = role);
constexpr auto kFiveSeconds = Milliseconds(5000);
auto uuid = UUID::gen();
const auto& clock = getClockSource();
diff --git a/src/mongo/s/stale_exception.h b/src/mongo/s/stale_exception.h
index 52b440760e5..3372efd20b2 100644
--- a/src/mongo/s/stale_exception.h
+++ b/src/mongo/s/stale_exception.h
@@ -88,7 +88,7 @@ protected:
boost::optional<ChunkVersion> _wanted;
ShardId _shardId;
- // This fields below are not serialized and therefore do not get propagated to the router
+ // The following fields are not serialized and therefore do not get propagated to the router.
boost::optional<SharedSemiFuture<void>> _criticalSectionSignal;
boost::optional<OperationType> _duringOperationType;
};