This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 65b8b99298b [Enhance](regression)docker hive s3 file address is
determined based on the configuration (#25905)
65b8b99298b is described below
commit 65b8b99298b8d9032cbc2acb92248af10dac64d9
Author: zhangguoqiang <[email protected]>
AuthorDate: Thu Oct 26 11:58:33 2023 +0800
[Enhance](regression)docker hive s3 file address is determined based on the
configuration (#25905)
docker hive s3 file address is determined based on the configuration
custom_settings.env
---
docker/thirdparties/custom_settings.env | 2 ++
docker/thirdparties/docker-compose/hive/scripts/hive-metastore.sh | 8 ++++++--
docker/thirdparties/run-thirdparties-docker.sh | 4 +++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/docker/thirdparties/custom_settings.env
b/docker/thirdparties/custom_settings.env
index d1f9fbb6285..ac178c81726 100644
--- a/docker/thirdparties/custom_settings.env
+++ b/docker/thirdparties/custom_settings.env
@@ -21,3 +21,5 @@
# eg: CONTAINER_UID="doris-jack-"
# NOTICE: change this uid will modify the file in docker-compose.
CONTAINER_UID="doris--"
+s3Endpoint="cos.ap-hongkong.myqcloud.com"
+s3BucketName="doris-build-hk-1308700295"
diff --git a/docker/thirdparties/docker-compose/hive/scripts/hive-metastore.sh
b/docker/thirdparties/docker-compose/hive/scripts/hive-metastore.sh
index 2d19c7aa1c3..0157dc26d40 100755
--- a/docker/thirdparties/docker-compose/hive/scripts/hive-metastore.sh
+++ b/docker/thirdparties/docker-compose/hive/scripts/hive-metastore.sh
@@ -25,7 +25,9 @@ sleep 10s
if [[ ! -d "/mnt/scripts/tpch1.db" ]]; then
echo "/mnt/scripts/tpch1.db does not exist"
cd /mnt/scripts/
- wget -P /mnt/scripts
https://doris-build-hk-1308700295.cos.ap-hongkong.myqcloud.com/regression/load/tpch1_parquet/tpch1.db.tar.gz
+ #curl -O /mnt/scripts
https://doris-build-hk-1308700295.cos.ap-hongkong.myqcloud.com/regression/load/tpch1_parquet/tpch1.db.tar.gz
+ echo "curl -O
s3BucketName.s3Endpoint/regression/datalake/pipeline_data/tpch1.db.tar.gz"
+ curl -O
https://s3BucketName.s3Endpoint/regression/datalake/pipeline_data/tpch1.db.tar.gz
tar -zxf tpch1.db.tar.gz
rm -rf tpch1.db.tar.gz
cd -
@@ -45,7 +47,9 @@ hadoop fs -put /mnt/scripts/tpch1.db /user/doris/
if [[ ! -d "/mnt/scripts/paimon1" ]]; then
echo "/mnt/scripts/paimon1 does not exist"
cd /mnt/scripts/
- curl -O
https://doris-build-hk-1308700295.cos.ap-hongkong.myqcloud.com/regression/paimon/paimon1.tar.gz
+ #curl -O
https://doris-build-hk-1308700295.cos.ap-hongkong.myqcloud.com/regression/paimon/paimon1.tar.gz
+ echo "curl -O
s3BucketName.s3Endpoint/regression/datalake/pipeline_data/paimon1.tar.gz"
+ curl -O
https://s3BucketName.s3Endpoint/regression/datalake/pipeline_data/paimon1.tar.gz
tar -zxf paimon1.tar.gz
rm -rf paimon1.tar.gz
cd -
diff --git a/docker/thirdparties/run-thirdparties-docker.sh
b/docker/thirdparties/run-thirdparties-docker.sh
index 133785a460f..241ac6acc7b 100755
--- a/docker/thirdparties/run-thirdparties-docker.sh
+++ b/docker/thirdparties/run-thirdparties-docker.sh
@@ -303,6 +303,8 @@ if [[ "${RUN_HIVE}" -eq 1 ]]; then
sed -i "s/externalEnvIp/${IP_HOST}/g"
"${ROOT}"/docker-compose/hive/hive-2x.yaml
sed -i "s/externalEnvIp/${IP_HOST}/g"
"${ROOT}"/docker-compose/hive/hadoop-hive.env.tpl
sed -i "s/\${externalEnvIp}/${IP_HOST}/g"
"${ROOT}"/docker-compose/hive/gen_env.sh
+ sed -i "s/s3Endpoint/${s3Endpoint}/g"
"${ROOT}"/docker-compose/hive/scripts/hive-metastore.sh
+ sed -i "s/s3BucketName/${s3BucketName}/g"
"${ROOT}"/docker-compose/hive/scripts/hive-metastore.sh
sudo bash "${ROOT}"/docker-compose/hive/gen_env.sh
sudo docker compose -f "${ROOT}"/docker-compose/hive/hive-2x.yaml
--env-file "${ROOT}"/docker-compose/hive/hadoop-hive.env down
if [[ "${STOP}" -ne 1 ]]; then
@@ -321,7 +323,7 @@ if [[ "${RUN_ICEBERG}" -eq 1 ]]; then
sudo docker compose -f "${ROOT}"/docker-compose/iceberg/iceberg.yaml
--env-file "${ROOT}"/docker-compose/iceberg/iceberg.env down
sudo rm -rf "${ROOT}"/docker-compose/iceberg/data
if [[ "${STOP}" -ne 1 ]]; then
- wget -P ${ROOT}/docker-compose/iceberg
https://doris-build-hk-1308700295.cos.ap-hongkong.myqcloud.com/regression/iceberg/iceberg_data.zip
+ wget -P "${ROOT}"/docker-compose/iceberg
https://"${s3BucketName}.${s3Endpoint}"/regression/datalake/pipeline_data/iceberg_data.zip
sudo unzip -d "${ROOT}"/docker-compose/iceberg -q
${ROOT}/docker-compose/iceberg/iceberg_data.zip
sudo mv "${ROOT}"/docker-compose/iceberg/iceberg_data
"${ROOT}"/docker-compose/iceberg/data
sudo rm -rf ${ROOT}/docker-compose/iceberg/iceberg_data.zip
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
