diff options
author | Luis Osta <luis.osta@mongodb.com> | 2020-08-04 17:03:47 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-08-04 18:07:13 +0000 |
commit | 0e3bd22e59a51dcdfc7fdac6d96dcda22e2e6647 (patch) | |
tree | 9fe03e0ad3a5f88e68919122ac34a310d3b56143 /src/mongo/db/commands | |
parent | b4db8c01a13fd70997a05857be17548b0adec020 (diff) | |
download | mongo-0e3bd22e59a51dcdfc7fdac6d96dcda22e2e6647.tar.gz |
SERVER-49789 Make tenant migration donor use a StreamableReplicaSetMonitor to monitor and send commands to the recipient
Diffstat (limited to 'src/mongo/db/commands')
-rw-r--r-- | src/mongo/db/commands/SConscript | 18 | ||||
-rw-r--r-- | src/mongo/db/commands/tenant_migration_donor_cmds.cpp (renamed from src/mongo/db/commands/tenant_migration_cmds.cpp) | 4 | ||||
-rw-r--r-- | src/mongo/db/commands/tenant_migration_donor_cmds.idl (renamed from src/mongo/db/commands/tenant_migration_cmds.idl) | 0 | ||||
-rw-r--r-- | src/mongo/db/commands/tenant_migration_recipient_cmds.cpp | 73 | ||||
-rw-r--r-- | src/mongo/db/commands/tenant_migration_recipient_cmds.idl | 64 |
5 files changed, 155 insertions, 4 deletions
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript index a4a1ebdc4ca..70f9707fb8f 100644 --- a/src/mongo/db/commands/SConscript +++ b/src/mongo/db/commands/SConscript @@ -409,16 +409,17 @@ env.Library( "sharded_index_consistency_server_status.cpp", "shutdown_d.cpp", "snapshot_management.cpp", + "tenant_migration_donor_cmds.cpp", + "tenant_migration_recipient_cmds.cpp", "top_command.cpp", - "tenant_migration_cmds.cpp", "txn_cmds.cpp", "user_management_commands.cpp", "vote_commit_index_build_command.cpp", env.Idlc('internal_rename_if_options_and_indexes_match.idl')[0], - env.Idlc('tenant_migration_cmds.idl')[0], env.Idlc('vote_commit_index_build.idl')[0], ], LIBDEPS=[ + 'tenant_migration_cmds_request', 'txn_cmd_request', ], LIBDEPS_PRIVATE=[ @@ -445,6 +446,7 @@ env.Library( '$BUILD_DIR/mongo/db/repl/dbcheck', '$BUILD_DIR/mongo/db/repl/oplog', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', + '$BUILD_DIR/mongo/db/repl/tenant_migration_donor', '$BUILD_DIR/mongo/db/rw_concern_d', '$BUILD_DIR/mongo/db/s/sharding_runtime_d', '$BUILD_DIR/mongo/db/server_options_core', @@ -527,6 +529,18 @@ env.Library( ) env.Library( + target='tenant_migration_cmds_request', + source=[ + env.Idlc('tenant_migration_donor_cmds.idl')[0], + env.Idlc('tenant_migration_recipient_cmds.idl')[0], + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/idl/idl_parser', + '$BUILD_DIR/mongo/client/read_preference', + ] +) +env.Library( target='txn_cmd_request', source=[ env.Idlc("txn_cmds.idl")[0], diff --git a/src/mongo/db/commands/tenant_migration_cmds.cpp b/src/mongo/db/commands/tenant_migration_donor_cmds.cpp index 9b12ae0ad99..16e773b2e0f 100644 --- a/src/mongo/db/commands/tenant_migration_cmds.cpp +++ b/src/mongo/db/commands/tenant_migration_donor_cmds.cpp @@ -28,7 +28,7 @@ */ #include "mongo/db/commands.h" -#include "mongo/db/commands/tenant_migration_cmds_gen.h" +#include "mongo/db/commands/tenant_migration_donor_cmds_gen.h" #include "mongo/db/repl/tenant_migration_donor_util.h" namespace mongo { @@ -51,7 +51,7 @@ public: requestBody.getDatabasePrefix().toString(), TenantMigrationDonorStateEnum::kDataSync); - tenant_migration::startMigration(opCtx, donorStateDoc); + tenant_migration_donor::startMigration(opCtx, donorStateDoc); } diff --git a/src/mongo/db/commands/tenant_migration_cmds.idl b/src/mongo/db/commands/tenant_migration_donor_cmds.idl index 96fff6640db..96fff6640db 100644 --- a/src/mongo/db/commands/tenant_migration_cmds.idl +++ b/src/mongo/db/commands/tenant_migration_donor_cmds.idl diff --git a/src/mongo/db/commands/tenant_migration_recipient_cmds.cpp b/src/mongo/db/commands/tenant_migration_recipient_cmds.cpp new file mode 100644 index 00000000000..1ea9c6e8994 --- /dev/null +++ b/src/mongo/db/commands/tenant_migration_recipient_cmds.cpp @@ -0,0 +1,73 @@ +/** + * Copyright (C) 2020-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/db/commands.h" +#include "mongo/db/commands/tenant_migration_recipient_cmds_gen.h" + +namespace mongo { +namespace { + +class RecipientSyncDataCmd : public TypedCommand<RecipientSyncDataCmd> { +public: + using Request = RecipientSyncData; + + class Invocation : public InvocationBase { + + public: + using InvocationBase::InvocationBase; + void typedRun(OperationContext* opCtx) {} + + + void doCheckAuthorization(OperationContext* opCtx) const {} + + private: + bool supportsWriteConcern() const override { + return false; + } + NamespaceString ns() const { + return NamespaceString(request().getDbName(), ""); + } + }; + + std::string help() const { + return ""; + } + bool adminOnly() const override { + return true; + } + + BasicCommand::AllowedOnSecondary secondaryAllowed(ServiceContext*) const override { + return BasicCommand::AllowedOnSecondary::kNever; + } + +} recipientSyncDataCmd; + + +} // namespace +} // namespace mongo diff --git a/src/mongo/db/commands/tenant_migration_recipient_cmds.idl b/src/mongo/db/commands/tenant_migration_recipient_cmds.idl new file mode 100644 index 00000000000..4d267f500e2 --- /dev/null +++ b/src/mongo/db/commands/tenant_migration_recipient_cmds.idl @@ -0,0 +1,64 @@ +# Copyright (C) 2020-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. +# + +global: + cpp_namespace: "mongo" + cpp_includes: + - "mongo/client/read_preference.h" + - "mongo/db/repl/tenant_migration_util.h" + +imports: + - "mongo/client/read_preference_setting.idl" + - "mongo/idl/basic_types.idl" + - "mongo/s/sharding_types.idl" + - "mongo/db/repl/replication_types.idl" + +commands: + recipientSyncData: + description: "Parser for the 'recipientSyncData' command." + strict: true + namespace: ignored + fields: + migrationId: + description: "Unique identifier for the tenant migration." + type: uuid + donorConnectionString: + description: "The URI string that the donor will utilize to create a connection with the recipient." + type: string + databasePrefix: + description: "The prefix from which the migrating database will be matched. The prefixes 'admin', 'local', 'config', the empty string, are not allowed." + type: string + validator: + callback: "validateDbPrefix" + readPreference: + description: "The read preference settings that the donor will pass on to the recipient." + type: readPreference + returnAfterReachingOpTime: + description: "If provided, the recipient should return after syncing up to this OpTime. Otherwise, the recipient will return once its copy of the data is consistent." + type: timestamp + optional: true |