You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by js...@apache.org on 2018/02/01 06:03:35 UTC
spark git commit: Revert "[SPARK-23200] Reset Kubernetes-specific
config on Checkpoint restore"
Repository: spark
Updated Branches:
refs/heads/master b6b50efc8 -> 4b7cd479a
Revert "[SPARK-23200] Reset Kubernetes-specific config on Checkpoint restore"
This reverts commit d1721816d26bedee3c72eeb75db49da500568376.
The patch is not fully tested and out-of-date. So revert it.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4b7cd479
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4b7cd479
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4b7cd479
Branch: refs/heads/master
Commit: 4b7cd479a28b274f5a0802c9b017b3eb15002c21
Parents: b6b50ef
Author: jerryshao <ss...@hortonworks.com>
Authored: Thu Feb 1 13:58:13 2018 +0800
Committer: jerryshao <ss...@hortonworks.com>
Committed: Thu Feb 1 14:00:08 2018 +0800
----------------------------------------------------------------------
.../org/apache/spark/streaming/Checkpoint.scala | 16 ----------------
1 file changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/4b7cd479/streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala
----------------------------------------------------------------------
diff --git a/streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala b/streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala
index ed2a896..aed67a5 100644
--- a/streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala
+++ b/streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala
@@ -53,21 +53,6 @@ class Checkpoint(ssc: StreamingContext, val checkpointTime: Time)
"spark.driver.host",
"spark.driver.bindAddress",
"spark.driver.port",
- "spark.kubernetes.driver.pod.name",
- "spark.kubernetes.executor.podNamePrefix",
- "spark.kubernetes.initcontainer.executor.configmapname",
- "spark.kubernetes.initcontainer.executor.configmapkey",
- "spark.kubernetes.initcontainer.downloadJarsResourceIdentifier",
- "spark.kubernetes.initcontainer.downloadJarsSecretLocation",
- "spark.kubernetes.initcontainer.downloadFilesResourceIdentifier",
- "spark.kubernetes.initcontainer.downloadFilesSecretLocation",
- "spark.kubernetes.initcontainer.remoteJars",
- "spark.kubernetes.initcontainer.remoteFiles",
- "spark.kubernetes.mountdependencies.jarsDownloadDir",
- "spark.kubernetes.mountdependencies.filesDownloadDir",
- "spark.kubernetes.initcontainer.executor.stagingServerSecret.name",
- "spark.kubernetes.initcontainer.executor.stagingServerSecret.mountDir",
- "spark.kubernetes.executor.limit.cores",
"spark.master",
"spark.yarn.jars",
"spark.yarn.keytab",
@@ -81,7 +66,6 @@ class Checkpoint(ssc: StreamingContext, val checkpointTime: Time)
val newSparkConf = new SparkConf(loadDefaults = false).setAll(sparkConfPairs)
.remove("spark.driver.host")
.remove("spark.driver.bindAddress")
- .remove("spark.kubernetes.driver.pod.name")
.remove("spark.driver.port")
val newReloadConf = new SparkConf(loadDefaults = true)
propertiesToReload.foreach { prop =>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org