Merge pull request apache#13 from ringtail/bugfix/spark-history-serve…

…r-permission change entrypoint of history server
ringtail · May 9, 2020 · 91006e7 · 91006e7
2 parents d98787d + 039d3c7
commit 91006e7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/historyserver/Dockerfile b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/historyserver/Dockerfile
@@ -3,7 +3,8 @@ FROM $base_img
 # Add dependency for alibaba cloud
 ADD https://repo1.maven.org/maven2/com/aliyun/odps/hadoop-fs-oss/3.3.8-public/hadoop-fs-oss-3.3.8-public.jar $SPARK_HOME/jars
 ADD https://repo1.maven.org/maven2/com/aliyun/oss/aliyun-sdk-oss/3.8.1/aliyun-sdk-oss-3.8.1.jar $SPARK_HOME/jars
-
+ADD https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.5/aspectjweaver-1.9.5.jar $SPARK_HOME/jars
+ADD https://repo1.maven.org/maven2/org/jdom/jdom/1.1.3/jdom-1.1.3.jar $SPARK_HOME/jars
 # change default entrypoint
 ADD resource-managers/kubernetes/docker/src/main/dockerfiles/spark/historyserver/entrypoint.sh /opt/entrypoint.sh
 RUN chmod +x /opt/entrypoint.sh

diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/historyserver/entrypoint.sh b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/historyserver/entrypoint.sh
@@ -9,12 +9,19 @@ elif [[ "$enableOSS" == "true" ]];then
   export SPARK_HISTORY_OPTS="$SPARK_HISTORY_OPTS \
     -Dspark.history.fs.logDirectory=$eventsDir \
     -Dspark.hadoop.fs.oss.endpoint=$alibabaCloudOSSEndpoint \
-    -Dspark.hadoop.fs.oss.accessKeySecret=$alibabaCloudAccessKeyId \
-    -Dspark.hadoop.fs.oss.accessKeyId=$alibabaCloudAccessKeySecret \
+    -Dspark.hadoop.fs.oss.accessKeySecret=$alibabaCloudAccessKeySecret \
+    -Dspark.hadoop.fs.oss.accessKeyId=$alibabaCloudAccessKeyId \
     -Dspark.hadoop.fs.oss.impl=org.apache.hadoop.fs.aliyun.oss.AliyunOSSFileSystem";
 else
     export SPARK_HISTORY_OPTS="$SPARK_HISTORY_OPTS \
     -Dspark.history.fs.logDirectory=$eventsDir";
 fi;
 
-exec /usr/bin/tini -s -- /opt/spark/bin/spark-class org.apache.spark.deploy.history.HistoryServer
+if [ -z "${SPARK_HOME}" ]; then
+  export SPARK_HOME="$(cd "`dirname "$0"`"/..; pwd)"
+fi
+
+. "${SPARK_HOME}/sbin/spark-config.sh"
+. "${SPARK_HOME}/bin/load-spark-env.sh"
+
+exec "${SPARK_HOME}/sbin"/spark-daemon.sh start org.apache.spark.deploy.history.HistoryServer 1 "$@"