Update upstream source from tag 'upstream/6.0.10'debian/6.0.10-1

Update to upstream version '6.0.10'
with Debian dir 2d176fa254eee97b139f712fec5709641335a8c3

1 files changed, 16 insertions, 4 deletions

diff --git a/src/mongo/base/error_codes.yml b/src/mongo/base/error_codes.yml
index 0b3150042bd..d98c6adf60d 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}
+    - {code: 134,name: ReadConcernMajorityNotAvailableYet, categories: [RetriableError]}
     - {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}
-    - {code: 254,name: FreeMonHttpTemporaryFailure}
-    - {code: 255,name: FreeMonHttpPermanentFailure}
+    # - {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: 256,name: TransactionCommitted}
     - {code: 257,name: TransactionTooLarge}
     - {code: 258,name: UnknownFeatureCompatibilityVersion}
@@ -492,6 +492,18 @@ error_codes:
     - {code: 375, name: TransactionAPIMustRetryCommit, categories: [InternalOnly]}
     - {code: 377, name: FLEMaxTagLimitExceeded }
 
+    - {code: 379, name: DatabaseMetadataRefreshCanceled, categories: [InternalOnly]}
+
+    - {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]}
+
     # Error codes 4000-8999 are reserved.
 
     # Non-sequential error codes for compatibility only)