mongodb/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SERVER-124506 Make CollectionCacheRecoverer use makeNewAllowingGaps when reading from shard catalog disk (#52133)

Browse Source 
GitOrigin-RevId: cb108aaafb21252788df0a37b46c61b40cea4700
This commit is contained in:
Pol Piñol Castuera 2026-04-20 16:24:26 +02:00 committed by MongoDB Bot
parent 718939c0f4
commit 3cbcc55f33
2 changed files with 60 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mongo/db/shard_role/shard_catalog/collection_cache_recoverer.cpp
View File

@ -101,18 +101,18 @@ CollectionMetadata recoverCollectionFromDisk(OperationContext* opCtx,
return nullptr;
}();
auto rt = OptionalRoutingTableHistory{std::make_shared<RoutingTableHistory>(
RoutingTableHistory::makeNew(coll->getNss(),
coll->getUuid(),
coll->getKeyPattern(),
coll->getUnsplittable(),
std::move(defaultCollator),
coll->getUnique(),
coll->getEpoch(),
coll->getTimestamp(),
coll->getTimeseriesFields(),
coll->getReshardingFields(),
coll->getAllowMigrations(),
chunks))};
RoutingTableHistory::makeNewAllowingGaps(coll->getNss(),
coll->getUuid(),
coll->getKeyPattern(),
coll->getUnsplittable(),
std::move(defaultCollator),
coll->getUnique(),
coll->getEpoch(),
coll->getTimestamp(),
coll->getTimeseriesFields(),
coll->getReshardingFields(),
coll->getAllowMigrations(),
chunks))};
auto cm = CurrentChunkManager{std::move(rt)};
return CollectionMetadata{std::move(cm), ShardingState::get(opCtx)->shardId()};
}

48
src/mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh_test.cpp
View File

@ -667,6 +667,54 @@ TEST_F(AuthoritativeRefreshFixture,
ASSERT_FALSE(metadataOpt->getShardPlacementVersion().isSet());
}
TEST_F(AuthoritativeRefreshFixture, PartialRangeDiskCatalogRecoversWithoutChunkMetadata) {
RAIIServerParameterControllerForTest featureFlag("featureFlagShardAuthoritativeCollMetadata",
true);
auto* opCtx = operationContext();
const UUID uuid = UUID::gen();
const OID epoch = OID::gen();
const Timestamp timestamp(Date_t::now());
CollectionType collType{kTestNss, epoch, timestamp, Date_t::now(), uuid, kShardKeyPattern};
// Build two contiguous chunks owned by this shard whose extremes are neither MinKey nor
// MaxKey. The "missing" chunks [MinKey, 100) and [300, MaxKey] logically exist on
// "otherShard" but are not persisted on this node, exactly as `fetchOwnedChunks` would
// produce at runtime.
auto makeChunk = [&](BSONObj min, BSONObj max, ChunkVersion v) {
ChunkType c{uuid, ChunkRange(std::move(min), std::move(max)), v, kMyShardName};
c.setName(OID::gen());
return c;
};
ChunkVersion v({epoch, timestamp}, {1, 0});
std::vector<ChunkType> myOwnedChunks;
myOwnedChunks.push_back(makeChunk(BSON(kShardKey << 100), BSON(kShardKey << 200), v));
v.incMajor();
myOwnedChunks.push_back(makeChunk(BSON(kShardKey << 200), BSON(kShardKey << 300), v));
populateDiskCatalog(opCtx, collType, myOwnedChunks);
{
auto csr = CollectionShardingRuntime::acquireExclusive(opCtx, kTestNss);
csr->clearFilteringMetadata_authoritative(opCtx);
}
auto status = onShardVersionMismatch(opCtx, kTestNss, boost::none);
ASSERT_OK(status);
auto csr = CollectionShardingRuntime::acquireShared(opCtx, kTestNss);
auto metadataOpt = csr->getCurrentMetadataIfKnown();
ASSERT_TRUE(metadataOpt.has_value());
ASSERT_TRUE(metadataOpt->isSharded());
ASSERT_TRUE(metadataOpt->getShardPlacementVersion().isSet());
ASSERT_EQ(metadataOpt->getShardPlacementVersion(), myOwnedChunks.back().getVersion());
auto stats = getStatistics(opCtx);
ASSERT_EQ(stats.getIntField("diskRecoveriesPerformed"), 1);
ASSERT_EQ(stats.getIntField("recoverersCreated"), 1);
}
TEST_F(AuthoritativeRefreshFixture, SequentialCallsAreIdempotent) {
RAIIServerParameterControllerForTest featureFlag("featureFlagShardAuthoritativeCollMetadata",
true);