summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTommaso Tocci <tommaso.tocci@mongodb.com>2020-10-09 00:40:52 +0200
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-10-09 01:55:20 +0000
commit2fa5675cb699cd62c38aea9cb133b2069b524266 (patch)
tree51432b2512fd7303f03f5e0fc16d39e10be40446 /src
parent28c6948a2a02760a69aaee3875c4b2a427528a5a (diff)
downloadmongo-2fa5675cb699cd62c38aea9cb133b2069b524266.tar.gz
Revert "SERVER-51390 Always refresh database cache on StaleDatabaseVersion"
This reverts commit d81fb9e5c454f89b6c41099c8b8ce09c463344c6.
Diffstat (limited to 'src')
-rw-r--r--src/mongo/s/catalog_cache.cpp2
-rw-r--r--src/mongo/s/catalog_cache_test.cpp11
2 files changed, 0 insertions, 13 deletions
diff --git a/src/mongo/s/catalog_cache.cpp b/src/mongo/s/catalog_cache.cpp
index c74d3b2ac28..ea2363fb9b2 100644
--- a/src/mongo/s/catalog_cache.cpp
+++ b/src/mongo/s/catalog_cache.cpp
@@ -247,8 +247,6 @@ void CatalogCache::onStaleDatabaseVersion(const StringData dbName,
"db"_attr = dbName,
"version"_attr = version.toBSONForLogging());
_databaseCache.advanceTimeInStore(dbName.toString(), version);
- } else {
- _databaseCache.invalidate(dbName.toString());
}
}
diff --git a/src/mongo/s/catalog_cache_test.cpp b/src/mongo/s/catalog_cache_test.cpp
index db6206ff88b..4d5c3d1f144 100644
--- a/src/mongo/s/catalog_cache_test.cpp
+++ b/src/mongo/s/catalog_cache_test.cpp
@@ -223,17 +223,6 @@ TEST_F(CatalogCacheTest, InvalidateSingleDbOnShardRemoval) {
ASSERT_EQ(cachedDb.primaryId(), kShards[1]);
}
-TEST_F(CatalogCacheTest, OnStaleDatabaseVersionNoVersion) {
- // onStaleDatabaseVesrsion must invalidate the database entry if invoked with no version
- const auto dbVersion = DatabaseVersion(UUID::gen(), 1);
- loadDatabases({DatabaseType(kNss.db().toString(), kShards[0], true, dbVersion)});
-
- _catalogCache->onStaleDatabaseVersion(kNss.db(), boost::none);
-
- const auto status = _catalogCache->getDatabase(operationContext(), kNss.db()).getStatus();
- ASSERT(status == ErrorCodes::InternalError);
-}
-
TEST_F(CatalogCacheTest, OnStaleShardVersionWithSameVersion) {
const auto dbVersion = DatabaseVersion(UUID::gen(), 1);
const auto cachedCollVersion = ChunkVersion(1, 0, OID::gen());