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

Merge pull request #41444 from ClickHouse/one_wrong_config_assert

Browse Source 
One more validation for broken config in keeper
This commit is contained in:
alesapin 2022-09-18 15:56:48 +02:00 committed by GitHub
commit 1d0dbfb112
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Coordination/KeeperStateManager.cpp
View File

@ -6,6 +6,7 @@
#include <Common/Exception.h> #include <Common/Exception.h>
#include <Common/isLocalAddress.h> #include <Common/isLocalAddress.h>
#include <IO/ReadHelpers.h> #include <IO/ReadHelpers.h>
#include <Common/getMultipleKeysFromConfig.h>
namespace DB namespace DB
{ {
@ -94,6 +95,14 @@ KeeperStateManager::parseServersConfiguration(const Poco::Util::AbstractConfigur
continue; continue;
std::string full_prefix = config_prefix + ".raft_configuration." + server_key; std::string full_prefix = config_prefix + ".raft_configuration." + server_key;
if (getMultipleValuesFromConfig(config, full_prefix, "id").size() > 1
|| getMultipleValuesFromConfig(config, full_prefix, "hostname").size() > 1
|| getMultipleValuesFromConfig(config, full_prefix, "port").size() > 1)
{
throw Exception(ErrorCodes::RAFT_ERROR, "Multiple <id> or <hostname> or <port> specified for a single <server>");
}
int new_server_id = config.getInt(full_prefix + ".id"); int new_server_id = config.getInt(full_prefix + ".id");
std::string hostname = config.getString(full_prefix + ".hostname"); std::string hostname = config.getString(full_prefix + ".hostname");
int port = config.getInt(full_prefix + ".port"); int port = config.getInt(full_prefix + ".port");

32
tests/integration/test_keeper_incorrect_config/test.py
View File

@ -172,6 +172,37 @@ NORMAL_CONFIG = """
</clickhouse> </clickhouse>
""" """
JUST_WRONG_CONFIG = """
<clickhouse>
<keeper_server>
<tcp_port>9181</tcp_port>
<server_id>1</server_id>
<log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
<snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
<coordination_settings>
<operation_timeout_ms>5000</operation_timeout_ms>
<session_timeout_ms>10000</session_timeout_ms>
<raft_logs_level>trace</raft_logs_level>
</coordination_settings>
<raft_configuration>
<server>
<id>1</id>
<hostname>node1</hostname>
<port>9234</port>
<id>2</id>
<hostname>node2</hostname>
<port>9234</port>
<id>3</id>
<hostname>node3</hostname>
<port>9234</port>
</server>
</raft_configuration>
</keeper_server>
</clickhouse>
"""
def test_duplicate_endpoint(started_cluster): def test_duplicate_endpoint(started_cluster):
node1.stop_clickhouse() node1.stop_clickhouse()
@ -187,6 +218,7 @@ def test_duplicate_endpoint(started_cluster):
assert_config_fails(DUPLICATE_ID_CONFIG) assert_config_fails(DUPLICATE_ID_CONFIG)
assert_config_fails(LOCALHOST_WITH_REMOTE) assert_config_fails(LOCALHOST_WITH_REMOTE)
assert_config_fails(MULTIPLE_LOCAL_WITH_REMOTE) assert_config_fails(MULTIPLE_LOCAL_WITH_REMOTE)
assert_config_fails(JUST_WRONG_CONFIG)
node1.replace_config( node1.replace_config(
"/etc/clickhouse-server/config.d/enable_keeper1.xml", NORMAL_CONFIG "/etc/clickhouse-server/config.d/enable_keeper1.xml", NORMAL_CONFIG