Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix flaky test_keeper_mntr_data_size #48384

Merged
merged 1 commit into from
Apr 5, 2023
Merged

Fix flaky test_keeper_mntr_data_size #48384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/integration/test_keeper_mntr_data_size/configs/enable_keeper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<clickhouse>
<keeper_server>
<use_cluster>false</use_cluster>
<tcp_port>9181</tcp_port>
<server_id>1</server_id>
<log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
Expand Down
31 changes: 21 additions & 10 deletions tests/integration/test_keeper_mntr_data_size/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,28 +61,39 @@ def test_mntr_data_size_after_restart(started_cluster):
node_zk.close()
node_zk = None

def get_line_from_mntr(key):
def get_line_from_mntr(mntr_str, key):
return next(
filter(
lambda line: key in line,
keeper_utils.send_4lw_cmd(started_cluster, node, "mntr").split(
"\n"
),
mntr_str.split("\n"),
),
None,
)

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"
mntr_result = keeper_utils.send_4lw_cmd(started_cluster, node, "mntr")
line_size_before = get_line_from_mntr(mntr_result, "zk_approximate_data_size")
node_count_before = get_line_from_mntr(mntr_result, "zk_znode_count")
assert (
get_line_from_mntr(mntr_result, "zk_ephemerals_count")
== "zk_ephemerals_count\t0"
)
assert line_size_before != None

restart_clickhouse()

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
mntr_result = keeper_utils.send_4lw_cmd(started_cluster, node, "mntr")
assert (
get_line_from_mntr(mntr_result, "zk_ephemerals_count")
== "zk_ephemerals_count\t0"
)
assert (
get_line_from_mntr(mntr_result, "zk_znode_count") == node_count_before
)
assert (
get_line_from_mntr(mntr_result, "zk_approximate_data_size")
== line_size_before
)

assert_mntr_stats()
keeper_utils.send_4lw_cmd(started_cluster, node, "rclc")
Expand Down