From 14a9bda8a4c2a2cdd85c01a30534980d4e79a989 Mon Sep 17 00:00:00 2001
From: Spencer T Brody <spencer@mongodb.com>
Date: Wed, 22 Apr 2020 23:17:55 +0000
Subject: SERVER-46187 Remove RemoteCommandRequest::expirationDate in favor of
 dateScheduled and timeout

---
 src/mongo/executor/remote_command_request.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/mongo/executor/remote_command_request.cpp')

diff --git a/src/mongo/executor/remote_command_request.cpp b/src/mongo/executor/remote_command_request.cpp
index e27a07968dc..8aaf27b961f 100644
--- a/src/mongo/executor/remote_command_request.cpp
+++ b/src/mongo/executor/remote_command_request.cpp
@@ -51,8 +51,6 @@ AtomicWord<unsigned long long> requestIdCounter(0);
 
 constexpr Milliseconds RemoteCommandRequestBase::kNoTimeout;
 
-constexpr Date_t RemoteCommandRequestBase::kNoExpirationDate;
-
 RemoteCommandRequestBase::RemoteCommandRequestBase(RequestId requestId,
                                                    const std::string& theDbName,
                                                    const BSONObj& theCmdObj,
@@ -142,8 +140,8 @@ std::string RemoteCommandRequestImpl<T>::toString() const {
     }
     out << " db:" << dbname;
 
-    if (expirationDate != kNoExpirationDate) {
-        out << " expDate:" << expirationDate.toString();
+    if (dateScheduled && timeout != kNoTimeout) {
+        out << " expDate:" << (*dateScheduled + timeout).toString();
     }
 
     if (hedgeOptions) {
-- 
cgit v1.2.1