refactor: changed directory names

Author: saptarshi-datazip

Makefile

@@ -18,7 +18,7 @@
 
 COMPOSE_DIR  := local-test
 KIND_CLUSTER := fusion-cluster
-AMORO_LOG_DIR ?= $(CURDIR)/docker/kind/amoro-logs
+FUSION_LOG_DIR ?= $(CURDIR)/docker/kind/fusion-logs
 DIST_TAR     := $(CURDIR)/dist/target/apache-amoro-0.9-SNAPSHOT-bin.tar.gz
 RUNTIME_HOME := $(CURDIR)/dist/target/amoro-0.9-SNAPSHOT
 BIN_HOME     := $(CURDIR)/dist/src/main/amoro-bin
@@ -119,8 +119,8 @@ stop-deps:
 
 start-fusion-docker:
 	@echo "Starting Fusion (Kind cluster + all services)..."
-	@mkdir -p "$(AMORO_LOG_DIR)"
-	@AMORO_LOG_DIR="$(AMORO_LOG_DIR)" docker compose -f $(COMPOSE_DIR)/docker-compose.yml --profile prod up -d
+	@mkdir -p "$(FUSION_LOG_DIR)"
+	@FUSION_LOG_DIR="$(FUSION_LOG_DIR)" docker compose -f $(COMPOSE_DIR)/docker-compose.yml --profile prod up -d
 	@kind export kubeconfig --name $(KIND_CLUSTER) 2>/dev/null
 
 clean-fusion-docker:

dist/src/main/amoro-bin/bin/load-config.sh

@@ -29,11 +29,19 @@ else
 fi
 
 if [ -z "$AMORO_LOG_DIR" ]; then
-    export AMORO_LOG_DIR="${AMORO_HOME}/logs"
+    if [ -n "$LOG_DIR" ]; then
+        export AMORO_LOG_DIR="$LOG_DIR"
+    else
+        export AMORO_LOG_DIR="${AMORO_HOME}/logs"
+    fi
 fi
 
 if [ -z "$AMORO_CONF_DIR" ]; then
-    export AMORO_CONF_DIR="${AMORO_HOME}/conf"
+    if [ -n "$FUSION_CONF_DIR" ]; then
+        export AMORO_CONF_DIR="$FUSION_CONF_DIR"
+    else
+        export AMORO_CONF_DIR="${AMORO_HOME}/conf"
+    fi
 fi
 
 if [ -z "$AMORO_LOG_CONF_FILE" ]; then

docker/amoro/Dockerfile

@@ -37,22 +37,21 @@ RUN AMORO_VERSION=`cat pom.xml | grep 'amoro-parent' -C 3 | grep -Eo '<version>.
     && tar -xzvf /usr/local/apache-amoro-${AMORO_VERSION}-bin.tar.gz -C /usr/local \
     && rm /usr/local/amoro-${AMORO_VERSION}/plugin/optimizer/flink -rf \
     && rm /usr/local/amoro-${AMORO_VERSION}/plugin/optimizer/spark -rf \
-    && mv /usr/local/amoro-${AMORO_VERSION} /usr/local/amoro \
+    && mv /usr/local/amoro-${AMORO_VERSION} /usr/local/fusion \
     && rm -rf /workspace/amoro
 
 
 FROM eclipse-temurin:17-jdk-jammy
 
 ARG MAVEN_MIRROR=https://repo.maven.apache.org/maven2
 
-ENV AMORO_HOME /usr/local/amoro
-ENV AMORO_CONF_DIR ${AMORO_HOME}/conf
-ENV LOG_LEVEL info
+ENV AMORO_HOME=/usr/local/fusion
+ENV LOG_LEVEL=info
 EXPOSE 1630 1260 1261
 
 COPY ./docker/amoro/entrypoint.sh /
 RUN chmod +x /entrypoint.sh
-COPY --from=builder "/usr/local/amoro" "/usr/local/amoro"
+COPY --from=builder "/usr/local/fusion" "/usr/local/fusion"
 
 WORKDIR ${AMORO_HOME}
 

docker/amoro/entrypoint.sh

@@ -27,6 +27,12 @@ if [ -n "$LOG_LEVEL" ]; then
   export CONSOLE_LOG_LEVEL=$LOG_LEVEL
 fi
 
+if [ -n "$FUSION_CONF_DIR" ]; then
+  export AMORO_CONF_DIR="$FUSION_CONF_DIR"
+elif [ -z "$AMORO_CONF_DIR" ]; then
+  export AMORO_CONF_DIR="${AMORO_HOME}/conf"
+fi
+
 configure_jvm_options() {
   JVM_PROPERTIES_FILE="${AMORO_CONF_DIR}/jvm.properties"
   for option in $(printenv | perl -sne 'print "$1 " if m/^JVM_(.+?)=.*/' ); do

local-test/config.yaml

@@ -183,12 +183,14 @@ containers:
       spark-conf.spark.kubernetes.executor.secretKeyRef.AWS_SECRET_ACCESS_KEY: "fusion-s3-credentials:secret-access-key"
       # Mount shared log volume so driver/executor pods write logs to the same path
       # that LogController reads from (via the Kind node hostPath extraMount).
-      spark-conf.spark.kubernetes.driver.volumes.hostPath.amoro-logs.mount.path: "/mnt/amoro-logs"
-      spark-conf.spark.kubernetes.driver.volumes.hostPath.amoro-logs.mount.readOnly: "false"
-      spark-conf.spark.kubernetes.driver.volumes.hostPath.amoro-logs.options.path: "/mnt/amoro-logs"
-      spark-conf.spark.kubernetes.executor.volumes.hostPath.amoro-logs.mount.path: "/mnt/amoro-logs"
-      spark-conf.spark.kubernetes.executor.volumes.hostPath.amoro-logs.mount.readOnly: "false"
-      spark-conf.spark.kubernetes.executor.volumes.hostPath.amoro-logs.options.path: "/mnt/amoro-logs"
+      spark-conf.spark.kubernetes.driver.volumes.hostPath.fusion-logs.mount.path: "/mnt/fusion-logs"
+      spark-conf.spark.kubernetes.driver.volumes.hostPath.fusion-logs.mount.readOnly: "false"
+      spark-conf.spark.kubernetes.driver.volumes.hostPath.fusion-logs.options.path: "/mnt/fusion-logs"
+      spark-conf.spark.kubernetes.executor.volumes.hostPath.fusion-logs.mount.path: "/mnt/fusion-logs"
+      spark-conf.spark.kubernetes.executor.volumes.hostPath.fusion-logs.mount.readOnly: "false"
+      spark-conf.spark.kubernetes.executor.volumes.hostPath.fusion-logs.options.path: "/mnt/fusion-logs"
+      spark-conf.spark.kubernetes.driverEnv.LOG_DIR: "/mnt/fusion-logs"
+      spark-conf.spark.kubernetes.executorEnv.LOG_DIR: "/mnt/fusion-logs"
       # Force Log4j2 to use the routing config (belt-and-suspenders with the Dockerfile COPY)
       spark-conf.spark.driver.extraJavaOptions: "-Dlog4j2.configurationFile=file:///opt/spark/conf/log4j2.xml"
       spark-conf.spark.executor.extraJavaOptions: "-Dlog4j2.configurationFile=file:///opt/spark/conf/log4j2.xml"

local-test/docker-compose.yml

@@ -42,12 +42,12 @@ services:
       KUBECONFIG: /root/.kube/config
       AWS_ACCESS_KEY_ID: admin
       AWS_SECRET_ACCESS_KEY: password
-      LOG_DIR: /mnt/amoro-logs/compaction
+      LOG_DIR: /mnt/fusion-logs
     volumes:
-      - ./config.yaml:/usr/local/amoro/conf/config.yaml:ro
+      - ./config.yaml:/usr/local/fusion/conf/config.yaml:ro
       - kind-kubeconfig:/root/.kube:ro
       - spark-home:/opt/spark:ro
-      - ${AMORO_LOG_DIR:-/opt/amoro-logs}:/mnt/amoro-logs
+      - ${FUSION_LOG_DIR:-/opt/fusion-logs}:/mnt/fusion-logs
     command: ["/entrypoint.sh", "ams"]
     tty: true
     stdin_open: true
@@ -246,7 +246,7 @@ services:
     networks:
       iceberg-net:
     environment:
-      AMORO_LOG_DIR: ${AMORO_LOG_DIR:-/opt/amoro-logs}
+      FUSION_LOG_DIR: ${FUSION_LOG_DIR:-/opt/fusion-logs}
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - kind-kubeconfig:/output
@@ -258,11 +258,11 @@ services:
       - |
         set -e
 
-        LOG_DIR="$${AMORO_LOG_DIR:-/opt/amoro-logs}"
+        LOG_DIR="$${FUSION_LOG_DIR:-/opt/fusion-logs}"
         echo "==> Log directory: $$LOG_DIR"
 
         echo "==> Generating kind cluster config..."
-        sed "s|AMORO_LOG_PLACEHOLDER|$$LOG_DIR|g" /kind-config.yaml > /tmp/kind-config-gen.yaml
+        sed "s|FUSION_LOG_PLACEHOLDER|$$LOG_DIR|g" /kind-config.yaml > /tmp/kind-config-gen.yaml
 
         echo "==> Installing kind..."
         apk add --no-cache curl >/dev/null 2>&1

local-test/kind-config.yaml

@@ -27,8 +27,8 @@ nodes:
   - role: control-plane
     image: kindest/node:v1.28.0
     extraMounts:
-      - hostPath: AMORO_LOG_PLACEHOLDER
-        containerPath: /mnt/amoro-logs
+      - hostPath: FUSION_LOG_PLACEHOLDER
+        containerPath: /mnt/fusion-logs
     kubeadmConfigPatches:
       - |
         kind: InitConfiguration
@@ -46,8 +46,8 @@ nodes:
   - role: worker
     image: kindest/node:v1.28.0
     extraMounts:
-      - hostPath: AMORO_LOG_PLACEHOLDER
-        containerPath: /mnt/amoro-logs
+      - hostPath: FUSION_LOG_PLACEHOLDER
+        containerPath: /mnt/fusion-logs
     kubeadmConfigPatches:
       - |
         kind: JoinConfiguration
@@ -57,8 +57,8 @@ nodes:
   - role: worker
     image: kindest/node:v1.28.0
     extraMounts:
-      - hostPath: AMORO_LOG_PLACEHOLDER
-        containerPath: /mnt/amoro-logs
+      - hostPath: FUSION_LOG_PLACEHOLDER
+        containerPath: /mnt/fusion-logs
     kubeadmConfigPatches:
       - |
         kind: JoinConfiguration