This is an automated email from the ASF dual-hosted git repository.
hellostephen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new b7f1a41efa7 [opt](oceanbase docker)Use LTS docker image and print
unhealthy docker logs (#46647)
b7f1a41efa7 is described below
commit b7f1a41efa7b25b958c55cae0c077338f7dffbfb
Author: Thearas <[email protected]>
AuthorDate: Thu Jan 9 17:48:33 2025 +0800
[opt](oceanbase docker)Use LTS docker image and print unhealthy docker logs
(#46647)
### 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/thirdparties/docker-compose/oceanbase/oceanbase.yaml.tpl | 2 +-
docker/thirdparties/run-thirdparties-docker.sh | 5 +++++
.../data/external_table_p0/jdbc/test_oceanbase_jdbc_catalog.out | 8 ++++----
3 files changed, 10 insertions(+), 5 deletions(-)
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 16c8b9e7d6b..fd9558eef55 100755
--- a/docker/thirdparties/run-thirdparties-docker.sh
+++ b/docker/thirdparties/run-thirdparties-docker.sh
@@ -718,6 +718,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
---
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
@@ -1,7 +1,7 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !query --
-\N 302 \N 502 602 4.14159 \N 6.141592 \N
-124 -302 2013 -402 -502 -602 \N
2012-10-26T02:08:39.345700 2013-10-26T08:09:18 -5.14145 \N
-7.1400 row2 \N 09:11:09.567 text2 0xE86F6C6C6F20576F726C67
\N \N 0x2F \N 0x88656C6C9F Value3
-201 301 401 501 601 3.14159 4.1415926 5.141592
1 -123 -301 2012 -401 -501 -601 2012-10-30
2012-10-25T12:05:36.345700 2012-10-25T08:08:08 -4.14145
-5.1400000001 -6.1400 row1 line1 09:09:09.567 text1
0x48656C6C6F20576F726C64 {"age": 30, "city": "London", "name": "Alice"}
Option1,Option3 0x2A 0x48656C6C6F00000000000000 0x48656C6C6F Value2
-202 302 402 502 602 4.14159 5.1415926 6.141592
0 -124 -302 2013 -402 -502 -602 2012-11-01
2012-10-26T02:08:39.345700 2013-10-26T08:09:18 -5.14145
-6.1400000001 -7.1400 row2 line2 09:11:09.567 text2
0xE86F6C6C6F20576F726C67 {"age": 18, "city": "ChongQing", "name":
"Gaoxin"} Option1,Option2 0x2F 0x58676C6C6F00000000000000
0x88656C6C9F Value3
-203 303 403 503 603 7.14159 8.1415926 9.141592
0 \N -402 2017 -602 -902 -1102 2012-11-02 \N
2013-10-27T08:11:18 -5.14145 -6.1400000000001 -7.1400 row3
line3 09:11:09.567 text3 0xE86F6C6C6F20576F726C67 {"age": 24,
"city": "ChongQing", "name": "ChenQi"} Option2 0x2F
0x58676C6C6F00000000000000 \N Value1
+\N 302 \N 502 602 4.14159 \N 6.141592 \N
-124 -302 2013 -402 -502 -602 \N
2012-10-26T10:08:39.345700 2013-10-26T16:09:18 -5.14145 \N
-7.1400 row2 \N 09:11:09.567 text2 0xE86F6C6C6F20576F726C67
\N \N 0x2F \N 0x88656C6C9F Value3
+201 301 401 501 601 3.14159 4.1415926 5.141592
1 -123 -301 2012 -401 -501 -601 2012-10-30
2012-10-25T20:05:36.345700 2012-10-25T16:08:08 -4.14145
-5.1400000001 -6.1400 row1 line1 09:09:09.567 text1
0x48656C6C6F20576F726C64 {"age": 30, "city": "London", "name": "Alice"}
Option1,Option3 0x2A 0x48656C6C6F00000000000000 0x48656C6C6F Value2
+202 302 402 502 602 4.14159 5.1415926 6.141592
0 -124 -302 2013 -402 -502 -602 2012-11-01
2012-10-26T10:08:39.345700 2013-10-26T16:09:18 -5.14145
-6.1400000001 -7.1400 row2 line2 09:11:09.567 text2
0xE86F6C6C6F20576F726C67 {"age": 18, "city": "ChongQing", "name":
"Gaoxin"} Option1,Option2 0x2F 0x58676C6C6F00000000000000
0x88656C6C9F Value3
+203 303 403 503 603 7.14159 8.1415926 9.141592
0 \N -402 2017 -602 -902 -1102 2012-11-02 \N
2013-10-27T16:11:18 -5.14145 -6.1400000000001 -7.1400 row3
line3 09:11:09.567 text3 0xE86F6C6C6F20576F726C67 {"age": 24,
"city": "ChongQing", "name": "ChenQi"} Option2 0x2F
0x58676C6C6F00000000000000 \N Value1
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
