From 50d9d01e266f2be06c3b497530fde14ab1aed0a9 Mon Sep 17 00:00:00 2001 From: Tess Avitabile Date: Wed, 3 Feb 2016 15:37:59 -0500 Subject: SERVER-13411 parallelCollectionScan takes maxTimeMS --- src/mongo/db/commands/parallel_collection_scan.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/mongo/db/commands/parallel_collection_scan.cpp') 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); -- cgit v1.2.1