mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 08:40:50 +00:00
Improvements
This commit is contained in:
parent
b84132f4cd
commit
077cd535e2
@ -239,7 +239,7 @@ quit
|
|||||||
done
|
done
|
||||||
clickhouse-client --query "select 1" # This checks that the server is responding
|
clickhouse-client --query "select 1" # This checks that the server is responding
|
||||||
kill -0 $server_pid # This checks that it is our server that is started and not some other one
|
kill -0 $server_pid # This checks that it is our server that is started and not some other one
|
||||||
echo Server started and responded
|
echo 'Server started and responded'
|
||||||
|
|
||||||
# Initialize export of system logs to ClickHouse Cloud
|
# Initialize export of system logs to ClickHouse Cloud
|
||||||
if [ -n "${CLICKHOUSE_CI_LOGS_HOST}" ]
|
if [ -n "${CLICKHOUSE_CI_LOGS_HOST}" ]
|
||||||
|
@ -155,13 +155,22 @@ def main():
|
|||||||
paths = {
|
paths = {
|
||||||
"run.log": run_log_path,
|
"run.log": run_log_path,
|
||||||
"main.log": os.path.join(workspace_path, "main.log"),
|
"main.log": os.path.join(workspace_path, "main.log"),
|
||||||
"server.log.zst": os.path.join(workspace_path, "server.log.zst"),
|
|
||||||
"fuzzer.log": os.path.join(workspace_path, "fuzzer.log"),
|
"fuzzer.log": os.path.join(workspace_path, "fuzzer.log"),
|
||||||
"report.html": os.path.join(workspace_path, "report.html"),
|
"report.html": os.path.join(workspace_path, "report.html"),
|
||||||
"core.zst": os.path.join(workspace_path, "core.zst"),
|
"core.zst": os.path.join(workspace_path, "core.zst"),
|
||||||
"dmesg.log": os.path.join(workspace_path, "dmesg.log"),
|
"dmesg.log": os.path.join(workspace_path, "dmesg.log"),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
compressed_server_log_path = os.path.join(workspace_path, "server.log.zst")
|
||||||
|
if os.path.exists(compressed_server_log_path):
|
||||||
|
paths["server.log.zst"] = compressed_server_log_path
|
||||||
|
|
||||||
|
# The script can fail before the invocation of `zstd`, but we are still interested in its log:
|
||||||
|
|
||||||
|
not_compressed_server_log_path = os.path.join(workspace_path, "server.log")
|
||||||
|
if os.path.exists(not_compressed_server_log_path):
|
||||||
|
paths["server.log"] = not_compressed_server_log_path
|
||||||
|
|
||||||
s3_helper = S3Helper()
|
s3_helper = S3Helper()
|
||||||
for f in paths:
|
for f in paths:
|
||||||
try:
|
try:
|
||||||
|
Loading…
Reference in New Issue
Block a user