Skip to content

Fix retry loop syntax and remove obsolete xfail in version suite #72

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

Merged
CarlosFelipeOR merged 1 commit into from
Dec 4, 2025
Merged

Fix retry loop syntax and remove obsolete xfail in version suite #72

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 21 additions & 24 deletions helpers/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,38 +717,35 @@ def stop_clickhouse(self, timeout=300, safe=True, signal="TERM"):
fail("pid still alive")

with And("killing any remaining ClickHouse child processes"):
for attempt in retries(timeout=10, delay=1):
for i, attempt in enumerate(retries(timeout=100, delay=3)):
with attempt:
result = self.command(
"pgrep -f 'clickhouse.*server' || true",
steps=False,
no_checks=True,
)
if not result.output.strip():
break

self.command(
f"pkill -{signal} -f 'clickhouse.*server' || true",
steps=False,
no_checks=True,
)
time.sleep(1)

result = self.command(
"pgrep -f 'clickhouse.*server' || true",
steps=False,
no_checks=True,
"pgrep -f 'clickhouse.*server'",
steps=False,
no_checks=True,
)
if not result.output.strip():
if result.exitcode == 1:
break

if attempt.iteration >= 5:

if i > 0 and i % 10 == 0:
self.command(
f"pkill -KILL -f 'clickhouse.*server'",
steps=False,
no_checks=True,
)
else:
self.command(
"pkill -KILL -f 'clickhouse.*server' || true",
f"pkill -{signal} -f 'clickhouse.*server'",
steps=False,
no_checks=True,
)
time.sleep(1)

result = self.command(
"pgrep -f 'clickhouse.*server'",
steps=False,
no_checks=True,
)
if result.exitcode != 1: fail("ClickHouse server process still alive")

with And("deleting ClickHouse server pid file"):
self.command("rm -rf /tmp/clickhouse-server.pid", exitcode=0, steps=False)
Expand Down
7 changes: 0 additions & 7 deletions version/regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,6 @@
check_clickhouse_version("<25.3"),
),
],
"/version/altinity/error message/*": [
(
Fail,
"https://github.com/Altinity/ClickHouse/pull/899",
check_clickhouse_version("<25.3"),
),
],
"/version/altinity/error message/": [
(
Fail,
Expand Down
Loading