Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 7 insertions, 21 deletions

diff --git a/src/mongo/base/error_codes.yml b/src/mongo/base/error_codes.yml
index 6b43f74536f..0b3150042bd 100644
--- a/src/mongo/base/error_codes.yml
+++ b/src/mongo/base/error_codes.yml
@@ -174,7 +174,7 @@ error_codes:
     #- {code: 131,name: RLPInitializationFailed} # Removed in 4.2
     - {code: 132,name: OBSOLETE_ConfigServersInconsistent}
     - {code: 133,name: FailedToSatisfyReadPreference}
-    - {code: 134,name: ReadConcernMajorityNotAvailableYet, categories: [RetriableError]}
+    - {code: 134,name: ReadConcernMajorityNotAvailableYet}
     - {code: 135,name: StaleTerm}
     - {code: 136,name: CappedPositionLost}
     - {code: 137,name: IncompatibleShardingConfigVersion}
@@ -301,9 +301,9 @@ error_codes:
     - {code: 250,name: StaleChunkHistory,categories: [SnapshotError]}
     - {code: 251,name: NoSuchTransaction,categories: [VoteAbortError]}
     - {code: 252,name: ReentrancyNotAllowed}
-    # - {code: 253,name: FreeMonHttpInFlight} # Removed in 7.1
-    # - {code: 254,name: FreeMonHttpTemporaryFailure} # Removed in 7.1
-    # - {code: 255,name: FreeMonHttpPermanentFailure} # Removed in 7.1
+    - {code: 253,name: FreeMonHttpInFlight}
+    - {code: 254,name: FreeMonHttpTemporaryFailure}
+    - {code: 255,name: FreeMonHttpPermanentFailure}
     - {code: 256,name: TransactionCommitted}
     - {code: 257,name: TransactionTooLarge}
     - {code: 258,name: UnknownFeatureCompatibilityVersion}
@@ -428,6 +428,9 @@ error_codes:
     - {code: 341, name: ReshardCollectionAborted}
     - {code: 342, name: ReshardingCriticalSectionTimeout}
 
+    # ShardCannotRefreshDueToLocksHeld will be retried by the shards. Note that it is not under the
+    # NeedRetargettingError, meaning MongoS will pass it through to the client, because there is no
+    # case where it would be possible for MongoS to retry where MongoD couldn't.
     - {code: 343, name: ShardCannotRefreshDueToLocksHeld,
                   extra: ShardCannotRefreshDueToLocksHeldInfo}
 
@@ -488,23 +491,6 @@ error_codes:
     - {code: 374, name: TransactionAPIMustRetryTransaction, categories: [InternalOnly]}
     - {code: 375, name: TransactionAPIMustRetryCommit, categories: [InternalOnly]}
     - {code: 377, name: FLEMaxTagLimitExceeded }
-    - {code: 378, name: NonConformantBSON, categories: [ValidationError]}
-
-    - {code: 379, name: DatabaseMetadataRefreshCanceled, categories: [InternalOnly]}
-
-    - {code: 387, name: EncounteredFLEPayloadWhileApplyingHmac}
-
-    - {code: 388, name: TransactionTooLargeForCache}
-
-    # This error code is not generated internally in mongod/s servers, but must be parsed and
-    # reserve an error code. It can be returned by a remote search index management server.
-    - {code: 396, name: IndexInformationTooLarge}
-
-    - {code: 398, name: StreamTerminated, categories: [CloseConnectionError]}
-
-    - {code: 384, name: ConnectionError, categories: [NetworkError,RetriableError,InternalOnly]}
-
-    - {code: 408, name: CannotInsertTimeseriesBucketsWithMixedSchema}
 
     # Error codes 4000-8999 are reserved.