Use ALLUXIO_FUSE_OPTS when creating FUSE container

This intends to resolve the below issues by fixing how ALLUXIO_FUSE_JAVA_OPTS is generated and exported Alluxio#11899 Alluxio#11802 pr-link: Alluxio#11971 change-id: cid-9c8e1a254b071986982323e65ea5b333c592de97
magicsilence · Aug 18, 2020 · 9be8860 · 9be8860
1 parent eb9e8fe
commit 9be8860
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/integration/docker/entrypoint.sh b/integration/docker/entrypoint.sh
@@ -31,6 +31,7 @@ ALLUXIO_ENV_VARS=(
   ALLUXIO_WORKER_JAVA_OPTS
   ALLUXIO_JOB_MASTER_JAVA_OPTS
   ALLUXIO_JOB_WORKER_JAVA_OPTS
+  ALLUXIO_FUSE_JAVA_OPTS
 )
 
 function printUsage {

diff --git a/integration/kubernetes/helm-chart/alluxio/CHANGELOG.md b/integration/kubernetes/helm-chart/alluxio/CHANGELOG.md
@@ -134,3 +134,7 @@
 0.6.10
 
 - Change liveness and readiness probes to TCP probes
+
+0.6.11
+
+- Pass alluxio.user.hostname via ALLUXIO_FUSE_JAVA_OPTS for FUSE
diff --git a/integration/kubernetes/helm-chart/alluxio/Chart.yaml b/integration/kubernetes/helm-chart/alluxio/Chart.yaml
@@ -12,7 +12,7 @@
 name: alluxio
 apiVersion: v1
 description: Open source data orchestration for analytics and machine learning in any cloud.
-version: 0.6.10
+version: 0.6.11
 home: https://www.alluxio.io/
 maintainers:
 - name: Adit Madan

diff --git a/integration/kubernetes/helm-chart/alluxio/templates/config/alluxio-conf.yaml b/integration/kubernetes/helm-chart/alluxio/templates/config/alluxio-conf.yaml
@@ -148,6 +148,7 @@
 {{- /*        ALLUXIO_FUSE_JAVA_OPTS         */}}
 {{- /* ===================================== */}}
 {{- $fuseJavaOpts := list }}
+{{- $fuseJavaOpts = print "-Dalluxio.user.hostname=${ALLUXIO_CLIENT_HOSTNAME}" | append $fuseJavaOpts }}
 {{- range $key, $val := .Values.fuse.properties }}
   {{- $fuseJavaOpts = printf "-D%v=%v" $key $val | append $fuseJavaOpts }}
 {{- end }}

diff --git a/integration/kubernetes/helm-chart/alluxio/templates/fuse/daemonset.yaml b/integration/kubernetes/helm-chart/alluxio/templates/fuse/daemonset.yaml
@@ -94,8 +94,6 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: status.hostIP
-          - name: ALLUXIO_USER_JAVA_OPTS
-            value: " -Dalluxio.user.hostname=${ALLUXIO_CLIENT_HOSTNAME} "
           {{- range $key, $value := .Values.fuse.env }}
           - name: "{{ $key }}"
             value: "{{ $value }}"
-Original file line number
+Diff line change
@@ Expand Up / @@ -134,3 +134,7 @@ @@
 .6.10
     - Change liveness and readiness probes to TCP probes
+.6.11
+    - Pass alluxio.user.hostname via ALLUXIO_FUSE_JAVA_OPTS for FUSE