diff options
| author | Blake Oler <blake.oler@mongodb.com> | 2020-04-13 12:12:39 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-04-15 14:48:40 +0000 |
| commit | 2c87953010c2c1ec2d39dc9a7dbbd5f7d49dab10 (patch) | |
| tree | aa550343ac67447b670a23ece41ef8ef247749ec /src/mongo/s/catalog_cache.cpp | |
| parent | 9be1041342b666e979aaea483c2fdb929c801796 (diff) | |
| download | mongo-2c87953010c2c1ec2d39dc9a7dbbd5f7d49dab10.tar.gz | |
SERVER-44972 Make ShardId a required field in StaleConfigInfo
Diffstat (limited to 'src/mongo/s/catalog_cache.cpp')
| -rw-r--r-- | src/mongo/s/catalog_cache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/s/catalog_cache.cpp b/src/mongo/s/catalog_cache.cpp index 0ec5e8a7019..fe69cf19153 100644 --- a/src/mongo/s/catalog_cache.cpp +++ b/src/mongo/s/catalog_cache.cpp @@ -414,9 +414,9 @@ void CatalogCache::invalidateShardOrEntireCollectionEntryForShardedCollection( const NamespaceString& nss, boost::optional<ChunkVersion> wantedVersion, const ChunkVersion& receivedVersion, - boost::optional<ShardId> shardId) { - if (shardId && shardVersionsHaveMatchingEpoch(wantedVersion, receivedVersion)) { - _createOrGetCollectionEntryAndMarkShardStale(nss, *shardId); + ShardId shardId) { + if (shardVersionsHaveMatchingEpoch(wantedVersion, receivedVersion)) { + _createOrGetCollectionEntryAndMarkShardStale(nss, shardId); } else { _createOrGetCollectionEntryAndMarkEpochStale(nss); } |