summaryrefslogtreecommitdiff
path: root/src/mongo/db/exec/cached_plan.h
diff options
context:
space:
mode:
authorJames Wahlin <james@mongodb.com>2018-07-20 09:05:04 -0400
committerJames Wahlin <james@mongodb.com>2018-07-27 14:14:20 -0400
commit54f1582fc6eb01de4d4c42f26fc133e623f065fb (patch)
tree5267a15f4d28a68d9ecf0dc0622c26fa52832a1d /src/mongo/db/exec/cached_plan.h
parent9d5a4298d2dd876d0762b27221332f0d9cc1871e (diff)
downloadmongo-54f1582fc6eb01de4d4c42f26fc133e623f065fb.tar.gz
SERVER-35031 Return MaxTimeMSExpired for maxTimeMS timeoutr4.0.1-rc1r4.0.1
Adds a new 'MaxTimeMSExpired' error code, returned when a timeout occurs due to exceeding of maxTimeMS. Timeouts unrelated to maxTimeMS will continue to return 'ExceededTimeLimit'. (cherry picked from commit 35528523c00b72a210dc5b78a427d90ed1c14331)
Diffstat (limited to 'src/mongo/db/exec/cached_plan.h')
-rw-r--r--src/mongo/db/exec/cached_plan.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/exec/cached_plan.h b/src/mongo/db/exec/cached_plan.h
index 658312db4a0..9a2ec1a1b81 100644
--- a/src/mongo/db/exec/cached_plan.h
+++ b/src/mongo/db/exec/cached_plan.h
@@ -112,7 +112,7 @@ private:
*
* Returns a non-OK status if query planning fails. In particular, this function returns
* ErrorCodes::QueryPlanKilled if the query plan was killed during a yield, or
- * ErrorCodes::ExceededTimeLimit if the operation exceeded its time limit.
+ * ErrorCodes::MaxTimeMSExpired if the operation exceeded its time limit.
*/
Status tryYield(PlanYieldPolicy* yieldPolicy);