SERVER-21218 make mongos forward maxTimeMS on getMore command to mongod

1 files changed, 5 insertions, 0 deletions

diff --git a/src/mongo/db/query/getmore_request.h b/src/mongo/db/query/getmore_request.h
index 56a1f2031b0..16455bfb055 100644
--- a/src/mongo/db/query/getmore_request.h
+++ b/src/mongo/db/query/getmore_request.h
@@ -35,6 +35,7 @@
 #include "mongo/base/status_with.h"
 #include "mongo/db/clientcursor.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/util/time_support.h"
 
 namespace mongo {
 
@@ -52,6 +53,7 @@ struct GetMoreRequest {
     GetMoreRequest(NamespaceString namespaceString,
                    CursorId id,
                    boost::optional<long long> sizeOfBatch,
+                   boost::optional<Milliseconds> awaitDataTimeout,
                    boost::optional<long long> term,
                    boost::optional<repl::OpTime> lastKnownCommittedOpTime);
 
@@ -76,6 +78,9 @@ struct GetMoreRequest {
     // as fit within the byte limit.
     const boost::optional<long long> batchSize;
 
+    // The number of milliseconds for which a getMore on a tailable, awaitData query should block.
+    const boost::optional<Milliseconds> awaitDataTimeout;
+
     // Only internal queries from replication will typically have a term.
     const boost::optional<long long> term;