diff options
| author | Tess Avitabile <tess.avitabile@mongodb.com> | 2016-02-03 15:37:59 -0500 |
|---|---|---|
| committer | Tess Avitabile <tess.avitabile@mongodb.com> | 2016-02-04 11:14:44 -0500 |
| commit | 50d9d01e266f2be06c3b497530fde14ab1aed0a9 (patch) | |
| tree | a4381bda6a61b019727dd26a5907ad221587e9a1 /src/mongo/db/commands/parallel_collection_scan.cpp | |
| parent | 11fe3dafabdaba6c346aef794b50e4be7285e922 (diff) | |
| download | mongo-50d9d01e266f2be06c3b497530fde14ab1aed0a9.tar.gz | |
SERVER-13411 parallelCollectionScan takes maxTimeMS
Diffstat (limited to 'src/mongo/db/commands/parallel_collection_scan.cpp')
| -rw-r--r-- | src/mongo/db/commands/parallel_collection_scan.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mongo/db/commands/parallel_collection_scan.cpp b/src/mongo/db/commands/parallel_collection_scan.cpp index c3b48d4fe6e..6806ec8ab57 100644 --- a/src/mongo/db/commands/parallel_collection_scan.cpp +++ b/src/mongo/db/commands/parallel_collection_scan.cpp @@ -34,6 +34,7 @@ #include "mongo/db/catalog/collection.h" #include "mongo/db/catalog/database.h" #include "mongo/db/commands.h" +#include "mongo/db/curop.h" #include "mongo/db/db_raii.h" #include "mongo/db/exec/multi_iterator.h" #include "mongo/db/query/cursor_response.h" @@ -150,6 +151,7 @@ public: exec.release(), ns.ns(), txn->recoveryUnit()->isReadingFromMajorityCommittedSnapshot()); + cc->setLeftoverMaxTimeMicros(CurOp::get(txn)->getRemainingMaxTimeMicros()); BSONObjBuilder threadResult; appendCursorResponseObject(cc->cursorid(), ns.ns(), BSONArray(), &threadResult); |