thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-23 08:02:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-monotonicity-fuzz-2

Browse Source
This commit is contained in:
Alexey Milovidov 2023-01-02 21:34:05 +01:00
commit a8c202767b
3 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/integration/test_library_bridge/test.py
View File

@ -307,15 +307,18 @@ def test_bridge_dies_with_parent(ch_cluster):
assert clickhouse_pid is not None
assert bridge_pid is not None
while clickhouse_pid is not None:
try:
instance.exec_in_container(
["kill", str(clickhouse_pid)], privileged=True, user="root"
)
except:
pass
clickhouse_pid = instance.get_process_pid("clickhouse server")
try:
instance.exec_in_container(
["kill", str(clickhouse_pid)], privileged=True, user="root"
)
except:
pass
for i in range(30):
time.sleep(1)
clickhouse_pid = instance.get_process_pid("clickhouse server")
if clickhouse_pid is None:
break
for i in range(30):
time.sleep(1)

8
tests/integration/test_multiple_disks/test.py
View File

@ -590,6 +590,13 @@ def test_jbod_overflow(start_cluster, name, engine):
)
node1.query(f"SYSTEM STOP MERGES {name}")
# The test tries to utilize 35/40=87.5% of space, while during last
# INSERT parts mover may see up to ~100% of used space on disk due to
# reservations (since INSERT first reserves the space and later write
# the same, more or less, amount of space, and util the reservation had
# been destroyed it will be taken into account as reserved on the
# disk).
node1.query(f"SYSTEM STOP MOVES {name}")
# small jbod size is 40MB, so lets insert 5MB batch 7 times
for i in range(7):
@ -621,6 +628,7 @@ def test_jbod_overflow(start_cluster, name, engine):
assert used_disks[-1] == "external"
node1.query(f"SYSTEM START MERGES {name}")
node1.query(f"SYSTEM START MOVES {name}")
time.sleep(1)
node1.query_with_retry("OPTIMIZE TABLE {} FINAL".format(name))

19
tests/integration/test_odbc_interaction/test.py
View File

@ -635,15 +635,18 @@ def test_bridge_dies_with_parent(started_cluster):
assert clickhouse_pid is not None
assert bridge_pid is not None
while clickhouse_pid is not None:
try:
node1.exec_in_container(
["kill", str(clickhouse_pid)], privileged=True, user="root"
)
except:
pass
clickhouse_pid = node1.get_process_pid("clickhouse server")
try:
node1.exec_in_container(
["kill", str(clickhouse_pid)], privileged=True, user="root"
)
except:
pass
for i in range(30):
time.sleep(1)
clickhouse_pid = node1.get_process_pid("clickhouse server")
if clickhouse_pid is None:
break
for i in range(30):
time.sleep(1) # just for sure, that odbc-bridge caught signal