SERVER-51390 Always refresh database cache on StaleDatabaseVersion

2 files changed, 13 insertions, 0 deletions

diff --git a/src/mongo/s/catalog_cache.cpp b/src/mongo/s/catalog_cache.cpp
index ea2363fb9b2..c74d3b2ac28 100644
--- a/src/mongo/s/catalog_cache.cpp
+++ b/src/mongo/s/catalog_cache.cpp
@@ -247,6 +247,8 @@ 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 4d5c3d1f144..db6206ff88b 100644
--- a/src/mongo/s/catalog_cache_test.cpp
+++ b/src/mongo/s/catalog_cache_test.cpp
@@ -223,6 +223,17 @@ 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());