Revert "SERVER-57217 Don't report remainingOperationTimeEstimatedSecs in currentOp metrics for resharding for donors and coordinators"

This reverts commit e8f96019646425bc352f09b62d8e86b0e41f5d5b.

1 files changed, 10 insertions, 6 deletions

diff --git a/src/mongo/db/s/resharding/resharding_metrics.cpp b/src/mongo/db/s/resharding/resharding_metrics.cpp
index 483f0f2b04d..71c8542268d 100644
--- a/src/mongo/db/s/resharding/resharding_metrics.cpp
+++ b/src/mongo/db/s/resharding/resharding_metrics.cpp
@@ -85,16 +85,19 @@ 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);
+    return RecipientState_serializer(e ? *e : RecipientStateEnum::kUnused);
 }
 
+// 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);
+    return DonorState_serializer(e ? *e : DonorStateEnum::kUnused);
 }
 
+// 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);
+    return CoordinatorState_serializer(e ? *e : CoordinatorStateEnum::kUnused);
 }
 
 // Allows tracking elapsed time for the resharding operation and its sub operations (e.g.,
@@ -189,6 +192,10 @@ 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);
@@ -197,9 +204,6 @@ 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);