[apache#3484] improvement(docker): Remove unused yarn configuration f…

…rom Hive docker file (apache#3487) ### What changes were suggested in this pull request? Remove `yarn-site.xml` and `yarn-env.sh` from Hive docker file and release a new version of CI Hive docker image. ### Why are the changes needed? Remove useless code to simply code. Fix: apache#3484 ### Does this PR introduce _any_ user-facing change? N/A. ### How was this patch tested? Test Locally and existing CI
diqiu50 · Jun 13, 2024 · a5dc006 · a5dc006
1 parent 83786cb
commit a5dc006
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 150 deletions.
diff --git a/catalogs/catalog-hadoop/build.gradle.kts b/catalogs/catalog-hadoop/build.gradle.kts
@@ -98,7 +98,7 @@ tasks.test {
     dependsOn(tasks.jar)
 
     doFirst {
-      environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.10")
+      environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.11")
     }
 
     val init = project.extra.get("initIntegrationTest") as (Test) -> Unit

diff --git a/catalogs/catalog-hive/build.gradle.kts b/catalogs/catalog-hive/build.gradle.kts
@@ -164,7 +164,7 @@ tasks.test {
     dependsOn(tasks.jar)
 
     doFirst {
-      environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.10")
+      environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.11")
     }
 
     val init = project.extra.get("initIntegrationTest") as (Test) -> Unit

diff --git a/catalogs/catalog-lakehouse-iceberg/build.gradle.kts b/catalogs/catalog-lakehouse-iceberg/build.gradle.kts
@@ -162,7 +162,7 @@ tasks.test {
     dependsOn(tasks.jar)
 
     doFirst {
-      environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.10")
+      environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.11")
     }
 
     val init = project.extra.get("initIntegrationTest") as (Test) -> Unit

diff --git a/dev/docker/hive/Dockerfile b/dev/docker/hive/Dockerfile
@@ -96,17 +96,13 @@ RUN tar -xz -C ${HADOOP_HOME} --strip-components 1 -f /tmp/packages/${HADOOP_PAC
 # replace configuration templates
 RUN rm -f ${HADOOP_CONF_DIR}/core-site.xml
 RUN rm -f ${HADOOP_CONF_DIR}/hadoop-env.sh
-RUN rm -f ${HADOOP_CONF_DIR}/yarn-env.sh
 RUN rm -f ${HADOOP_CONF_DIR}/hdfs-site.xml
 RUN rm -f ${HADOOP_CONF_DIR}/mapred-site.xml
-RUN rm -f ${HADOOP_CONF_DIR}/yarn-site.xml
 
 ADD core-site.xml ${HADOOP_CONF_DIR}/core-site.xml
 ADD hadoop-env.sh ${HADOOP_CONF_DIR}/hadoop-env.sh
-ADD yarn-env.sh ${HADOOP_CONF_DIR}/yarn-env.sh
 ADD hdfs-site.xml ${HADOOP_CONF_DIR}/hdfs-site.xml
 ADD mapred-site.xml ${HADOOP_CONF_DIR}/mapred-site.xml
-ADD yarn-site.xml ${HADOOP_CONF_DIR}/yarn-site.xml
 ADD check-status.sh /tmp/check-status.sh
 
 # format HFS

diff --git a/dev/docker/hive/mapred-site.xml b/dev/docker/hive/mapred-site.xml
@@ -1,7 +1,7 @@
 <configuration>
   <property>
     <name>mapreduce.framework.name</name>
-    <value>yarn</value>
+    <value>local</value>
   </property>
 
   <property>

diff --git a/dev/docker/hive/yarn-env.sh b/dev/docker/hive/yarn-env.sh
diff --git a/dev/docker/hive/yarn-site.xml b/dev/docker/hive/yarn-site.xml
diff --git a/docs/docker-image-details.md b/docs/docker-image-details.md
@@ -100,6 +100,10 @@ You can use this kind of image to test the catalog of Apache Hive.
 
 Changelog
 
+- gravitino-ci-hive:0.1.11
+  - Remove `yarn` from the startup script; Remove `yarn-site.xml` and `yarn-env.sh` files;
+  - Change the value of `mapreduce.framework.name` from `yarn` to `local` in the `mapred-site.xml` file. 
+
 - gravitino-ci-hive:0.1.10
   - Remove SSH service from the startup script.
   - Use `hadoop-daemon.sh` to start HDFS services.

diff --git a/integration-test/build.gradle.kts b/integration-test/build.gradle.kts
@@ -160,7 +160,7 @@ tasks.test {
 
     doFirst {
       // Gravitino CI Docker image
-      environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.10")
+      environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.11")
       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")

diff --git a/integration-test/trino-it/docker-compose.yaml b/integration-test/trino-it/docker-compose.yaml
@@ -6,7 +6,7 @@ version: '3.0'
 services:
 
   hive:
-    image: datastrato/gravitino-ci-hive:0.1.10
+    image: datastrato/gravitino-ci-hive:0.1.11
     networks:
       - trino-net
     container_name: trino-ci-hive