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

remove ps

Browse Source
This commit is contained in:
Alexander Tokmakov 2023-03-01 15:37:03 +01:00
parent a97e15e36f
commit b11ed59107
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/queries/0_stateless/02434_cancel_insert_when_client_dies.sh
View File

@ -67,7 +67,7 @@ function thread_cancel
if (( RANDOM % 2 )); then
SIGNAL="KILL"
fi
PID=$(ps -ef | grep "$TEST_MARK" | grep -v grep | awk '{print $2}')
PID=$(grep -Fa "$TEST_MARK" /proc/*/cmdline | grep -Fav grep | grep -Eoa "/proc/[0-9]*/cmdline:" | grep -Eo "[0-9]*" | head -1)
if [ ! -z "$PID" ]; then kill -s "$SIGNAL" "$PID"; fi
sleep 0.$RANDOM;
sleep 0.$RANDOM;
@ -91,8 +91,7 @@ $CLICKHOUSE_CLIENT -q 'select count() from dedup_test'
$CLICKHOUSE_CLIENT -q 'system flush logs'
# We have to ignore stderr from thread_cancel, because our CI finds a bug in ps...
# So use this query to check that thread_cancel do something
# Ensure that thread_cancel actually did something
$CLICKHOUSE_CLIENT -q "select count() > 0 from system.text_log where event_date >= yesterday() and query_id like '$TEST_MARK%' and (
message_format_string in ('Unexpected end of file while reading chunk header of HTTP chunked data', 'Unexpected EOF, got {} of {} bytes') or
message like '%Connection reset by peer%')"
message like '%Connection reset by peer%' or message like '%Broken pipe, while writing to socket%')"

9
tests/queries/0_stateless/02435_rollback_cancelled_queries.sh
View File

@ -83,7 +83,7 @@ function thread_cancel
if (( RANDOM % 2 )); then
SIGNAL="KILL"
fi
PID=$(ps -ef | grep "$TEST_MARK" | grep -v grep | awk '{print $2}')
PID=$(grep -Fa "$TEST_MARK" /proc/*/cmdline | grep -Fav grep | grep -Eoa "/proc/[0-9]*/cmdline:" | grep -Eo "[0-9]*" | head -1)
if [ ! -z "$PID" ]; then kill -s "$SIGNAL" "$PID"; fi
sleep 0.$RANDOM;
done
@ -93,14 +93,13 @@ export -f thread_insert;
export -f thread_select;
export -f thread_cancel;
TIMEOUT=20 # 5 seconds for each TYPE
TIMEOUT=20
timeout $TIMEOUT bash -c thread_insert &
timeout $TIMEOUT bash -c thread_select &
timeout $TIMEOUT bash -c thread_cancel 2> /dev/null &
wait
wait_for_queries_to_finish
$CLICKHOUSE_CLIENT -q 'system flush logs'
@ -110,10 +109,10 @@ insert_data
$CLICKHOUSE_CLIENT --implicit_transaction=1 -q 'select throwIf(count() % 1000000 != 0 or count() = 0) from dedup_test' \
|| $CLICKHOUSE_CLIENT -q "select name, rows, active, visible, creation_tid, creation_csn from system.parts where database=currentDatabase();"
# We have to ignore stderr from thread_cancel, because our CI finds a bug in ps...
# So use this query to check that thread_cancel do something
# Ensure that thread_cancel actually did something
$CLICKHOUSE_CLIENT -q "select count() > 0 from system.text_log where event_date >= yesterday() and query_id like '$TEST_MARK%' and (
message_format_string in ('Unexpected end of file while reading chunk header of HTTP chunked data', 'Unexpected EOF, got {} of {} bytes') or
message like '%Connection reset by peer%' or message like '%Broken pipe, while writing to socket%')"
wait_for_queries_to_finish 30
$CLICKHOUSE_CLIENT --database_atomic_wait_for_drop_and_detach_synchronously=0 -q "drop table dedup_test"

3
tests/queries/shell_config.sh
View File

@ -136,12 +136,13 @@ function clickhouse_client_removed_host_parameter()
function wait_for_queries_to_finish()
{
local max_tries="${1:-20}"
# Wait for all queries to finish (query may still be running if thread is killed by timeout)
num_tries=0
while [[ $($CLICKHOUSE_CLIENT -q "SELECT count() FROM system.processes WHERE current_database=currentDatabase() AND query NOT LIKE '%system.processes%'") -ne 0 ]]; do
sleep 0.5;
num_tries=$((num_tries+1))
if [ $num_tries -eq 20 ]; then
if [ $num_tries -eq $max_tries ]; then
$CLICKHOUSE_CLIENT -q "SELECT * FROM system.processes WHERE current_database=currentDatabase() AND query NOT LIKE '%system.processes%' FORMAT Vertical"
break
fi