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

fix

Browse Source
This commit is contained in:
Alexander Tokmakov 2021-02-19 12:57:09 +03:00
parent afed8a8192
commit 4493c39bf7
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/test/stress/run.sh
View File

@ -108,6 +108,10 @@ zgrep -Fa " <Fatal> " /var/log/clickhouse-server/clickhouse-server.log > /dev/nu
zgrep -Fa "########################################" /test_output/* > /dev/null \
&& echo -e 'Killed by signal (output files)\tFAIL' >> /test_output/test_results.tsv
# Put logs into /test_output/
pigz < /var/log/clickhouse-server/clickhouse-server.log > /test_output/clickhouse-server.log.gz
mv /var/log/clickhouse-server/stderr.log /test_output/
# Write check result into check_status.tsv
clickhouse-local --structure "test String, res String" -q "SELECT 'failure', test FROM table WHERE res != 'OK' LIMIT 1" < /test_output/test_results.tsv > /test_output/check_status.tsv
[ -s /test_output/check_status.tsv ] || echo -e "success\tNo errors found"

2
docker/test/stress/stress
View File

@ -89,7 +89,7 @@ if __name__ == "__main__":
cmd = "{} {} {}".format(args.test_cmd, "--hung-check", "00001_select_1")
res = call(cmd, shell=True, stderr=STDOUT)
hung_check_status = "Hung check\t{}\n".format('FAIL' if res else 'OK')
open(os.path.join(args.output_folder, "test_results.tsv"), 'w+').write()
open(os.path.join(args.output_folder, "test_results.tsv"), 'w+').write(hung_check_status)
if res != 0:
logging.info("Hung check failed with exit code {}".format(res))

6
tests/clickhouse-test
View File

@ -229,13 +229,15 @@ def get_stacktraces_from_clickhouse(client):
def get_server_pid(server_tcp_port):
cmd = "lsof -i tcp:{port} -s tcp:LISTEN -Fp | awk '/^p[0-9]+$/{{print substr($0, 2)}}'".format(port=server_tcp_port)
output = None
try:
output = subprocess.check_output(cmd, shell=True)
output = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
if output:
return int(output)
else:
return None # server dead
except Exception:
except Exception as e:
print("Cannot get server pid, got {}: {}", output, e)
return None

1
tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper.sh
View File

@ -14,6 +14,7 @@ for i in $(seq $REPLICAS); do
$CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_alter_mt_$i (key UInt64, value1 UInt64, value2 Int32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01079/concurrent_alter_mt', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000"
done
$CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_mt_1 SELECT number, number + 10, number from numbers(10)"
$CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_mt_1 SELECT number, number + 10, number from numbers(10, 40)"