diff options
| author | David Storch <david.storch@10gen.com> | 2015-10-30 13:15:39 -0400 |
|---|---|---|
| committer | David Storch <david.storch@10gen.com> | 2015-11-05 11:26:56 -0500 |
| commit | 5b34689a84b969affc822e014e44816959ca460b (patch) | |
| tree | 29f16d4988fbad4f5c62892fd253cbe90d02b3fa /src/mongo/s/strategy.cpp | |
| parent | 5edafdbf6ca1effcb18d62c8e53b37544afecfcc (diff) | |
| download | mongo-5b34689a84b969affc822e014e44816959ca460b.tar.gz | |
SERVER-21218 make mongos forward maxTimeMS on getMore command to mongod
Diffstat (limited to 'src/mongo/s/strategy.cpp')
| -rw-r--r-- | src/mongo/s/strategy.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/s/strategy.cpp b/src/mongo/s/strategy.cpp index 1f711ad861a..79f63fc463b 100644 --- a/src/mongo/s/strategy.cpp +++ b/src/mongo/s/strategy.cpp @@ -264,7 +264,8 @@ void Strategy::queryOp(OperationContext* txn, Request& request) { QuerySpec qSpec((string)q.ns, q.query, q.fields, q.ntoskip, q.ntoreturn, q.queryOptions); // Parse "$maxTimeMS". - StatusWith<int> maxTimeMS = LiteParsedQuery::parseMaxTimeMSQuery(q.query); + StatusWith<int> maxTimeMS = + LiteParsedQuery::parseMaxTimeMS(q.query[LiteParsedQuery::queryOptionMaxTimeMS]); uassert(17233, maxTimeMS.getStatus().reason(), maxTimeMS.isOK()); if (_isSystemIndexes(q.ns) && doShardedIndexQuery(txn, request, qSpec)) { @@ -576,7 +577,8 @@ void Strategy::getMore(OperationContext* txn, Request& request) { if (ntoreturn) { batchSize = abs(ntoreturn); } - GetMoreRequest getMoreRequest(NamespaceString(ns), id, batchSize, boost::none, boost::none); + GetMoreRequest getMoreRequest( + NamespaceString(ns), id, batchSize, boost::none, boost::none, boost::none); auto cursorResponse = ClusterFind::runGetMore(txn, getMoreRequest); if (cursorResponse == ErrorCodes::CursorNotFound) { |