Merge branch 'alibabacloud-v2.4.5' into bugfix/spark-history-server-p…

…ermission
ringtail · May 9, 2020 · 039d3c7 · 039d3c7
2 parents d022598 + d98787d
commit 039d3c7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/Config.scala b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/Config.scala
@@ -239,7 +239,7 @@ private[spark] object Config extends Logging {
       .createOptional
 
   val KUBERNETES_EXECUTOR_NODE_NAME =
-    ConfigBuilder("spark.kubernetes.driver.node.name")
+    ConfigBuilder("spark.kubernetes.executor.node.name")
       .doc("Name of the node of executor pod running on.")
       .stringConf
       .createOptional

diff --git a/...tes/core/src/main/scala/org/apache/spark/deploy/k8s/features/BasicDriverFeatureStep.scala b/...tes/core/src/main/scala/org/apache/spark/deploy/k8s/features/BasicDriverFeatureStep.scala
@@ -46,7 +46,7 @@ private[spark] class BasicDriverFeatureStep(
   private val driverLimitCores = conf.get(KUBERNETES_DRIVER_LIMIT_CORES)
 
   // node name of driver
-  private val driverNodeName = conf.get(KUBERNETES_DRIVER_NODE_NAME)
+  private val driverNodeName = conf.get(KUBERNETES_DRIVER_NODE_NAME).getOrElse("")
 
   // Memory settings
   private val driverMemoryMiB = conf.get(DRIVER_MEMORY)

diff --git a/...s/core/src/main/scala/org/apache/spark/deploy/k8s/features/BasicExecutorFeatureStep.scala b/...s/core/src/main/scala/org/apache/spark/deploy/k8s/features/BasicExecutorFeatureStep.scala
@@ -88,7 +88,7 @@ private[spark] class BasicExecutorFeatureStep(
   private val executorLimitCores =
     kubernetesConf.get(KUBERNETES_EXECUTOR_LIMIT_CORES)
 
-  private val executorNodeName = kubernetesConf.get(KUBERNETES_EXECUTOR_NODE_NAME)
+  private val executorNodeName = kubernetesConf.get(KUBERNETES_EXECUTOR_NODE_NAME).getOrElse("")
 
   override def configurePod(pod: SparkPod): SparkPod = {
     val name =

diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile
@@ -38,7 +38,7 @@ ARG k8s_tests=kubernetes/tests
 RUN set -ex && \
     apt-get update && \
     ln -s /lib /lib64 && \
-    apt install -y bash tini libc6 libpam-modules libnss3 && \
+    apt install -y bash tini libc6 libpam-modules libnss3 nscd && \
     mkdir -p /opt/spark && \
     mkdir -p /opt/spark/work-dir && \
     touch /opt/spark/RELEASE && \

diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/entrypoint.sh b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/entrypoint.sh
@@ -16,6 +16,9 @@
 # limitations under the License.
 #
 
+# nscd start
+service nscd start
+
 # echo commands to the terminal output
 set -ex
 

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
@@ -25,4 +25,3 @@ fi
 . "${SPARK_HOME}/bin/load-spark-env.sh"
 
 exec "${SPARK_HOME}/sbin"/spark-daemon.sh start org.apache.spark.deploy.history.HistoryServer 1 "$@"
-