diff options
author | Junhson Jean-Baptiste <junhson.jean-baptiste@mongodb.com> | 2021-06-10 18:12:04 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-06-22 22:09:04 +0000 |
commit | f2f5aa45d289349eaae9fdbf1f7bb54ea25819bf (patch) | |
tree | 783f6b4fe01399da2c4cc0c7c3cfa725bbdd0c6a /src/mongo/db/s/resharding/resharding_metrics.cpp | |
parent | e3ba5a35ed20eebe21dedcad2ceb021b467bf2cc (diff) | |
download | mongo-f2f5aa45d289349eaae9fdbf1f7bb54ea25819bf.tar.gz |
SERVER-57217 Don't report remainingOperationTimeEstimatedSecs in currentOp metrics for resharding for donors and coordinators
Diffstat (limited to 'src/mongo/db/s/resharding/resharding_metrics.cpp')
-rw-r--r-- | src/mongo/db/s/resharding/resharding_metrics.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/mongo/db/s/resharding/resharding_metrics.cpp b/src/mongo/db/s/resharding/resharding_metrics.cpp index 71c8542268d..483f0f2b04d 100644 --- a/src/mongo/db/s/resharding/resharding_metrics.cpp +++ b/src/mongo/db/s/resharding/resharding_metrics.cpp @@ -85,19 +85,16 @@ Milliseconds remainingTime(Milliseconds elapsedTime, double elapsedWork, double return Milliseconds(Milliseconds::rep(remainingMsec)); } -// TODO SERVER-57217 Remove special-casing for the non-existence of the boost::optional. static StringData serializeState(boost::optional<RecipientStateEnum> e) { - return RecipientState_serializer(e ? *e : RecipientStateEnum::kUnused); + return RecipientState_serializer(*e); } -// TODO SERVER-57217 Remove special-casing for the non-existence of the boost::optional. static StringData serializeState(boost::optional<DonorStateEnum> e) { - return DonorState_serializer(e ? *e : DonorStateEnum::kUnused); + return DonorState_serializer(*e); } -// TODO SERVER-57217 Remove special-casing for the non-existence of the boost::optional. static StringData serializeState(boost::optional<CoordinatorStateEnum> e) { - return CoordinatorState_serializer(e ? *e : CoordinatorStateEnum::kUnused); + return CoordinatorState_serializer(*e); } // Allows tracking elapsed time for the resharding operation and its sub operations (e.g., @@ -192,10 +189,6 @@ void ReshardingMetrics::OperationMetrics::appendCurrentOpMetrics(BSONObjBuilder* bob->append(kOpTimeElapsed, getElapsedTime(runningOperation)); - bob->append(kOpTimeRemaining, - !remainingMsec ? int64_t{-1} /** -1 is a specified integer null value */ - : durationCount<Seconds>(*remainingMsec)); - switch (role) { case Role::kDonor: bob->append(kWritesDuringCritialSection, writesDuringCriticalSection); @@ -204,6 +197,9 @@ void ReshardingMetrics::OperationMetrics::appendCurrentOpMetrics(BSONObjBuilder* bob->append(kOpStatus, ReshardingOperationStatus_serializer(opStatus)); break; case Role::kRecipient: + bob->append(kOpTimeRemaining, + !remainingMsec ? int64_t{-1} /** -1 is a specified integer null value */ + : durationCount<Seconds>(*remainingMsec)); bob->append(kDocumentsToCopy, documentsToCopy); bob->append(kDocumentsCopied, documentsCopied); bob->append(kBytesToCopy, bytesToCopy); |