SERVER-41493 Set request deadline based on maxtime ms in network interface

1 files changed, 4 insertions, 6 deletions

diff --git a/src/mongo/executor/remote_command_request.cpp b/src/mongo/executor/remote_command_request.cpp
index be7ce253dd9..38b745bebee 100644
--- a/src/mongo/executor/remote_command_request.cpp
+++ b/src/mongo/executor/remote_command_request.cpp
@@ -59,12 +59,10 @@ RemoteCommandRequestBase::RemoteCommandRequestBase(RequestId requestId,
                                                    const BSONObj& metadataObj,
                                                    OperationContext* opCtx,
                                                    Milliseconds timeoutMillis)
-    : id(requestId),
-      dbname(theDbName),
-      metadata(metadataObj),
-      cmdObj(theCmdObj),
-      opCtx(opCtx),
-      timeout(timeoutMillis) {}
+    : id(requestId), dbname(theDbName), metadata(metadataObj), cmdObj(theCmdObj), opCtx(opCtx) {
+    timeout = opCtx ? std::min<Milliseconds>(opCtx->getRemainingMaxTimeMillis(), timeoutMillis)
+                    : timeoutMillis;
+}
 
 RemoteCommandRequestBase::RemoteCommandRequestBase() : id(requestIdCounter.addAndFetch(1)) {}