Ngone51 commented on a change in pull request #29906:
URL: https://github.com/apache/spark/pull/29906#discussion_r513226852
##########
File path: core/src/main/scala/org/apache/spark/SparkConf.scala
##########
@@ -612,7 +612,29 @@ private[spark] object SparkConf extends Logging {
DeprecatedConfig("spark.yarn.credentials.file.retention.days", "2.4.0",
"Not used anymore."),
DeprecatedConfig("spark.yarn.services", "3.0.0", "Feature no longer
available."),
DeprecatedConfig("spark.executor.plugins", "3.0.0",
- "Feature replaced with new plugin API. See Monitoring documentation.")
+ "Feature replaced with new plugin API. See Monitoring documentation."),
+ DeprecatedConfig("spark.blacklist.enabled", "3.1.0",
+ "Please use spark.excludeOnFailure.enabled"),
+ DeprecatedConfig("spark.blacklist.task.maxTaskAttemptsPerExecutor",
"3.1.0",
+ "Please use spark.excludeOnFailure.task.maxTaskAttemptsPerExecutor"),
+ DeprecatedConfig("spark.blacklist.task.maxTaskAttemptsPerNode", "3.1.0",
+ "Please use spark.excludeOnFailure.task.maxTaskAttemptsPerNode"),
+
DeprecatedConfig("spark.blacklist.application.maxFailedTasksPerExecutor",
"3.1.0",
+ "Please use
spark.excludeOnFailure.application.maxFailedTasksPerExecutor"),
+ DeprecatedConfig("spark.blacklist.stage.maxFailedTasksPerExecutor",
"3.1.0",
+ "Please use spark.excludeOnFailure.stage.maxFailedTasksPerExecutor"),
+
DeprecatedConfig("spark.blacklist.application.maxFailedExecutorsPerNode",
"3.1.0",
+ "Please use
spark.excludeOnFailure.application.maxFailedExecutorsPerNode"),
+ DeprecatedConfig("spark.blacklist.stage.maxFailedExecutorsPerNode",
"3.1.0",
+ "Please use spark.excludeOnFailure.stage.maxFailedExecutorsPerNode"),
+ DeprecatedConfig("spark.blacklist.timeout", "3.1.0",
+ "Please use spark.excludeOnFailure.timeout"),
+ DeprecatedConfig("spark.scheduler.executorTaskBlacklistTime", "3.1.0",
Review comment:
This one is duplicated? (see L605)
##########
File path: core/src/main/scala/org/apache/spark/internal/config/package.scala
##########
@@ -722,74 +722,83 @@ package object config {
.booleanConf
.createWithDefault(true)
- // Blacklist confs
- private[spark] val BLACKLIST_ENABLED =
- ConfigBuilder("spark.blacklist.enabled")
- .version("2.1.0")
+ private[spark] val EXCLUDE_ON_FAILURE_ENABLED =
+ ConfigBuilder("spark.excludeOnFailure.enabled")
+ .version("3.1.0")
+ .withAlternative("spark.blacklist.enabled")
.booleanConf
.createOptional
private[spark] val MAX_TASK_ATTEMPTS_PER_EXECUTOR =
- ConfigBuilder("spark.blacklist.task.maxTaskAttemptsPerExecutor")
- .version("2.1.0")
+ ConfigBuilder("spark.excludeOnFailure.task.maxTaskAttemptsPerExecutor")
+ .version("3.1.0")
+ .withAlternative("spark.blacklist.task.maxTaskAttemptsPerExecutor")
.intConf
.createWithDefault(1)
private[spark] val MAX_TASK_ATTEMPTS_PER_NODE =
- ConfigBuilder("spark.blacklist.task.maxTaskAttemptsPerNode")
- .version("2.1.0")
+ ConfigBuilder("spark.excludeOnFailure.task.maxTaskAttemptsPerNode")
+ .version("3.1.0")
+ .withAlternative("spark.blacklist.task.maxTaskAttemptsPerNode")
.intConf
.createWithDefault(2)
private[spark] val MAX_FAILURES_PER_EXEC =
- ConfigBuilder("spark.blacklist.application.maxFailedTasksPerExecutor")
- .version("2.2.0")
+
ConfigBuilder("spark.excludeOnFailure.application.maxFailedTasksPerExecutor")
+ .version("3.1.0")
+ .withAlternative("spark.blacklist.application.maxFailedTasksPerExecutor")
.intConf
.createWithDefault(2)
private[spark] val MAX_FAILURES_PER_EXEC_STAGE =
- ConfigBuilder("spark.blacklist.stage.maxFailedTasksPerExecutor")
- .version("2.1.0")
+ ConfigBuilder("spark.excludeOnFailure.stage.maxFailedTasksPerExecutor")
+ .version("3.1.0")
+ .withAlternative("spark.blacklist.stage.maxFailedTasksPerExecutor")
.intConf
.createWithDefault(2)
private[spark] val MAX_FAILED_EXEC_PER_NODE =
- ConfigBuilder("spark.blacklist.application.maxFailedExecutorsPerNode")
- .version("2.2.0")
+
ConfigBuilder("spark.excludeOnFailure.application.maxFailedExecutorsPerNode")
+ .version("3.1.0")
+ .withAlternative("spark.blacklist.application.maxFailedExecutorsPerNode")
.intConf
.createWithDefault(2)
private[spark] val MAX_FAILED_EXEC_PER_NODE_STAGE =
- ConfigBuilder("spark.blacklist.stage.maxFailedExecutorsPerNode")
- .version("2.1.0")
+ ConfigBuilder("spark.excludeOnFailure.stage.maxFailedExecutorsPerNode")
+ .version("3.1.0")
+ .withAlternative("spark.blacklist.stage.maxFailedExecutorsPerNode")
.intConf
.createWithDefault(2)
- private[spark] val BLACKLIST_TIMEOUT_CONF =
- ConfigBuilder("spark.blacklist.timeout")
- .version("2.1.0")
+ private[spark] val EXCLUDE_ON_FAILURE_TIMEOUT_CONF =
+ ConfigBuilder("spark.excludeOnFailure.timeout")
+ .version("3.1.0")
+ .withAlternative("spark.blacklist.timeout")
.timeConf(TimeUnit.MILLISECONDS)
.createOptional
- private[spark] val BLACKLIST_KILL_ENABLED =
- ConfigBuilder("spark.blacklist.killBlacklistedExecutors")
Review comment:
this one is missed in `DeprecatedConfig`?
##########
File path:
resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/config.scala
##########
@@ -379,14 +379,15 @@ package object config extends Logging {
.stringConf
.createOptional
- /* YARN allocator-level blacklisting related config entries. */
- private[spark] val YARN_EXECUTOR_LAUNCH_BLACKLIST_ENABLED =
- ConfigBuilder("spark.yarn.blacklist.executor.launch.blacklisting.enabled")
+ /* YARN allocator-level excludeOnFailure related config entries. */
+ private[spark] val YARN_EXECUTOR_LAUNCH_EXCLUDE_ON_FAILURE_ENABLED =
+ ConfigBuilder("spark.yarn.executor.launch.excludeOnFailure.enabled")
.version("2.4.0")
+
.withAlternative("spark.yarn.blacklist.executor.launch.blacklisting.enabled")
Review comment:
Shall we add it to deprecated config too?
##########
File path: core/src/main/scala/org/apache/spark/scheduler/SparkListener.scala
##########
@@ -25,7 +25,7 @@ import scala.collection.Map
import com.fasterxml.jackson.annotation.JsonTypeInfo
import org.apache.spark.TaskEndReason
-import org.apache.spark.annotation.DeveloperApi
+import org.apache.spark.annotation.{DeveloperApi, Since}
Review comment:
Unused `Since`?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
