thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-10 01:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47687 from ClickHouse/fix-mntr-data-size-test

Browse Source 
Try making `test_keeper_mntr_data_size` less flaky
This commit is contained in:
Antonio Andelic 2023-03-18 10:09:25 +01:00 committed by GitHub
commit 593ac89cb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/integration/test_keeper_mntr_data_size/test.py
View File

@ -5,8 +5,6 @@ from helpers.cluster import ClickHouseCluster
import helpers.keeper_utils as keeper_utils
import random
import string
import os
import time
from kazoo.client import KazooClient, KazooState
@ -17,7 +15,6 @@ node = cluster.add_instance(
"node",
main_configs=["configs/enable_keeper.xml"],
stay_alive=True,
with_zookeeper=True,
)
@ -60,10 +57,14 @@ def test_mntr_data_size_after_restart(started_cluster):
"/test_mntr_data_size/node" + str(i), random_string(123).encode()
)
def get_line_with_size():
node_zk.stop()
node_zk.close()
node_zk = None
def get_line_from_mntr(key):
return next(
filter(
lambda line: "zk_approximate_data_size" in line,
lambda line: key in line,
keeper_utils.send_4lw_cmd(started_cluster, node, "mntr").split(
"\n"
),
@ -71,19 +72,21 @@ def test_mntr_data_size_after_restart(started_cluster):
None,
)
line_size_before = get_line_with_size()
line_size_before = get_line_from_mntr("zk_approximate_data_size")
node_count_before = get_line_from_mntr("zk_znode_count")
assert get_line_from_mntr("zk_ephemerals_count") == "zk_ephemerals_count\t0"
assert line_size_before != None
node_zk.stop()
node_zk.close()
node_zk = None
restart_clickhouse()
assert get_line_with_size() == line_size_before
def assert_mntr_stats():
assert get_line_from_mntr("zk_ephemerals_count") == "zk_ephemerals_count\t0"
assert get_line_from_mntr("zk_znode_count") == node_count_before
assert get_line_from_mntr("zk_approximate_data_size") == line_size_before
assert_mntr_stats()
keeper_utils.send_4lw_cmd(started_cluster, node, "rclc")
assert get_line_with_size() == line_size_before
assert_mntr_stats()
finally:
try:
if node_zk is not None: