thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 15:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add argument for force recovery

Browse Source
This commit is contained in:
Antonio Andelic 2022-04-08 07:18:18 +00:00
parent bb4bc17af1
commit 0e1ba927bd
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
programs/keeper/Keeper.cpp
View File

@ -239,6 +239,18 @@ std::string Keeper::getDefaultConfigFileName() const
return "keeper_config.xml"; return "keeper_config.xml";
} }
void Keeper::handleCustomArguments(const std::string & arg, const std::string & value)
{
if (arg == "force-recovery")
{
assert(value.empty());
config().setBool("keeper_server.recover", true);
return;
}
throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid argument {} provided", arg);
}
void Keeper::defineOptions(Poco::Util::OptionSet & options) void Keeper::defineOptions(Poco::Util::OptionSet & options)
{ {
options.addOption( options.addOption(
@ -251,6 +263,12 @@ void Keeper::defineOptions(Poco::Util::OptionSet & options)
.required(false) .required(false)
.repeatable(false) .repeatable(false)
.binding("version")); .binding("version"));
options.addOption(
Poco::Util::Option("force-recovery", "force-recovery", "Force recovery mode allowing Keeper to overwrite cluster configuration")
.required(false)
.repeatable(false)
.noArgument()
.callback(Poco::Util::OptionCallback<Keeper>(this, &Keeper::handleCustomArguments)));
BaseDaemon::defineOptions(options); BaseDaemon::defineOptions(options);
} }

2
programs/keeper/Keeper.h
View File

@ -43,6 +43,8 @@ public:
protected: protected:
void logRevision() const override; void logRevision() const override;
void handleCustomArguments(const std::string & arg, const std::string & value);
int run() override; int run() override;
void initialize(Application & self) override; void initialize(Application & self) override;

13
src/Coordination/KeeperServer.cpp
View File

@ -102,7 +102,7 @@ KeeperServer::KeeperServer(
checkAndGetSuperdigest(configuration_and_settings_->super_digest))) checkAndGetSuperdigest(configuration_and_settings_->super_digest)))
, state_manager(nuraft::cs_new<KeeperStateManager>(server_id, "keeper_server", configuration_and_settings_->log_storage_path, config, coordination_settings)) , state_manager(nuraft::cs_new<KeeperStateManager>(server_id, "keeper_server", configuration_and_settings_->log_storage_path, config, coordination_settings))
, log(&Poco::Logger::get("KeeperServer")) , log(&Poco::Logger::get("KeeperServer"))
, recover(config.getBool("recover")) , recover(config.has("keeper_server.recover") && config.getBool("keeper_server.recover"))
{ {
if (coordination_settings->quorum_reads) if (coordination_settings->quorum_reads)
LOG_WARNING(log, "Quorum reads enabled, Keeper will work slower."); LOG_WARNING(log, "Quorum reads enabled, Keeper will work slower.");
@ -127,7 +127,6 @@ void KeeperServer::loadLatestConfig()
state_manager->save_config(*latest_log_store_config); state_manager->save_config(*latest_log_store_config);
state_machine->commit_config(latest_log_store_config->get_log_idx(), latest_log_store_config);
return; return;
} }
@ -182,6 +181,13 @@ void KeeperServer::startup(bool enable_ipv6)
params.return_method_ = nuraft::raft_params::async_handler; params.return_method_ = nuraft::raft_params::async_handler;
if (recover)
{
LOG_INFO(log, "Custom quorum size");
params.with_custom_commit_quorum_size(1);
params.with_custom_election_quorum_size(1);
}
nuraft::asio_service::options asio_opts{}; nuraft::asio_service::options asio_opts{};
if (state_manager->isSecure()) if (state_manager->isSecure())
{ {
@ -226,13 +232,12 @@ void KeeperServer::launchRaftServer(
nuraft::ptr<nuraft::state_mgr> casted_state_manager = state_manager; nuraft::ptr<nuraft::state_mgr> casted_state_manager = state_manager;
nuraft::ptr<nuraft::state_machine> casted_state_machine = state_machine; nuraft::ptr<nuraft::state_machine> casted_state_machine = state_machine;
loadLatestConfig();
/// raft_server creates unique_ptr from it /// raft_server creates unique_ptr from it
nuraft::context * ctx = new nuraft::context( nuraft::context * ctx = new nuraft::context(
casted_state_manager, casted_state_machine, casted_state_manager, casted_state_machine,
asio_listener, logger, rpc_cli_factory, scheduler, params); asio_listener, logger, rpc_cli_factory, scheduler, params);
loadLatestConfig();
raft_instance = nuraft::cs_new<nuraft::raft_server>(ctx, init_options); raft_instance = nuraft::cs_new<nuraft::raft_server>(ctx, init_options);
raft_instance->start_server(init_options.skip_initial_election_timeout_); raft_instance->start_server(init_options.skip_initial_election_timeout_);