This is an automated email from the ASF dual-hosted git repository.
hellostephen pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 3aad9e5f674 [opt](oceanbase docker)Use LTS docker image and print
unhealthy docker logs (#46647) (#47349)
3aad9e5f674 is described below
commit 3aad9e5f674f0625c2aeab0a2da328aa964c1081
Author: Thearas <[email protected]>
AuthorDate: Fri Jan 24 12:22:02 2025 +0900
[opt](oceanbase docker)Use LTS docker image and print unhealthy docker logs
(#46647) (#47349)
### What problem does this PR solve?
Problem Summary:
Oceanbase container sometimes start failed.
<img width="653" alt="image"
src="https://github.com/user-attachments/assets/d95c66cf-7e04-4179-a565-9b9dd8b87128";
/>
We do two things:
1. Print last 100 lines docker logs of unhealthy container for debugging
2. Upgrade Oceanbase docker image to the newest `4.2.1-lts`, since it is
7 months newer than `4.2.1`, more stable
---
.../docker-compose/oceanbase/oceanbase.yaml.tpl | 2 +-
docker/thirdparties/run-thirdparties-docker.sh | 5 +++++
.../jdbc/test_oceanbase_jdbc_catalog.out | Bin 1318 -> 1318 bytes
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/docker/thirdparties/docker-compose/oceanbase/oceanbase.yaml.tpl
b/docker/thirdparties/docker-compose/oceanbase/oceanbase.yaml.tpl
index e4f00a6a115..d836c1252c1 100644
--- a/docker/thirdparties/docker-compose/oceanbase/oceanbase.yaml.tpl
+++ b/docker/thirdparties/docker-compose/oceanbase/oceanbase.yaml.tpl
@@ -19,7 +19,7 @@ version: "2.1"
services:
doris--oceanbase:
- image: oceanbase/oceanbase-ce:4.2.1
+ image: oceanbase/oceanbase-ce:4.2.1-lts
restart: always
environment:
MODE: slim
diff --git a/docker/thirdparties/run-thirdparties-docker.sh
b/docker/thirdparties/run-thirdparties-docker.sh
index 6feac8246f7..72e980b75d0 100755
--- a/docker/thirdparties/run-thirdparties-docker.sh
+++ b/docker/thirdparties/run-thirdparties-docker.sh
@@ -711,6 +711,11 @@ for compose in "${!pids[@]}"; do
echo "docker $compose started failed with status $status"
echo "print start_${compose}.log"
cat start_${compose}.log
+
+ echo ""
+ echo "print last 100 logs of the latest unhealthy container"
+ docker ps -a --latest --filter 'health=unhealthy' --format '{{.ID}}' |
xargs -I '{}' sh -c 'echo "=== Logs of {} ===" && docker logs -t --tail 100
"{}"'
+
exit 1
fi
done
diff --git
a/regression-test/data/external_table_p0/jdbc/test_oceanbase_jdbc_catalog.out
b/regression-test/data/external_table_p0/jdbc/test_oceanbase_jdbc_catalog.out
index fdf887af2a2..8d8b5d7b0f9 100644
Binary files
a/regression-test/data/external_table_p0/jdbc/test_oceanbase_jdbc_catalog.out
and
b/regression-test/data/external_table_p0/jdbc/test_oceanbase_jdbc_catalog.out
differ
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
