This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 6069ebbb6a4 branch-3.0: [fix](iceberg)Fix the inconsistency between
the data in pg and the data in MinIO. #50578 (#50640)
6069ebbb6a4 is described below
commit 6069ebbb6a465d51a77a7c22e443729790717a73
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed May 14 15:05:58 2025 +0800
branch-3.0: [fix](iceberg)Fix the inconsistency between the data in pg and
the data in MinIO. #50578 (#50640)
Cherry-picked from #50578
Co-authored-by: wuwenchi <[email protected]>
---
.../thirdparties/docker-compose/iceberg/iceberg.yaml.tpl | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/docker/thirdparties/docker-compose/iceberg/iceberg.yaml.tpl
b/docker/thirdparties/docker-compose/iceberg/iceberg.yaml.tpl
index 43e786e4e48..9ba8987d02b 100644
--- a/docker/thirdparties/docker-compose/iceberg/iceberg.yaml.tpl
+++ b/docker/thirdparties/docker-compose/iceberg/iceberg.yaml.tpl
@@ -107,6 +107,8 @@ services:
- MINIO_ROOT_USER=admin
- MINIO_ROOT_PASSWORD=password
- MINIO_DOMAIN=minio
+ volumes:
+ - ./data/input/minio_data:/data
networks:
doris--iceberg:
aliases:
@@ -130,11 +132,14 @@ services:
entrypoint: >
/bin/sh -c "
until (/usr/bin/mc config host add minio http://minio:9000 admin
password) do echo '...waiting...' && sleep 1; done;
- /usr/bin/mc rm -r --force minio/warehouse;
- /usr/bin/mc mb minio/warehouse;
- /usr/bin/mc policy set public minio/warehouse;
- echo 'copy data';
- mc cp -r /mnt/data/input/minio/warehouse/* minio/warehouse/;
+ if /usr/bin/mc ls minio/warehouse > /dev/null 2>&1; then
+ echo 'minio/warehouse already exists, skipping creation and copy.';
+ else
+ echo 'Creating minio/warehouse and copying data...';
+ /usr/bin/mc mb minio/warehouse;
+ /usr/bin/mc policy set public minio/warehouse;
+ /usr/bin/mc cp -r /mnt/data/input/minio/warehouse/* minio/warehouse/;
+ fi
"
networks:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
