diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c053cbeb37b..2366befc48f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -233,10 +233,8 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot /buildscripts/resmokeconfig/suites/**/*txn* @10gen/server-transactions @svc-auto-approve-bot /buildscripts/resmokeconfig/suites/**/write_concern* @10gen/server-rw-concerns @svc-auto-approve-bot /buildscripts/resmokeconfig/suites/**/unified_write_executor* @10gen/query-execution-router @svc-auto-approve-bot -/buildscripts/resmokeconfig/suites/**/sharded_collections_jscore_passthrough_with_config_transitions_and_add_remove_shard.yml @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot -/buildscripts/resmokeconfig/suites/**/sharding_jscore_passthrough_with_config_transitions_and_add_remove_shard.yml @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot -/buildscripts/resmokeconfig/suites/**/jstestfuzz_sharded_with_config_transitions* @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot -/buildscripts/resmokeconfig/suites/**/concurrency_sharded_stepdown_terminate_kill_primary_with_balancer_and_config_transitions_and_add_remove_shard.yml @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot +/buildscripts/resmokeconfig/suites/**/*config_transitions_and_add_remove_shard.yml @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot +/buildscripts/resmokeconfig/suites/**/*config_transitions.yml @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot /buildscripts/resmokeconfig/suites/**/query_correctness_query_shape_hash_stability_generated_test.yml @10gen/query-execution-query-settings @svc-auto-approve-bot /buildscripts/resmokeconfig/suites/**/timeseries_crud_jscore_passthrough.yml @10gen/query-integration-timeseries @svc-auto-approve-bot /buildscripts/resmokeconfig/suites/**/sharding_auth.yml @10gen/server-security @svc-auto-approve-bot @@ -1807,7 +1805,7 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot /src/mongo/crypto/**/* @10gen/server-security @svc-auto-approve-bot # The following patterns are parsed from ./src/mongo/db/OWNERS.yml -/src/mongo/db/**/OWNERS.yml @10gen/server-networking-observability @10gen/server-programmability @svc-auto-approve-bot +/src/mongo/db/**/OWNERS.yml @10gen/server-networking-and-observability @10gen/server-programmability @svc-auto-approve-bot /src/mongo/db/**/api_parameters* @10gen/query-optimization @svc-auto-approve-bot /src/mongo/db/**/basic_types.* @10gen/server-programmability @svc-auto-approve-bot /src/mongo/db/**/baton.* @10gen/server-programmability @svc-auto-approve-bot @@ -1878,7 +1876,6 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot /src/mongo/db/**/read_write_concern* @10gen/server-rw-concerns @svc-auto-approve-bot /src/mongo/db/**/write_concern* @10gen/server-rw-concerns @svc-auto-approve-bot /src/mongo/db/**/feature_compatibility* @10gen/server-fcv @svc-auto-approve-bot -/src/mongo/db/**/catalog_shard_feature_flag.idl @10gen/server-cluster-scalability @svc-auto-approve-bot /src/mongo/db/**/traffic* @10gen/query-optimization @svc-auto-approve-bot /src/mongo/db/**/version_context* @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot /src/mongo/db/**/README_version_context.md @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot @@ -3091,8 +3088,6 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot /src/mongo/s/commands/**/document_shard_key* @10gen/server-cluster-scalability @svc-auto-approve-bot /src/mongo/s/commands/**/*fsync_unlock* @10gen/server-cluster-scalability @svc-auto-approve-bot /src/mongo/s/commands/**/*split*vector* @10gen/server-cluster-scalability @svc-auto-approve-bot -/src/mongo/s/commands/**/*transition_from_dedicated* @10gen/server-cluster-scalability @svc-auto-approve-bot -/src/mongo/s/commands/**/*transition_to_dedicated* @10gen/server-cluster-scalability @svc-auto-approve-bot /src/mongo/s/commands/**/cluster_move_chunk_cmd.cpp @10gen/server-cluster-scalability @svc-auto-approve-bot /src/mongo/s/commands/**/cluster_split_cmd.cpp @10gen/server-cluster-scalability @svc-auto-approve-bot /src/mongo/s/commands/**/cluster_query_without_shard_key_cmd.cpp @10gen/query-execution-router @svc-auto-approve-bot diff --git a/buildscripts/resmokeconfig/suites/OWNERS.yml b/buildscripts/resmokeconfig/suites/OWNERS.yml index dabb4433c70..ab7c76f5647 100644 --- a/buildscripts/resmokeconfig/suites/OWNERS.yml +++ b/buildscripts/resmokeconfig/suites/OWNERS.yml @@ -141,16 +141,10 @@ filters: - "unified_write_executor*": approvers: - 10gen/query-execution-router - - "sharded_collections_jscore_passthrough_with_config_transitions_and_add_remove_shard.yml": + - "*config_transitions_and_add_remove_shard.yml": approvers: - 10gen/server-catalog-and-routing-routing-and-topology - - "sharding_jscore_passthrough_with_config_transitions_and_add_remove_shard.yml": - approvers: - - 10gen/server-catalog-and-routing-routing-and-topology - - "jstestfuzz_sharded_with_config_transitions*": - approvers: - - 10gen/server-catalog-and-routing-routing-and-topology - - "concurrency_sharded_stepdown_terminate_kill_primary_with_balancer_and_config_transitions_and_add_remove_shard.yml": + - "*config_transitions.yml": approvers: - 10gen/server-catalog-and-routing-routing-and-topology - "query_correctness_query_shape_hash_stability_generated_test.yml": diff --git a/modules_poc/modules.yaml b/modules_poc/modules.yaml index ff624d9b5f3..42d911a38eb 100644 --- a/modules_poc/modules.yaml +++ b/modules_poc/modules.yaml @@ -337,12 +337,6 @@ catalog_and_routing.topology: - src/mongo/db/version_context* - src/mongo/s/commands/cluster_set_feature_compatibility_version_cmd.cpp - # config shard: - - src/mongo/db/catalog_shard_feature_flag.idl - - src/mongo/db/s/config/*transition*dedicated_config* - - src/mongo/s/commands/*transition*dedicated_config* - - src/mongo/s/request_types/transition* - # cluster-wide r/w concern: - src/mongo/db/commands/*rwc_defaults* - src/mongo/s/commands/cluster_rwc_defaults_commands.cpp diff --git a/src/mongo/db/BUILD.bazel b/src/mongo/db/BUILD.bazel index 29fa23a98a7..cdad2aabee1 100644 --- a/src/mongo/db/BUILD.bazel +++ b/src/mongo/db/BUILD.bazel @@ -106,11 +106,6 @@ idl_generator( src = "basic_types.idl", ) -idl_generator( - name = "catalog_shard_feature_flag_gen", - src = "catalog_shard_feature_flag.idl", -) - idl_generator( name = "feature_compatibility_version_document_gen", src = "feature_compatibility_version_document.idl", @@ -1298,7 +1293,6 @@ mongo_cc_library( "write_concern_idl.cpp", "write_concern_options.cpp", ":basic_types_gen", - ":catalog_shard_feature_flag_gen", ":feature_compatibility_version_document_gen", ":multitenancy_gen", ":read_write_concern_provenance_base_gen", diff --git a/src/mongo/db/OWNERS.yml b/src/mongo/db/OWNERS.yml index 495adad0673..51587842d63 100644 --- a/src/mongo/db/OWNERS.yml +++ b/src/mongo/db/OWNERS.yml @@ -3,7 +3,7 @@ filters: - "OWNERS.yml": approvers: - 10gen/server-programmability - - 10gen/server-networking-observability + - 10gen/server-networking-and-observability - "api_parameters*": approvers: - 10gen/query-optimization @@ -217,9 +217,6 @@ filters: - "feature_compatibility*": approvers: - 10gen/server-fcv - - "catalog_shard_feature_flag.idl": - approvers: - - 10gen/server-cluster-scalability - "traffic*": approvers: - 10gen/query-optimization diff --git a/src/mongo/db/catalog_shard_feature_flag.idl b/src/mongo/db/catalog_shard_feature_flag.idl deleted file mode 100644 index d5a2cef4904..00000000000 --- a/src/mongo/db/catalog_shard_feature_flag.idl +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2024-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 -# . -# -# 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. -# - -global: - mod_visibility: private - cpp_namespace: "mongo" - -feature_flags: - featureFlagTransitionToCatalogShard: - description: "Feature flag for transitioning a config server in and out of config shard mode" - cpp_varname: gFeatureFlagTransitionToCatalogShard - default: true - version: 8.0 - fcv_gated: true diff --git a/src/mongo/db/s/BUILD.bazel b/src/mongo/db/s/BUILD.bazel index 218662c5a60..ebffa9921de 100644 --- a/src/mongo/db/s/BUILD.bazel +++ b/src/mongo/db/s/BUILD.bazel @@ -642,8 +642,6 @@ mongo_cc_library( "//src/mongo/db/s/config:configsvr_move_range_command.cpp", "//src/mongo/db/s/config:configsvr_remove_tags_command.cpp", "//src/mongo/db/s/config:configsvr_reshard_collection_cmd.cpp", - "//src/mongo/db/s/config:configsvr_transition_from_dedicated_config_server_command.cpp", - "//src/mongo/db/s/config:configsvr_transition_to_dedicated_config_server_command.cpp", "//src/mongo/db/s/config:configsvr_update_zone_key_range_command.cpp", "//src/mongo/db/s/migration_blocking_operation:multi_update_coordinator.cpp", "//src/mongo/db/s/migration_blocking_operation:multi_update_coordinator_external_state.cpp", @@ -678,6 +676,8 @@ mongo_cc_library( "//src/mongo/db/topology:configsvr_shard_draining_status_command.cpp", "//src/mongo/db/topology:configsvr_start_shard_draining_command.cpp", "//src/mongo/db/topology:configsvr_stop_shard_draining_command.cpp", + "//src/mongo/db/topology:configsvr_transition_from_dedicated_config_server_command.cpp", + "//src/mongo/db/topology:configsvr_transition_to_dedicated_config_server_command.cpp", "//src/mongo/db/topology:remove_shard_command_helpers.cpp", "//src/mongo/db/topology:remove_shard_commit_coordinator.cpp", "//src/mongo/db/topology:remove_shard_commit_coordinator_document_gen", diff --git a/src/mongo/db/shard_role/shard_catalog/flush_database_cache_updates_command.cpp b/src/mongo/db/shard_role/shard_catalog/flush_database_cache_updates_command.cpp index fe3c49906c7..2dfc66d4b2d 100644 --- a/src/mongo/db/shard_role/shard_catalog/flush_database_cache_updates_command.cpp +++ b/src/mongo/db/shard_role/shard_catalog/flush_database_cache_updates_command.cpp @@ -35,7 +35,6 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/catalog_shard_feature_flag_gen.h" #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" diff --git a/src/mongo/db/shard_role/shard_catalog/flush_routing_table_cache_updates_command.cpp b/src/mongo/db/shard_role/shard_catalog/flush_routing_table_cache_updates_command.cpp index bce2917732f..15b5d14ea94 100644 --- a/src/mongo/db/shard_role/shard_catalog/flush_routing_table_cache_updates_command.cpp +++ b/src/mongo/db/shard_role/shard_catalog/flush_routing_table_cache_updates_command.cpp @@ -31,7 +31,6 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/catalog_shard_feature_flag_gen.h" #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/global_catalog/ddl/sharding_migration_critical_section.h" diff --git a/src/mongo/db/sharding_environment/sharding_feature_flags.idl b/src/mongo/db/sharding_environment/sharding_feature_flags.idl index afcb026363b..223420a7e68 100644 --- a/src/mongo/db/sharding_environment/sharding_feature_flags.idl +++ b/src/mongo/db/sharding_environment/sharding_feature_flags.idl @@ -252,3 +252,9 @@ feature_flags: default: true version: 8.3 fcv_gated: true + featureFlagTransitionToCatalogShard: + description: "Feature flag for transitioning a config server in and out of config shard mode" + cpp_varname: gFeatureFlagTransitionToCatalogShard + default: true + version: 8.0 + fcv_gated: true diff --git a/src/mongo/db/sharding_environment/sharding_initialization_mongod.cpp b/src/mongo/db/sharding_environment/sharding_initialization_mongod.cpp index 63aa804cff9..3ab8b68c110 100644 --- a/src/mongo/db/sharding_environment/sharding_initialization_mongod.cpp +++ b/src/mongo/db/sharding_environment/sharding_initialization_mongod.cpp @@ -45,7 +45,6 @@ #include "mongo/db/audit.h" #include "mongo/db/auth/authorization_manager_factory.h" #include "mongo/db/auth/user_cache_invalidator_job.h" -#include "mongo/db/catalog_shard_feature_flag_gen.h" #include "mongo/db/client.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/dbhelpers.h" diff --git a/src/mongo/db/topology/BUILD.bazel b/src/mongo/db/topology/BUILD.bazel index 41faa74a4b2..32983aa3af0 100644 --- a/src/mongo/db/topology/BUILD.bazel +++ b/src/mongo/db/topology/BUILD.bazel @@ -76,3 +76,22 @@ mongo_cc_library( "//src/mongo/db:server_base", ], ) + +idl_generator( + name = "transition_from_dedicated_config_server_gen", + src = "transition_from_dedicated_config_server.idl", + deps = [ + "//src/mongo/db:basic_types_gen", + "//src/mongo/idl:generic_argument_gen", + ], +) + +idl_generator( + name = "transition_to_dedicated_config_server_gen", + src = "transition_to_dedicated_config_server.idl", + deps = [ + "//src/mongo/db:basic_types_gen", + "//src/mongo/db/topology:remove_shard_gen", + "//src/mongo/idl:generic_argument_gen", + ], +) diff --git a/src/mongo/db/topology/cluster_commit_transition_to_dedicated_config_server_cmd.cpp b/src/mongo/db/topology/cluster_commit_transition_to_dedicated_config_server_cmd.cpp index 79ac6ebc229..25a84d93a2e 100644 --- a/src/mongo/db/topology/cluster_commit_transition_to_dedicated_config_server_cmd.cpp +++ b/src/mongo/db/topology/cluster_commit_transition_to_dedicated_config_server_cmd.cpp @@ -41,7 +41,7 @@ #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/remove_shard_gen.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/s/request_types/transition_to_dedicated_config_server_gen.h" +#include "mongo/db/topology/transition_to_dedicated_config_server_gen.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/topology/cluster_get_transition_to_dedicated_config_server_status_cmd.cpp b/src/mongo/db/topology/cluster_get_transition_to_dedicated_config_server_status_cmd.cpp index 45f4dd4482b..27c7b030db4 100644 --- a/src/mongo/db/topology/cluster_get_transition_to_dedicated_config_server_status_cmd.cpp +++ b/src/mongo/db/topology/cluster_get_transition_to_dedicated_config_server_status_cmd.cpp @@ -41,7 +41,7 @@ #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/remove_shard_gen.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/s/request_types/transition_to_dedicated_config_server_gen.h" +#include "mongo/db/topology/transition_to_dedicated_config_server_gen.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/topology/cluster_start_transition_to_dedicated_config_server_cmd.cpp b/src/mongo/db/topology/cluster_start_transition_to_dedicated_config_server_cmd.cpp index 48670d1be46..ca0a4baf785 100644 --- a/src/mongo/db/topology/cluster_start_transition_to_dedicated_config_server_cmd.cpp +++ b/src/mongo/db/topology/cluster_start_transition_to_dedicated_config_server_cmd.cpp @@ -41,8 +41,8 @@ #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/remove_shard_gen.h" #include "mongo/db/topology/shard_registry.h" +#include "mongo/db/topology/transition_to_dedicated_config_server_gen.h" #include "mongo/logv2/log.h" -#include "mongo/s/request_types/transition_to_dedicated_config_server_gen.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/topology/cluster_stop_transition_to_dedicated_config_server_cmd.cpp b/src/mongo/db/topology/cluster_stop_transition_to_dedicated_config_server_cmd.cpp index d507c3d5188..794e12b6222 100644 --- a/src/mongo/db/topology/cluster_stop_transition_to_dedicated_config_server_cmd.cpp +++ b/src/mongo/db/topology/cluster_stop_transition_to_dedicated_config_server_cmd.cpp @@ -40,7 +40,7 @@ #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/remove_shard_gen.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/s/request_types/transition_to_dedicated_config_server_gen.h" +#include "mongo/db/topology/transition_to_dedicated_config_server_gen.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/s/commands/cluster_transition_from_dedicated_config_server_cmd.cpp b/src/mongo/db/topology/cluster_transition_from_dedicated_config_server_cmd.cpp similarity index 97% rename from src/mongo/s/commands/cluster_transition_from_dedicated_config_server_cmd.cpp rename to src/mongo/db/topology/cluster_transition_from_dedicated_config_server_cmd.cpp index afeda607298..cf25e57004a 100644 --- a/src/mongo/s/commands/cluster_transition_from_dedicated_config_server_cmd.cpp +++ b/src/mongo/db/topology/cluster_transition_from_dedicated_config_server_cmd.cpp @@ -32,7 +32,6 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/catalog_shard_feature_flag_gen.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/feature_flag.h" @@ -43,9 +42,10 @@ #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" +#include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/topology/shard_registry.h" +#include "mongo/db/topology/transition_from_dedicated_config_server_gen.h" #include "mongo/rpc/op_msg.h" -#include "mongo/s/request_types/transition_from_dedicated_config_server_gen.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/s/commands/cluster_transition_to_dedicated_config_server_cmd.cpp b/src/mongo/db/topology/cluster_transition_to_dedicated_config_server_cmd.cpp similarity index 97% rename from src/mongo/s/commands/cluster_transition_to_dedicated_config_server_cmd.cpp rename to src/mongo/db/topology/cluster_transition_to_dedicated_config_server_cmd.cpp index 7b5e2df936e..49fbcd2b47e 100644 --- a/src/mongo/s/commands/cluster_transition_to_dedicated_config_server_cmd.cpp +++ b/src/mongo/db/topology/cluster_transition_to_dedicated_config_server_cmd.cpp @@ -37,7 +37,6 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/catalog_shard_feature_flag_gen.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/feature_flag.h" @@ -47,9 +46,10 @@ #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" +#include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/topology/shard_registry.h" +#include "mongo/db/topology/transition_to_dedicated_config_server_gen.h" #include "mongo/idl/idl_parser.h" -#include "mongo/s/request_types/transition_to_dedicated_config_server_gen.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/s/config/configsvr_transition_from_dedicated_config_server_command.cpp b/src/mongo/db/topology/configsvr_transition_from_dedicated_config_server_command.cpp similarity index 98% rename from src/mongo/db/s/config/configsvr_transition_from_dedicated_config_server_command.cpp rename to src/mongo/db/topology/configsvr_transition_from_dedicated_config_server_command.cpp index 65a78528264..8e10c741cca 100644 --- a/src/mongo/db/s/config/configsvr_transition_from_dedicated_config_server_command.cpp +++ b/src/mongo/db/topology/configsvr_transition_from_dedicated_config_server_command.cpp @@ -31,7 +31,6 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/catalog_shard_feature_flag_gen.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/feature_flag.h" @@ -50,8 +49,8 @@ #include "mongo/db/topology/add_shard_coordinator.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/sharding_state.h" +#include "mongo/db/topology/transition_from_dedicated_config_server_gen.h" #include "mongo/rpc/op_msg.h" -#include "mongo/s/request_types/transition_from_dedicated_config_server_gen.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/s/config/configsvr_transition_to_dedicated_config_server_command.cpp b/src/mongo/db/topology/configsvr_transition_to_dedicated_config_server_command.cpp similarity index 98% rename from src/mongo/db/s/config/configsvr_transition_to_dedicated_config_server_command.cpp rename to src/mongo/db/topology/configsvr_transition_to_dedicated_config_server_command.cpp index 0f94e3c3e9f..64960070357 100644 --- a/src/mongo/db/s/config/configsvr_transition_to_dedicated_config_server_command.cpp +++ b/src/mongo/db/topology/configsvr_transition_to_dedicated_config_server_command.cpp @@ -35,7 +35,6 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/catalog_shard_feature_flag_gen.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/feature_flag.h" @@ -48,13 +47,14 @@ #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" +#include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/sharding_environment/sharding_statistics.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/remove_shard_command_helpers.h" #include "mongo/db/topology/sharding_state.h" +#include "mongo/db/topology/transition_to_dedicated_config_server_gen.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" -#include "mongo/s/request_types/transition_to_dedicated_config_server_gen.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/s/request_types/transition_from_dedicated_config_server.idl b/src/mongo/db/topology/transition_from_dedicated_config_server.idl similarity index 100% rename from src/mongo/s/request_types/transition_from_dedicated_config_server.idl rename to src/mongo/db/topology/transition_from_dedicated_config_server.idl diff --git a/src/mongo/s/request_types/transition_to_dedicated_config_server.idl b/src/mongo/db/topology/transition_to_dedicated_config_server.idl similarity index 100% rename from src/mongo/s/request_types/transition_to_dedicated_config_server.idl rename to src/mongo/db/topology/transition_to_dedicated_config_server.idl diff --git a/src/mongo/s/BUILD.bazel b/src/mongo/s/BUILD.bazel index 6ea76a1d89e..9c77fe58654 100644 --- a/src/mongo/s/BUILD.bazel +++ b/src/mongo/s/BUILD.bazel @@ -302,6 +302,8 @@ mongo_cc_library( "//src/mongo/db/sharding_environment:sharding_feature_flags.cpp", "//src/mongo/db/sharding_environment:sharding_feature_flags_gen", "//src/mongo/db/topology:remove_shard_gen", + "//src/mongo/db/topology:transition_from_dedicated_config_server_gen", + "//src/mongo/db/topology:transition_to_dedicated_config_server_gen", "//src/mongo/db/topology/cluster_parameters:sharding_cluster_parameters_gen", "//src/mongo/db/versioning_protocol:get_database_version_gen", "//src/mongo/db/versioning_protocol:shard_version_factory.cpp", @@ -322,8 +324,6 @@ mongo_cc_library( "//src/mongo/s/request_types:move_range_request_gen", "//src/mongo/s/request_types:reshard_collection_gen", "//src/mongo/s/request_types:resharding_operation_time_gen", - "//src/mongo/s/request_types:transition_from_dedicated_config_server_gen", - "//src/mongo/s/request_types:transition_to_dedicated_config_server_gen", "//src/mongo/s/request_types:update_zone_key_range_gen", "//src/mongo/s/request_types:update_zone_key_range_serialization.cpp", "//src/mongo/s/request_types:wait_for_fail_point_gen", diff --git a/src/mongo/s/commands/BUILD.bazel b/src/mongo/s/commands/BUILD.bazel index b47d2f07167..cc82640324f 100644 --- a/src/mongo/s/commands/BUILD.bazel +++ b/src/mongo/s/commands/BUILD.bazel @@ -103,8 +103,6 @@ mongo_cc_library( "cluster_rwc_defaults_commands.cpp", "cluster_set_feature_compatibility_version_cmd.cpp", "cluster_shutdown_cmd.cpp", - "cluster_transition_from_dedicated_config_server_cmd.cpp", - "cluster_transition_to_dedicated_config_server_cmd.cpp", "cluster_validate_cmd.cpp", "cluster_whats_my_uri_cmd.cpp", "cluster_write_without_shard_key_cmd.cpp", @@ -291,6 +289,8 @@ mongo_cc_library( "//src/mongo/db/topology:cluster_start_transition_to_dedicated_config_server_cmd.cpp", "//src/mongo/db/topology:cluster_stop_shard_draining_cmd.cpp", "//src/mongo/db/topology:cluster_stop_transition_to_dedicated_config_server_cmd.cpp", + "//src/mongo/db/topology:cluster_transition_from_dedicated_config_server_cmd.cpp", + "//src/mongo/db/topology:cluster_transition_to_dedicated_config_server_cmd.cpp", ], deps = [ ":cluster_commands", diff --git a/src/mongo/s/commands/OWNERS.yml b/src/mongo/s/commands/OWNERS.yml index d4be887c6ea..afacaf40f99 100644 --- a/src/mongo/s/commands/OWNERS.yml +++ b/src/mongo/s/commands/OWNERS.yml @@ -36,12 +36,6 @@ filters: - "*split*vector*": approvers: - 10gen/server-cluster-scalability - - "*transition_from_dedicated*": - approvers: - - 10gen/server-cluster-scalability - - "*transition_to_dedicated*": - approvers: - - 10gen/server-cluster-scalability - "cluster_move_chunk_cmd.cpp": approvers: - 10gen/server-cluster-scalability diff --git a/src/mongo/s/request_types/BUILD.bazel b/src/mongo/s/request_types/BUILD.bazel index 06293426260..ca778176d1e 100644 --- a/src/mongo/s/request_types/BUILD.bazel +++ b/src/mongo/s/request_types/BUILD.bazel @@ -140,25 +140,6 @@ idl_generator( ], ) -idl_generator( - name = "transition_from_dedicated_config_server_gen", - src = "transition_from_dedicated_config_server.idl", - deps = [ - "//src/mongo/db:basic_types_gen", - "//src/mongo/idl:generic_argument_gen", - ], -) - -idl_generator( - name = "transition_to_dedicated_config_server_gen", - src = "transition_to_dedicated_config_server.idl", - deps = [ - "//src/mongo/db:basic_types_gen", - "//src/mongo/db/topology:remove_shard_gen", - "//src/mongo/idl:generic_argument_gen", - ], -) - idl_generator( name = "wait_for_fail_point_gen", src = "wait_for_fail_point.idl",