thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16630 from sundy-li/patch-6

Browse Source 
better change the config
This commit is contained in:
alexey-milovidov 2020-11-04 11:36:07 +03:00 committed by GitHub
commit 654d127ce6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Interpreters/Context.cpp
View File

@ -365,6 +365,7 @@ struct ContextShared
/// Initialized on demand (on distributed storages initialization) since Settings should be initialized
std::unique_ptr<Clusters> clusters;
ConfigurationPtr clusters_config; /// Stores updated configs
ConfigurationPtr zookeeper_config; /// Stores zookeeper configs
mutable std::mutex clusters_mutex; /// Guards clusters and clusters_config
#if USE_EMBEDDED_COMPILER
@ -1489,8 +1490,9 @@ zkutil::ZooKeeperPtr Context::getZooKeeper() const
{
std::lock_guard lock(shared->zookeeper_mutex);
const auto & config = shared->zookeeper_config ? *shared->zookeeper_config : getConfigRef();
if (!shared->zookeeper)
shared->zookeeper = std::make_shared<zkutil::ZooKeeper>(getConfigRef(), "zookeeper");
shared->zookeeper = std::make_shared<zkutil::ZooKeeper>(config, "zookeeper");
else if (shared->zookeeper->expired())
shared->zookeeper = shared->zookeeper->startNewSession();
@ -1524,6 +1526,8 @@ void Context::resetZooKeeper() const
void Context::reloadZooKeeperIfChanged(const ConfigurationPtr & config) const
{
std::lock_guard lock(shared->zookeeper_mutex);
shared->zookeeper_config = config;
if (!shared->zookeeper || shared->zookeeper->configChanged(*config, "zookeeper"))
{
shared->zookeeper = std::make_shared<zkutil::ZooKeeper>(*config, "zookeeper");

41
tests/integration/test_reload_zookeeper/test.py
View File

@ -10,9 +10,6 @@ from helpers.test_tools import assert_eq_with_retry
cluster = ClickHouseCluster(__file__, zookeeper_config_path='configs/zookeeper.xml')
node = cluster.add_instance('node', with_zookeeper=True)
SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
ZK_CONFIG_PATH = os.path.join(SCRIPT_DIR, 'configs/zookeeper.xml')
@pytest.fixture(scope="module")
def start_cluster():
@ -28,29 +25,6 @@ def start_cluster():
yield cluster
finally:
## write back the configs
config = open(ZK_CONFIG_PATH, 'w')
config.write(
"""
<yandex>
<zookeeper>
<node index="1">
<host>zoo1</host>
<port>2181</port>
</node>
<node index="2">
<host>zoo2</host>
<port>2181</port>
</node>
<node index="3">
<host>zoo3</host>
<port>2181</port>
</node>
<session_timeout_ms>2000</session_timeout_ms>
</zookeeper>
</yandex>
""")
config.close()
cluster.shutdown()
def test_reload_zookeeper(start_cluster):
@ -71,9 +45,7 @@ def test_reload_zookeeper(start_cluster):
node.query("INSERT INTO test_table(date, id) select today(), number FROM numbers(1000)")
## remove zoo2, zoo3 from configs
config = open(ZK_CONFIG_PATH, 'w')
config.write(
"""
new_config = """
<yandex>
<zookeeper>
<node index="1">
@ -84,8 +56,7 @@ def test_reload_zookeeper(start_cluster):
</zookeeper>
</yandex >
"""
)
config.close()
node.replace_config("/etc/clickhouse-server/conf.d/zookeeper.xml", new_config)
## config reloads, but can still work
assert_eq_with_retry(node, "SELECT COUNT() FROM test_table", '1000', retry_count=120, sleep_time=0.5)
@ -101,9 +72,7 @@ def test_reload_zookeeper(start_cluster):
node.query("SELECT COUNT() FROM test_table")
## set config to zoo2, server will be normal
config = open(ZK_CONFIG_PATH, 'w')
config.write(
"""
new_config = """
<yandex>
<zookeeper>
<node index="1">
@ -114,7 +83,7 @@ def test_reload_zookeeper(start_cluster):
</zookeeper>
</yandex>
"""
)
config.close()
node.replace_config("/etc/clickhouse-server/conf.d/zookeeper.xml", new_config)
assert_eq_with_retry(node, "SELECT COUNT() FROM test_table", '1000', retry_count=120, sleep_time=0.5)