summaryrefslogtreecommitdiff
path: root/src/mongo/db/s
diff options
context:
space:
mode:
authorJamie Heppenstall <jamie.heppenstall@mongodb.com>2019-07-23 15:57:06 -0400
committerJamie Heppenstall <jamie.heppenstall@mongodb.com>2019-07-24 14:53:01 -0400
commitc819181edbec6081670a5694ebd120fca5977ef6 (patch)
tree0c96d26100a17c7d6cafe878afbd3dd5683e14c5 /src/mongo/db/s
parent260a0ced5d3754f375fee6e220855e722c4b72b8 (diff)
downloadmongo-c819181edbec6081670a5694ebd120fca5977ef6.tar.gz
SERVER-42359 Remove okToReadWhileRefreshing from getPersistedMetadataSinceVersion
Diffstat (limited to 'src/mongo/db/s')
-rw-r--r--src/mongo/db/s/shard_server_catalog_cache_loader.cpp7
1 files changed, 3 insertions, 4 deletions
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 81142fd65ef..d278e8acba3 100644
--- a/src/mongo/db/s/shard_server_catalog_cache_loader.cpp
+++ b/src/mongo/db/s/shard_server_catalog_cache_loader.cpp
@@ -198,8 +198,7 @@ ChunkVersion getPersistedMaxChunkVersion(OperationContext* opCtx, const Namespac
*/
CollectionAndChangedChunks getPersistedMetadataSinceVersion(OperationContext* opCtx,
const NamespaceString& nss,
- ChunkVersion version,
- const bool okToReadWhileRefreshing) {
+ ChunkVersion version) {
ShardCollectionType shardCollectionEntry =
uassertStatusOK(readShardCollectionsEntry(opCtx, nss));
@@ -243,7 +242,7 @@ StatusWith<CollectionAndChangedChunks> getIncompletePersistedMetadataSinceVersio
try {
CollectionAndChangedChunks collAndChunks =
- getPersistedMetadataSinceVersion(opCtx, nss, version, false);
+ getPersistedMetadataSinceVersion(opCtx, nss, version);
if (collAndChunks.changedChunks.empty()) {
// Found a collections entry, but the chunks are being updated.
return CollectionAndChangedChunks();
@@ -1111,7 +1110,7 @@ ShardServerCatalogCacheLoader::_getCompletePersistedMetadataForSecondarySinceVer
// Load the metadata.
CollectionAndChangedChunks collAndChangedChunks =
- getPersistedMetadataSinceVersion(opCtx, nss, version, true);
+ getPersistedMetadataSinceVersion(opCtx, nss, version);
// Check that no updates were concurrently applied while we were loading the metadata: this
// could cause the loaded metadata to provide an incomplete view of the chunk ranges.