diff options
| author | Spencer T Brody <spencer@mongodb.com> | 2020-04-22 23:17:55 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-04-24 22:46:36 +0000 |
| commit | 14a9bda8a4c2a2cdd85c01a30534980d4e79a989 (patch) | |
| tree | 501b5ad15f1d2df86b706ceba9919eae089fc0ae /src/mongo/executor/remote_command_request.cpp | |
| parent | 63d2c5bbfafafd70b872d9f5aa6495541978bb6f (diff) | |
| download | mongo-14a9bda8a4c2a2cdd85c01a30534980d4e79a989.tar.gz | |
SERVER-46187 Remove RemoteCommandRequest::expirationDate in favor of dateScheduled and timeout
Diffstat (limited to 'src/mongo/executor/remote_command_request.cpp')
| -rw-r--r-- | src/mongo/executor/remote_command_request.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
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) { |