summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mongo/db/s/collection_sharding_runtime_test.cpp82
-rw-r--r--src/mongo/db/s/shard_metadata_util.cpp20
-rw-r--r--src/mongo/db/s/shard_metadata_util.h7
-rw-r--r--src/mongo/db/s/shard_server_catalog_cache_loader.cpp140
-rw-r--r--src/mongo/db/s/shard_server_catalog_cache_loader.h27
-rw-r--r--src/mongo/db/s/shard_server_catalog_cache_loader_test.cpp17
6 files changed, 34 insertions, 259 deletions
diff --git a/src/mongo/db/s/collection_sharding_runtime_test.cpp b/src/mongo/db/s/collection_sharding_runtime_test.cpp
index 66a6c8c9249..2e0abb40742 100644
--- a/src/mongo/db/s/collection_sharding_runtime_test.cpp
+++ b/src/mongo/db/s/collection_sharding_runtime_test.cpp
@@ -290,88 +290,6 @@ protected:
CatalogCacheLoaderMock* _mockCatalogCacheLoader;
};
-TEST_F(CollectionShardingRuntimeTestWithMockedLoader,
- ForceShardFilteringMetadataRefreshWithUpdateMetadataFormat) {
- const DatabaseType dbType(kNss.db().toString(),
- kShardList[0].getName(),
- true,
- DatabaseVersion(UUID::gen(), Timestamp()));
-
- const auto epoch = OID::gen();
- const Timestamp timestamp(42);
-
- const auto coll = createCollection(epoch, timestamp);
- const auto chunks = createChunks(epoch, coll.getUuid(), timestamp);
-
- const auto timestampedColl = createCollection(epoch, timestamp);
- const auto timestampedChunks = createChunks(epoch, timestampedColl.getUuid(), timestamp);
-
- auto checkForceFilteringMetadataRefresh = [&](const auto& coll, const auto& chunks) {
- auto opCtx = operationContext();
-
- _mockCatalogCacheLoader->setDatabaseRefreshReturnValue(dbType);
- _mockCatalogCacheLoader->setCollectionRefreshValues(
- kNss, coll, chunks, boost::none /* reshardingFields */);
- forceShardFilteringMetadataRefresh(opCtx, kNss);
- AutoGetCollection autoColl(opCtx, kNss, LockMode::MODE_IS);
- const auto currentMetadata =
- CollectionShardingRuntime::get(opCtx, kNss)->getCurrentMetadataIfKnown();
- ASSERT_TRUE(currentMetadata);
- ASSERT_EQ(currentMetadata->getCollVersion().getTimestamp(), coll.getTimestamp());
- };
-
- // Testing the following transitions:
- // CV<E, M, m> -> CV<E, T, M, m> -> CV<E, M, m>
- // Note that the loader only returns the last chunk since we didn't modify any chunk.
- checkForceFilteringMetadataRefresh(coll, chunks);
- checkForceFilteringMetadataRefresh(timestampedColl, std::vector{timestampedChunks.back()});
- checkForceFilteringMetadataRefresh(coll, std::vector{chunks.back()});
-}
-
-TEST_F(CollectionShardingRuntimeTestWithMockedLoader,
- OnShardVersionMismatchWithUpdateMetadataFormat) {
- const DatabaseType dbType(kNss.db().toString(),
- kShardList[0].getName(),
- true,
- DatabaseVersion(UUID::gen(), Timestamp()));
-
- const auto epoch = OID::gen();
- const Timestamp timestamp(42);
-
- const auto coll = createCollection(epoch, timestamp);
- const auto chunks = createChunks(epoch, coll.getUuid(), timestamp);
- const auto collVersion = chunks.back().getVersion();
-
- const auto timestampedColl = createCollection(epoch, timestamp);
- const auto timestampedChunks = createChunks(epoch, timestampedColl.getUuid(), timestamp);
- const auto timestampedCollVersion = timestampedChunks.back().getVersion();
-
- auto opCtx = operationContext();
-
- auto onShardVersionMismatchCheck =
- [&](const auto& coll, const auto& chunks, const auto& receivedVersion) {
- _mockCatalogCacheLoader->setDatabaseRefreshReturnValue(dbType);
- _mockCatalogCacheLoader->setCollectionRefreshValues(
- kNss, coll, chunks, boost::none /* reshardingFields */);
-
- onShardVersionMismatch(opCtx, kNss, receivedVersion);
-
- AutoGetCollection autoColl(opCtx, kNss, LockMode::MODE_IS);
- auto currentMetadata =
- CollectionShardingRuntime::get(opCtx, kNss)->getCurrentMetadataIfKnown();
- ASSERT_TRUE(currentMetadata);
- ASSERT_EQ(currentMetadata->getCollVersion(), receivedVersion);
- };
-
- // Testing the following transitions:
- // CV<E, M, m> -> CV<E, T, M, m> -> CV<E, M, m>
- // Note that the loader only returns the last chunk since we didn't modify any chunk.
- onShardVersionMismatchCheck(coll, chunks, collVersion);
- onShardVersionMismatchCheck(
- timestampedColl, std::vector{timestampedChunks.back()}, timestampedCollVersion);
- onShardVersionMismatchCheck(coll, std::vector{chunks.back()}, collVersion);
-}
-
/**
* Fixture for when range deletion functionality is required in CollectionShardingRuntime tests.
*/
diff --git a/src/mongo/db/s/shard_metadata_util.cpp b/src/mongo/db/s/shard_metadata_util.cpp
index e26706fc7e0..f751808bf21 100644
--- a/src/mongo/db/s/shard_metadata_util.cpp
+++ b/src/mongo/db/s/shard_metadata_util.cpp
@@ -435,26 +435,6 @@ void updateSupportingLongNameOnShardCollections(OperationContext* opCtx,
uassertStatusOK(getStatusFromWriteCommandReply(commandResponse->getCommandReply()));
}
-void updateTimestampOnShardCollections(OperationContext* opCtx,
- const NamespaceString& nss,
- const boost::optional<Timestamp>& timestamp) {
- write_ops::UpdateCommandRequest clearFields(
- NamespaceString::kShardConfigCollectionsNamespace, [&] {
- write_ops::UpdateOpEntry u;
- u.setQ(BSON(ShardCollectionType::kNssFieldName << nss.ns()));
- BSONObj updateOp = (timestamp)
- ? BSON("$set" << BSON(CollectionType::kTimestampFieldName << *timestamp))
- : BSON("$unset" << BSON(CollectionType::kTimestampFieldName << ""));
- u.setU(write_ops::UpdateModification::parseFromClassicUpdate(updateOp));
- return std::vector{u};
- }());
-
- DBDirectClient client(opCtx);
- const auto commandResult = client.runCommand(clearFields.serialize({}));
-
- uassertStatusOK(getStatusFromWriteCommandResponse(commandResult->getCommandReply()));
-}
-
Status dropChunksAndDeleteCollectionsEntry(OperationContext* opCtx, const NamespaceString& nss) {
// Retrieve the collection entry from 'config.cache.collections' if available, otherwise return
// immediately
diff --git a/src/mongo/db/s/shard_metadata_util.h b/src/mongo/db/s/shard_metadata_util.h
index 6217cdef240..cb8833337c3 100644
--- a/src/mongo/db/s/shard_metadata_util.h
+++ b/src/mongo/db/s/shard_metadata_util.h
@@ -213,13 +213,6 @@ void updateSupportingLongNameOnShardCollections(OperationContext* opCtx,
SupportingLongNameStatusEnum supportingLongName);
/**
- * Adds/removes the timestamp of the 'nss' entry in config.cache.collections
- */
-void updateTimestampOnShardCollections(OperationContext* opCtx,
- const NamespaceString& nss,
- const boost::optional<Timestamp>& timestamp);
-
-/**
* Deletes locally persisted chunk metadata associated with 'nss': drops the chunks collection
* and removes the collections collection entry.
*
diff --git a/src/mongo/db/s/shard_server_catalog_cache_loader.cpp b/src/mongo/db/s/shard_server_catalog_cache_loader.cpp
index 8db392f8e5e..26f122aa2b4 100644
--- a/src/mongo/db/s/shard_server_catalog_cache_loader.cpp
+++ b/src/mongo/db/s/shard_server_catalog_cache_loader.cpp
@@ -414,25 +414,6 @@ void forcePrimaryDatabaseRefreshAndWaitForReplication(OperationContext* opCtx, S
uassertStatusOK(repl::ReplicationCoordinator::get(opCtx)->waitUntilOpTimeForRead(
opCtx, {LogicalTime::fromOperationTime(cmdResponse.response), boost::none}));
}
-
-/**
- * if 'mustPatchUpMetadataResults' is true, it sets the current 'timestamp' to all 'changedChunks'.
- * Does nothing otherwise.
- */
-void patchUpChangedChunksIfNeeded(bool mustPatchUpMetadataResults,
- const Timestamp& timestamp,
- std::vector<ChunkType>& changedChunks) {
-
- if (!mustPatchUpMetadataResults)
- return;
-
- std::for_each(changedChunks.begin(), changedChunks.end(), [&timestamp](ChunkType& chunk) {
- const ChunkVersion version = chunk.getVersion();
- chunk.setVersion(ChunkVersion(
- version.majorVersion(), version.minorVersion(), version.epoch(), timestamp));
- });
-}
-
} // namespace
ShardServerCatalogCacheLoader::ShardServerCatalogCacheLoader(
@@ -850,16 +831,6 @@ ShardServerCatalogCacheLoader::_schedulePrimaryGetChunksSince(
_waitForTasksToCompleteAndRenameChunks(
opCtx, nss, *collAndChunks.uuid, collAndChunks.supportingLongName);
- // This task will update the metadata format of the collection and all its chunks.
- // It doesn't apply the changes of the ChangedChunks, we will do that in the next task
- _ensureMajorityPrimaryAndScheduleCollAndChunksTask(
- opCtx,
- nss,
- CollAndChunkTask{swCollectionAndChangedChunks,
- maxLoaderVersion,
- termScheduled,
- true /* metadataFormatChanged */});
-
LOGV2_FOR_CATALOG_REFRESH(
5857500,
1,
@@ -968,10 +939,8 @@ StatusWith<CollectionAndChangedChunks> ShardServerCatalogCacheLoader::_getLoader
// Get the enqueued metadata first. Otherwise we could miss data between reading persisted and
// enqueued, if an enqueued task finished after the persisted read but before the enqueued read.
-
- auto [tasksAreEnqueued, enqueuedMetadata] =
+ auto [tasksAreEnqueued, enqueued] =
_getEnqueuedMetadata(nss, catalogCacheSinceVersion, expectedTerm);
- CollectionAndChangedChunks& enqueued = enqueuedMetadata.collAndChangedChunks;
auto swPersisted =
getIncompletePersistedMetadataSinceVersion(opCtx, nss, catalogCacheSinceVersion);
@@ -984,8 +953,7 @@ StatusWith<CollectionAndChangedChunks> ShardServerCatalogCacheLoader::_getLoader
persisted = std::move(swPersisted.getValue());
}
- bool lastTaskIsADrop = tasksAreEnqueued && enqueued.changedChunks.empty() &&
- !enqueuedMetadata.mustPatchUpMetadataResults;
+ bool lastTaskIsADrop = tasksAreEnqueued && enqueued.changedChunks.empty();
LOGV2_FOR_CATALOG_REFRESH(
24111,
@@ -1021,17 +989,11 @@ StatusWith<CollectionAndChangedChunks> ShardServerCatalogCacheLoader::_getLoader
// - the epoch changed in the enqueued metadata.
// Whichever the cause, the persisted metadata is out-dated/non-existent. Return enqueued
// results.
- patchUpChangedChunksIfNeeded(enqueuedMetadata.mustPatchUpMetadataResults,
- enqueued.creationTime,
- enqueued.changedChunks);
return enqueued;
} else {
// There can be overlap between persisted and enqueued metadata because enqueued work can
// be applied while persisted was read. We must remove this overlap.
- // Note also that the enqueued changed Chunks set may be empty (e.g. there is only one
- // update metadata format task)
-
if (!enqueued.changedChunks.empty()) {
const ChunkVersion minEnqueuedVersion = enqueued.changedChunks.front().getVersion();
@@ -1050,11 +1012,6 @@ StatusWith<CollectionAndChangedChunks> ShardServerCatalogCacheLoader::_getLoader
enqueued.changedChunks.end());
}
- // We may need to patch up the changed chunks because there was a metadata format change
- patchUpChangedChunksIfNeeded(enqueuedMetadata.mustPatchUpMetadataResults,
- enqueued.creationTime,
- persisted.changedChunks);
-
// The collection info in enqueued metadata may be more recent than the persisted metadata
persisted.creationTime = enqueued.creationTime;
persisted.timeseriesFields = std::move(enqueued.timeseriesFields);
@@ -1068,30 +1025,29 @@ StatusWith<CollectionAndChangedChunks> ShardServerCatalogCacheLoader::_getLoader
}
}
-std::pair<bool, ShardServerCatalogCacheLoader::EnqueuedMetadataResults>
-ShardServerCatalogCacheLoader::_getEnqueuedMetadata(const NamespaceString& nss,
- const ChunkVersion& catalogCacheSinceVersion,
- const long long term) {
+std::pair<bool, CollectionAndChangedChunks> ShardServerCatalogCacheLoader::_getEnqueuedMetadata(
+ const NamespaceString& nss,
+ const ChunkVersion& catalogCacheSinceVersion,
+ const long long term) {
stdx::unique_lock<Latch> lock(_mutex);
auto taskListIt = _collAndChunkTaskLists.find(nss);
if (taskListIt == _collAndChunkTaskLists.end()) {
- return std::make_pair(false, EnqueuedMetadataResults());
+ return std::make_pair(false, CollectionAndChangedChunks());
} else if (!taskListIt->second.hasTasksFromThisTerm(term)) {
// If task list does not have a term that matches, there's no valid task data to collect.
- return std::make_pair(false, EnqueuedMetadataResults());
+ return std::make_pair(false, CollectionAndChangedChunks());
}
// Only return task data of tasks scheduled in the same term as the given 'term': older term
// task data is no longer valid.
- EnqueuedMetadataResults enqueuedMetadata = taskListIt->second.getEnqueuedMetadataForTerm(term);
- CollectionAndChangedChunks& collAndChunks = enqueuedMetadata.collAndChangedChunks;
+ CollectionAndChangedChunks collAndChunks = taskListIt->second.getEnqueuedMetadataForTerm(term);
// Return all the results if 'catalogCacheSinceVersion's epoch does not match. Otherwise, trim
// the results to be GTE to 'catalogCacheSinceVersion'.
if (collAndChunks.epoch != catalogCacheSinceVersion.epoch()) {
- return std::make_pair(true, std::move(enqueuedMetadata));
+ return std::make_pair(true, std::move(collAndChunks));
}
auto changedChunksIt = collAndChunks.changedChunks.begin();
@@ -1101,7 +1057,7 @@ ShardServerCatalogCacheLoader::_getEnqueuedMetadata(const NamespaceString& nss,
}
collAndChunks.changedChunks.erase(collAndChunks.changedChunks.begin(), changedChunksIt);
- return std::make_pair(true, std::move(enqueuedMetadata));
+ return std::make_pair(true, std::move(collAndChunks));
}
void ShardServerCatalogCacheLoader::_ensureMajorityPrimaryAndScheduleCollAndChunksTask(
@@ -1318,8 +1274,7 @@ void ShardServerCatalogCacheLoader::_updatePersistedCollAndChunksMetadata(
stdx::unique_lock<Latch> lock(_mutex);
const CollAndChunkTask& task = _collAndChunkTaskLists[nss].front();
- invariant(task.dropped || task.updateMetadataFormat ||
- !task.collectionAndChangedChunks->changedChunks.empty());
+ invariant(task.dropped || !task.collectionAndChangedChunks->changedChunks.empty());
// If this task is from an old term and no longer valid, do not execute and return true so that
// the task gets removed from the task list
@@ -1339,12 +1294,6 @@ void ShardServerCatalogCacheLoader::_updatePersistedCollAndChunksMetadata(
return;
}
- if (task.updateMetadataFormat) {
- updateTimestampOnShardCollections(
- opCtx, nss, task.collectionAndChangedChunks->creationTime);
- return;
- }
-
uassertStatusOKWithContext(
persistCollectionAndChangedChunks(
opCtx, nss, *task.collectionAndChangedChunks, task.minQueryVersion),
@@ -1445,42 +1394,23 @@ ShardServerCatalogCacheLoader::_getCompletePersistedMetadataForSecondarySinceVer
ShardServerCatalogCacheLoader::CollAndChunkTask::CollAndChunkTask(
StatusWith<CollectionAndChangedChunks> statusWithCollectionAndChangedChunks,
ChunkVersion minimumQueryVersion,
- long long currentTerm,
- bool metadataFormatChanged)
+ long long currentTerm)
: taskNum(taskIdGenerator.fetchAndAdd(1)),
minQueryVersion(std::move(minimumQueryVersion)),
- updateMetadataFormat(metadataFormatChanged),
termCreated(currentTerm) {
if (statusWithCollectionAndChangedChunks.isOK()) {
- if (updateMetadataFormat) {
- // An update metadata format doesn't handle the ChangedChunks: if
- // there are any and they are newer than what we have locally, they
- // will be handled by another task. Despite of that, we still need
- // a valid CollectionAndChangedChunks object to get the information
- // of the collection.
- collectionAndChangedChunks = std::move(statusWithCollectionAndChangedChunks.getValue());
- collectionAndChangedChunks->changedChunks.clear();
- // Propagating the Timestamp to the maxQueryVersion, so 'getHighestVersionEnqueued'
- // returns a version with the new format.
- maxQueryVersion = ChunkVersion(minQueryVersion.majorVersion(),
- minQueryVersion.minorVersion(),
- minQueryVersion.epoch(),
- collectionAndChangedChunks->creationTime);
- } else {
- collectionAndChangedChunks = std::move(statusWithCollectionAndChangedChunks.getValue());
- invariant(!collectionAndChangedChunks->changedChunks.empty());
- const auto highestVersion =
- collectionAndChangedChunks->changedChunks.back().getVersion();
- // Note that due to the way Phase 1 of the FCV upgrade writes timestamps to chunks
- // (non-atomically), it is possible that chunks exist with timestamps, but the
- // corresponding config.collections entry doesn't. In this case, the chunks timestamp
- // should be ignored when computing the max query version and we should use the
- // timestamp that comes from config.collections.
- maxQueryVersion = ChunkVersion(highestVersion.majorVersion(),
- highestVersion.minorVersion(),
- highestVersion.epoch(),
- collectionAndChangedChunks->creationTime);
- }
+ collectionAndChangedChunks = std::move(statusWithCollectionAndChangedChunks.getValue());
+ invariant(!collectionAndChangedChunks->changedChunks.empty());
+ const auto highestVersion = collectionAndChangedChunks->changedChunks.back().getVersion();
+ // Note that due to the way Phase 1 of the FCV upgrade writes timestamps to chunks
+ // (non-atomically), it is possible that chunks exist with timestamps, but the
+ // corresponding config.collections entry doesn't. In this case, the chunks timestamp
+ // should be ignored when computing the max query version and we should use the
+ // timestamp that comes from config.collections.
+ maxQueryVersion = ChunkVersion(highestVersion.majorVersion(),
+ highestVersion.minorVersion(),
+ highestVersion.epoch(),
+ collectionAndChangedChunks->creationTime);
} else {
invariant(statusWithCollectionAndChangedChunks == ErrorCodes::NamespaceNotFound);
dropped = true;
@@ -1598,13 +1528,10 @@ ShardServerCatalogCacheLoader::CollAndChunkTaskList::getLastSupportingLongNameEn
: SupportingLongNameStatusEnum::kDisabled;
}
-ShardServerCatalogCacheLoader::EnqueuedMetadataResults
+CollectionAndChangedChunks
ShardServerCatalogCacheLoader::CollAndChunkTaskList::getEnqueuedMetadataForTerm(
const long long term) const {
- EnqueuedMetadataResults enqueuedMetadata;
-
- CollectionAndChangedChunks& collAndChunks = enqueuedMetadata.collAndChangedChunks;
- bool& mustPatchUpMetadataResults = enqueuedMetadata.mustPatchUpMetadataResults;
+ CollectionAndChangedChunks collAndChunks;
for (const auto& task : _tasks) {
if (task.termCreated != term) {
// Task data is no longer valid. Go on to the next task in the list.
@@ -1615,17 +1542,10 @@ ShardServerCatalogCacheLoader::CollAndChunkTaskList::getEnqueuedMetadataForTerm(
// The current task is a drop -> the aggregated results aren't interesting so we
// overwrite the CollAndChangedChunks and unset the flag
collAndChunks = CollectionAndChangedChunks();
- mustPatchUpMetadataResults = false;
} else if (task.collectionAndChangedChunks->epoch != collAndChunks.epoch) {
- // The current task has a new epoch -> the aggregated results aren't interesting so we
- // overwrite them. The task may be an update metadata format task, so propagate the flag
+ // The current task has a new epoch -> the aggregated results aren't interesting so we
+ // overwrite them
collAndChunks = *task.collectionAndChangedChunks;
- mustPatchUpMetadataResults = task.updateMetadataFormat;
- } else if (task.updateMetadataFormat) {
- // The current task is an update task -> we only update the Timestamp of the aggregated
- // results and set the flag
- collAndChunks.creationTime = task.collectionAndChangedChunks->creationTime;
- mustPatchUpMetadataResults = true;
} else {
// The current task is not a drop neither an update and the epochs match -> we add its
// results to the aggregated results
@@ -1657,7 +1577,7 @@ ShardServerCatalogCacheLoader::CollAndChunkTaskList::getEnqueuedMetadataForTerm(
collAndChunks.timeseriesFields = task.collectionAndChangedChunks->timeseriesFields;
}
}
- return enqueuedMetadata;
+ return collAndChunks;
}
} // namespace mongo
diff --git a/src/mongo/db/s/shard_server_catalog_cache_loader.h b/src/mongo/db/s/shard_server_catalog_cache_loader.h
index f686e9737bb..a3208c14b09 100644
--- a/src/mongo/db/s/shard_server_catalog_cache_loader.h
+++ b/src/mongo/db/s/shard_server_catalog_cache_loader.h
@@ -109,9 +109,6 @@ private:
* Note: statusWithCollectionAndChangedChunks must always be NamespaceNotFound or
* OK, otherwise the constructor will invariant because there is no task to complete.
*
- * if 'metadataFormatChanged' is true, this task updates the persistent
- * metadata format of the collection and its chunks. This specific kind
- * of task doesn't have changed chunks.
*
* 'collectionAndChangedChunks' is only initialized if 'dropped' is false.
* 'minimumQueryVersion' sets 'minQueryVersion'.
@@ -121,8 +118,7 @@ private:
CollAndChunkTask(
StatusWith<CollectionAndChangedChunks> statusWithCollectionAndChangedChunks,
ChunkVersion minimumQueryVersion,
- long long currentTerm,
- bool metadataFormatChanged = false);
+ long long currentTerm);
// Always-incrementing task number to uniquely identify different tasks
uint64_t taskNum;
@@ -144,10 +140,6 @@ private:
// Indicates whether the collection metadata must be cleared.
bool dropped{false};
- // Indicates whether the collection metadata and all its chunks must be updated due to a
- // metadata format change.
- bool updateMetadataFormat{false};
-
// The term in which the loader scheduled this task.
uint32_t termCreated;
@@ -161,22 +153,11 @@ private:
<< (minQueryVersion.isSet() ? minQueryVersion.toString() : "(unset)")
<< ", maxQueryVersion: "
<< (maxQueryVersion.isSet() ? maxQueryVersion.toString() : "(unset)")
- << ", dropped: " << dropped << ", updateMetadataFormat: " << updateMetadataFormat
- << ", termCreated: " << termCreated;
+ << ", dropped: " << dropped << ", termCreated: " << termCreated;
return ss.str();
}
};
- /* This class represents the results of a _getEnqueuedMetadata call. It contains information
- * about:
- * - Whether we must patch up the metadata results that are sent back to the CatalogCache.
- * - The Collection and the changed chunks.
- */
- struct EnqueuedMetadataResults {
- bool mustPatchUpMetadataResults{false};
- CollectionAndChangedChunks collAndChangedChunks;
- };
-
/**
* A list (work queue) of updates to apply to the shard persisted metadata store for a specific
* collection. Enforces that tasks that are added to the list are either consistent:
@@ -248,7 +229,7 @@ private:
* Iterates over the task list to retrieve the enqueued metadata. Only retrieves
* collects data from tasks that have terms matching the specified 'term'.
*/
- EnqueuedMetadataResults getEnqueuedMetadataForTerm(long long term) const;
+ CollectionAndChangedChunks getEnqueuedMetadataForTerm(long long term) const;
private:
@@ -433,7 +414,7 @@ private:
*
* Only run on the shard primary.
*/
- std::pair<bool, EnqueuedMetadataResults> _getEnqueuedMetadata(
+ std::pair<bool, CollectionAndChangedChunks> _getEnqueuedMetadata(
const NamespaceString& nss, const ChunkVersion& catalogCacheSinceVersion, long long term);
/**
diff --git a/src/mongo/db/s/shard_server_catalog_cache_loader_test.cpp b/src/mongo/db/s/shard_server_catalog_cache_loader_test.cpp
index 2bfb0c82ac4..6e3afefad2e 100644
--- a/src/mongo/db/s/shard_server_catalog_cache_loader_test.cpp
+++ b/src/mongo/db/s/shard_server_catalog_cache_loader_test.cpp
@@ -440,23 +440,6 @@ TEST_F(ShardServerCatalogCacheLoaderTest, PrimaryLoadFromShardedAndFindMixedChun
}
}
-TEST_F(ShardServerCatalogCacheLoaderTest, PrimaryLoadFromShardedAndFindDbMetadataFormatChanged) {
- const std::string dbName("dbName");
- DatabaseVersion version(UUID::gen(), Timestamp());
- DatabaseType dbType(dbName, kShardId, true /* sharded */, version);
-
- _remoteLoaderMock->setDatabaseRefreshReturnValue(dbType);
- auto newDbType = _shardLoader->getDatabase(dbName).get();
- ASSERT_EQUALS(dbType.getVersion().getUuid(), newDbType.getVersion().getUuid());
- ASSERT_EQUALS(dbType.getVersion().getTimestamp(), newDbType.getVersion().getTimestamp());
-
- dbType.setVersion(DatabaseVersion(UUID::gen(), Timestamp(42)));
- _remoteLoaderMock->setDatabaseRefreshReturnValue(dbType);
- newDbType = _shardLoader->getDatabase(dbName).get();
- ASSERT_EQUALS(dbType.getVersion().getUuid(), newDbType.getVersion().getUuid());
- ASSERT_EQUALS(dbType.getVersion().getTimestamp(), newDbType.getVersion().getTimestamp());
-}
-
TEST_F(ShardServerCatalogCacheLoaderTest, TimeseriesFieldsAreProperlyPropagatedOnSSCCL) {
ChunkVersion collectionVersion(1, 0, OID::gen(), Timestamp());
View Lorry Controller Status