Skip to content

Commit

Permalink
[apache#3881] fix(CI): move chmod to build stage to accelerate the st…
Browse files Browse the repository at this point in the history
…artup speed for Doris (apache#3883)

### What changes were proposed in this pull request?

- remove chmod in Doris Container start.sh
- add chmod in Doris Dockerfile

### Why are the changes needed?

accelerate the startup speed for Doris Container

Fix: apache#3881

### Does this PR introduce _any_ user-facing change?

N/A

### How was this patch tested?

Manual
  • Loading branch information
zhoukangcn authored and shaofengshi committed Jun 24, 2024
1 parent 6743b79 commit 1cb54fb
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion catalogs/catalog-jdbc-doris/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ tasks {
tasks.test {
val skipUTs = project.hasProperty("skipTests")
doFirst {
environment("GRAVITINO_CI_DORIS_DOCKER_IMAGE", "datastrato/gravitino-ci-doris:0.1.3")
environment("GRAVITINO_CI_DORIS_DOCKER_IMAGE", "datastrato/gravitino-ci-doris:0.1.4")
}

if (skipUTs) {
Expand Down
3 changes: 2 additions & 1 deletion dev/docker/doris/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ RUN ARCH=$(uname -m) && \
#################################################################################
## add files
ADD packages/doris-${TARGETARCH}.tar.xz /opt/
RUN ln -s /opt/apache-doris-${DORIS_VERSION}-bin-* ${DORIS_HOME}
RUN ln -s /opt/apache-doris-${DORIS_VERSION}-bin-* ${DORIS_HOME} && \
chmod 755 "${DORIS_BE_HOME}/lib/doris_be"

COPY start.sh ${DORIS_HOME}

Expand Down
3 changes: 3 additions & 0 deletions dev/docker/doris/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ DORIS_BE_SCRIPT="${DORIS_BE_HOME}/bin/start_be.sh"
sed -i '/Please set vm.max_map_count/,/exit 1/{s/exit 1/#exit 1\n echo "skip this"/}' ${DORIS_BE_SCRIPT}
sed -i '/Please set the maximum number of open file descriptors/,/exit 1/{s/exit 1/#exit 1\n echo "skip this"/}' ${DORIS_BE_SCRIPT}

# remove chmod command in start_be.sh, it will cost a lot of time. Add it to Dockerfile
sed -i 's/chmod 755 "${DORIS_HOME}\/lib\/doris_be"/#&/' ${DORIS_BE_SCRIPT}

# update fe.conf & be.conf, set priority_networks
CONTAINER_IP=$(hostname -i)
PRIORITY_NETWORKS=$(echo "${CONTAINER_IP}" | awk -F '.' '{print$1"."$2"."$3".0/24"}')
Expand Down
3 changes: 3 additions & 0 deletions docs/docker-image-details.md
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,9 @@ You can use this image to test Apache Doris.

Changelog

- gravitino-ci-doris:0.1.4
- remove chmod in start.sh to accelerate the startup speed

- gravitino-ci-doris:0.1.3
- To adapt to the CI framework, don't exit container when start failed, logs are no longer printed to stdout.
- Add `report_disk_state_interval_seconds` config to decrease report interval.
Expand Down
2 changes: 1 addition & 1 deletion integration-test/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ tasks.test {
environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.12")
environment("GRAVITINO_CI_TRINO_DOCKER_IMAGE", "datastrato/gravitino-ci-trino:0.1.5")
environment("GRAVITINO_CI_KAFKA_DOCKER_IMAGE", "apache/kafka:3.7.0")
environment("GRAVITINO_CI_DORIS_DOCKER_IMAGE", "datastrato/gravitino-ci-doris:0.1.3")
environment("GRAVITINO_CI_DORIS_DOCKER_IMAGE", "datastrato/gravitino-ci-doris:0.1.4")
environment("GRAVITINO_CI_RANGER_DOCKER_IMAGE", "datastrato/gravitino-ci-ranger:0.1.0")

copy {
Expand Down

0 comments on commit 1cb54fb

Please sign in to comment.