diff options
| author | James Wahlin <james@mongodb.com> | 2018-07-20 09:05:04 -0400 |
|---|---|---|
| committer | James Wahlin <james@mongodb.com> | 2018-07-27 14:14:20 -0400 |
| commit | 54f1582fc6eb01de4d4c42f26fc133e623f065fb (patch) | |
| tree | 5267a15f4d28a68d9ecf0dc0622c26fa52832a1d /src/mongo/base | |
| parent | 9d5a4298d2dd876d0762b27221332f0d9cc1871e (diff) | |
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/base')
| -rw-r--r-- | src/mongo/base/error_codes.err | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/base/error_codes.err b/src/mongo/base/error_codes.err index ed96090d5eb..b7c833248d4 100644 --- a/src/mongo/base/error_codes.err +++ b/src/mongo/base/error_codes.err @@ -49,7 +49,7 @@ error_code("LockBusy", 46) error_code("NoMatchingDocument", 47) error_code("NamespaceExists", 48) error_code("InvalidRoleModification", 49) -error_code("ExceededTimeLimit", 50) +error_code("MaxTimeMSExpired", 50) error_code("ManualInterventionRequired", 51) error_code("DollarPrefixedFieldName", 52) error_code("InvalidIdField", 53) @@ -259,6 +259,7 @@ error_code("UnknownFeatureCompatibilityVersion", 258); error_code("KeyedExecutorRetry", 259); error_code("InvalidResumeToken", 260); error_code("TooManyLogicalSessions", 261); +error_code("ExceededTimeLimit", 266); # Error codes 4000-8999 are reserved. @@ -289,6 +290,7 @@ error_class("Interruption", ["Interrupted", "InterruptedAtShutdown", "InterruptedDueToReplStateChange", "ExceededTimeLimit", + "MaxTimeMSExpired", "CursorKilled", "LockTimeout"]) @@ -316,6 +318,6 @@ error_class("ShutdownError", ["ShutdownInProgress", "InterruptedAtShutdown"]) error_class("ConnectionFatalMessageParseError", ["IllegalOpMsgFlag", "TooManyDocumentSequences"]) -error_class("ExceededTimeLimitError", ["ExceededTimeLimit", "NetworkInterfaceExceededTimeLimit"]) +error_class("ExceededTimeLimitError", ["ExceededTimeLimit", "MaxTimeMSExpired", "NetworkInterfaceExceededTimeLimit"]) error_class("SnapshotError", ["SnapshotTooOld", "SnapshotUnavailable", "StaleChunkHistory"]) |