SERVER-49976 Cleanup database cache on shard removal

5 files changed, 2 insertions, 217 deletions

diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript
index 5ebc2fd9211..1299619916c 100644
--- a/src/mongo/db/s/SConscript
+++ b/src/mongo/db/s/SConscript
@@ -392,7 +392,6 @@ env.CppUnitTest(
         'active_migrations_registry_test.cpp',
         'active_move_primaries_registry_test.cpp',
         'active_shard_collection_registry_test.cpp',
-        'catalog_cache_loader_mock.cpp',
         'chunk_split_state_driver_test.cpp',
         'migration_chunk_cloner_source_legacy_test.cpp',
         'migration_destination_manager_test.cpp',
diff --git a/src/mongo/db/s/catalog_cache_loader_mock.cpp b/src/mongo/db/s/catalog_cache_loader_mock.cpp
deleted file mode 100644
index 1711358e0c8..00000000000
--- a/src/mongo/db/s/catalog_cache_loader_mock.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- *    Copyright (C) 2018-present MongoDB, Inc.
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the Server Side Public License, version 1,
- *    as published by MongoDB, Inc.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    Server Side Public License for more details.
- *
- *    You should have received a copy of the Server Side Public License
- *    along with this program. If not, see
- *    <http://www.mongodb.com/licensing/server-side-public-license>.
- *
- *    As a special exception, the copyright holders give permission to link the
- *    code of portions of this program with the OpenSSL library under certain
- *    conditions as described in each individual source file and distribute
- *    linked combinations including the program with the OpenSSL library. You
- *    must comply with the Server Side Public License in all respects for
- *    all of the code used other than as permitted herein. If you modify file(s)
- *    with this exception, you may extend this exception to your version of the
- *    file(s), but you are not obligated to do so. If you do not wish to do so,
- *    delete this exception statement from your version. If you delete this
- *    exception statement from all source files in the program, then also delete
- *    it in the license file.
- */
-
-#include "mongo/platform/basic.h"
-
-#include "mongo/db/s/catalog_cache_loader_mock.h"
-
-#include "mongo/db/operation_context.h"
-#include "mongo/s/catalog/type_chunk.h"
-#include "mongo/s/catalog/type_collection.h"
-#include "mongo/stdx/thread.h"
-
-namespace mongo {
-
-using CollectionAndChangedChunks = CatalogCacheLoader::CollectionAndChangedChunks;
-
-void CatalogCacheLoaderMock::initializeReplicaSetRole(bool isPrimary) {
-    MONGO_UNREACHABLE;
-}
-
-void CatalogCacheLoaderMock::onStepDown() {
-    MONGO_UNREACHABLE;
-}
-
-void CatalogCacheLoaderMock::onStepUp() {
-    MONGO_UNREACHABLE;
-}
-
-void CatalogCacheLoaderMock::shutDown() {}
-
-void CatalogCacheLoaderMock::notifyOfCollectionVersionUpdate(const NamespaceString& nss) {
-    MONGO_UNREACHABLE;
-}
-
-void CatalogCacheLoaderMock::waitForCollectionFlush(OperationContext* opCtx,
-                                                    const NamespaceString& nss) {
-    MONGO_UNREACHABLE;
-}
-
-void CatalogCacheLoaderMock::waitForDatabaseFlush(OperationContext* opCtx, StringData dbName) {
-    MONGO_UNREACHABLE;
-}
-
-SemiFuture<CollectionAndChangedChunks> CatalogCacheLoaderMock::getChunksSince(
-    const NamespaceString& nss, ChunkVersion version) {
-
-    return makeReadyFutureWith([this] {
-               uassertStatusOK(_swCollectionReturnValue);
-               uassertStatusOK(_swChunksReturnValue);
-
-               // We swap the chunks out of _swChunksReturnValue to ensure if this task is
-               // scheduled multiple times that we don't inform the ChunkManager about a chunk it
-               // has already updated.
-               std::vector<ChunkType> chunks;
-               _swChunksReturnValue.getValue().swap(chunks);
-
-               return CollectionAndChangedChunks(
-                   _swCollectionReturnValue.getValue().getUUID(),
-                   _swCollectionReturnValue.getValue().getEpoch(),
-                   _swCollectionReturnValue.getValue().getKeyPattern().toBSON(),
-                   _swCollectionReturnValue.getValue().getDefaultCollation(),
-                   _swCollectionReturnValue.getValue().getUnique(),
-                   std::move(chunks));
-           })
-        .semi();
-}
-
-SemiFuture<DatabaseType> CatalogCacheLoaderMock::getDatabase(StringData dbName) {
-    return makeReadyFutureWith([this] {
-               uassertStatusOK(_swDatabaseReturnValue);
-               return DatabaseType(_swDatabaseReturnValue.getValue().getName(),
-                                   _swDatabaseReturnValue.getValue().getPrimary(),
-                                   _swDatabaseReturnValue.getValue().getSharded(),
-                                   _swDatabaseReturnValue.getValue().getVersion());
-           })
-        .semi();
-}
-
-void CatalogCacheLoaderMock::setCollectionRefreshReturnValue(
-    StatusWith<CollectionType> statusWithCollectionType) {
-    _swCollectionReturnValue = std::move(statusWithCollectionType);
-}
-
-void CatalogCacheLoaderMock::setChunkRefreshReturnValue(
-    StatusWith<std::vector<ChunkType>> statusWithChunks) {
-    _swChunksReturnValue = std::move(statusWithChunks);
-}
-
-void CatalogCacheLoaderMock::setDatabaseRefreshReturnValue(StatusWith<DatabaseType> swDatabase) {
-    _swDatabaseReturnValue = std::move(swDatabase);
-}
-
-}  // namespace mongo
diff --git a/src/mongo/db/s/catalog_cache_loader_mock.h b/src/mongo/db/s/catalog_cache_loader_mock.h
deleted file mode 100644
index 1bb13a46285..00000000000
--- a/src/mongo/db/s/catalog_cache_loader_mock.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- *    Copyright (C) 2018-present MongoDB, Inc.
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the Server Side Public License, version 1,
- *    as published by MongoDB, Inc.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    Server Side Public License for more details.
- *
- *    You should have received a copy of the Server Side Public License
- *    along with this program. If not, see
- *    <http://www.mongodb.com/licensing/server-side-public-license>.
- *
- *    As a special exception, the copyright holders give permission to link the
- *    code of portions of this program with the OpenSSL library under certain
- *    conditions as described in each individual source file and distribute
- *    linked combinations including the program with the OpenSSL library. You
- *    must comply with the Server Side Public License in all respects for
- *    all of the code used other than as permitted herein. If you modify file(s)
- *    with this exception, you may extend this exception to your version of the
- *    file(s), but you are not obligated to do so. If you do not wish to do so,
- *    delete this exception statement from your version. If you delete this
- *    exception statement from all source files in the program, then also delete
- *    it in the license file.
- */
-
-#pragma once
-
-#include "mongo/s/catalog_cache_loader.h"
-#include "mongo/util/concurrency/thread_pool.h"
-
-namespace mongo {
-
-/**
- * Mocks the metadata refresh results with settable return values. The purpose of this class is to
- * facilitate testing of classes that use a CatalogCacheLoader.
- */
-class CatalogCacheLoaderMock final : public CatalogCacheLoader {
-    CatalogCacheLoaderMock(const CatalogCacheLoaderMock&) = delete;
-    CatalogCacheLoaderMock& operator=(const CatalogCacheLoaderMock&) = delete;
-
-public:
-    CatalogCacheLoaderMock() = default;
-    ~CatalogCacheLoaderMock() = default;
-
-    /**
-     * These functions should never be called. They trigger invariants if called.
-     */
-    void initializeReplicaSetRole(bool isPrimary) override;
-    void onStepDown() override;
-    void onStepUp() override;
-    void shutDown() override;
-    void notifyOfCollectionVersionUpdate(const NamespaceString& nss) override;
-    void waitForCollectionFlush(OperationContext* opCtx, const NamespaceString& nss) override;
-    void waitForDatabaseFlush(OperationContext* opCtx, StringData dbName) override;
-
-    SemiFuture<CollectionAndChangedChunks> getChunksSince(const NamespaceString& nss,
-                                                          ChunkVersion version) override;
-
-    SemiFuture<DatabaseType> getDatabase(StringData dbName) override;
-
-    /**
-     * Sets the mocked collection entry result that getChunksSince will use to construct its return
-     * value.
-     */
-    void setCollectionRefreshReturnValue(StatusWith<CollectionType> statusWithCollectionType);
-
-    /**
-     * Sets the mocked chunk results that getChunksSince will use to construct its return value.
-     */
-    void setChunkRefreshReturnValue(StatusWith<std::vector<ChunkType>> statusWithChunks);
-
-    /**
-     * Sets the mocked database entry result that getDatabase will use to construct its return
-     * value.
-     */
-    void setDatabaseRefreshReturnValue(StatusWith<DatabaseType> swDatabase);
-
-private:
-    StatusWith<DatabaseType> _swDatabaseReturnValue{
-        Status(ErrorCodes::InternalError, "config loader database response is uninitialized")};
-
-    // These variables hold the mocked chunks and collection entry results used to construct the
-    // return value of getChunksSince above.
-    StatusWith<CollectionType> _swCollectionReturnValue{Status(
-        ErrorCodes::InternalError, "config loader mock collection response is uninitialized")};
-
-    StatusWith<std::vector<ChunkType>> _swChunksReturnValue{
-        Status(ErrorCodes::InternalError, "config loader mock chunks response is uninitialized")};
-};
-
-}  // namespace mongo
diff --git a/src/mongo/db/s/migration_util_test.cpp b/src/mongo/db/s/migration_util_test.cpp
index c39871ab2a1..0d06c8175d8 100644
--- a/src/mongo/db/s/migration_util_test.cpp
+++ b/src/mongo/db/s/migration_util_test.cpp
@@ -32,7 +32,6 @@
 #include "mongo/db/catalog_raii.h"
 #include "mongo/db/persistent_task_store.h"
 #include "mongo/db/repl/wait_for_majority_service.h"
-#include "mongo/db/s/catalog_cache_loader_mock.h"
 #include "mongo/db/s/collection_sharding_runtime.h"
 #include "mongo/db/s/collection_sharding_state.h"
 #include "mongo/db/s/migration_util.h"
@@ -42,6 +41,7 @@
 #include "mongo/db/s/sharding_state.h"
 #include "mongo/s/catalog/sharding_catalog_client_mock.h"
 #include "mongo/s/catalog/type_shard.h"
+#include "mongo/s/catalog_cache_loader_mock.h"
 #include "mongo/s/database_version_helpers.h"
 #include "mongo/util/future.h"
 
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 66590127863..8c215b8b664 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
@@ -29,11 +29,11 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/db/s/catalog_cache_loader_mock.h"
 #include "mongo/db/s/shard_server_catalog_cache_loader.h"
 #include "mongo/db/s/shard_server_test_fixture.h"
 #include "mongo/s/catalog/type_chunk.h"
 #include "mongo/s/catalog/type_collection.h"
+#include "mongo/s/catalog_cache_loader_mock.h"
 
 namespace mongo {
 namespace {