diff options
| author | atesteve <aitor.esteve@mongodb.com> | 2024-03-26 17:39:02 +0100 |
|---|---|---|
| committer | MongoDB Bot <mongo-bot@mongodb.com> | 2024-03-26 18:10:34 +0000 |
| commit | 9224eea71cb3758d547be47ca60ba40049bf4c8b (patch) | |
| tree | 67744e9d5fc2eb27a00623786e686e906bec9c97 | |
| parent | dbafe381dc70806dc68afa47c5f1ef8264ad24a6 (diff) | |
SERVER-88360 Remove tassert for UUID inconsistency check (#20366)r7.0.8-rc0r7.0.8
(cherry picked from commit 142984663b0b05c3c256e9bb756cdae9b561fc0b)
GitOrigin-RevId: c5d33e55ba38d98e2f48765ec4e55338d67a4a64
| -rw-r--r-- | src/mongo/db/catalog_raii.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/mongo/db/catalog_raii.cpp b/src/mongo/db/catalog_raii.cpp index 7d6d64e949d..ae976c6cacd 100644 --- a/src/mongo/db/catalog_raii.cpp +++ b/src/mongo/db/catalog_raii.cpp @@ -811,22 +811,16 @@ void auto_get_collection::checkShardingAndLocalCatalogCollectionUUIDMatch( // the transaction can be retried. This situation is known to be possible when a // collection undergoes resharding, due to the resharding commit protocol. See // SERVER-87061. - // TODO: SERVER-87235: Remove this condition and leave only the tassert below also for - // transaction and snapshot reads. + // TODO: SERVER-87235: Remove this condition and leave only the tassert that will be + // introduced in SERVER-88476 below also for transaction and snapshot reads. uasserted( ErrorCodes::SnapshotUnavailable, "Sharding catalog and local catalog collection uuid do not match. Nss: '{}', sharding uuid: '{}', local uuid: '{}'"_format( nss.toStringForErrorMsg(), shardingCollectionDescription.getUUID().toString(), collectionPtr ? collectionPtr->uuid().toString() : "")); - } else { - tasserted( - 8706100, - "Sharding catalog and local catalog collection uuid do not match. Nss: '{}', sharding uuid: '{}', local uuid: '{}'"_format( - nss.toStringForErrorMsg(), - shardingCollectionDescription.getUUID().toString(), - collectionPtr ? collectionPtr->uuid().toString() : "")); + // TODO: SERVER-88476: reintroduce tassert here similar to the uassert above. } } } |
