Ngone51 commented on a change in pull request #24856: [SPARK-27823] [CORE]
Refactor resource handling code
URL: https://github.com/apache/spark/pull/24856#discussion_r293843677
##########
File path: core/src/main/scala/org/apache/spark/SparkContext.scala
##########
@@ -2723,44 +2689,50 @@ object SparkContext extends Logging {
// Calculate the max slots each executor can provide based on resources
available on each
// executor and resources required by each task.
- val taskResourcesAndCount = sc.conf.getTaskResourceRequirements()
- val executorResourcesAndCounts = sc.conf.getAllWithPrefixAndSuffix(
- SPARK_EXECUTOR_RESOURCE_PREFIX, SPARK_RESOURCE_AMOUNT_SUFFIX).toMap
+ val taskResourceRequirements = parseTaskResourceRequirements(sc.conf)
+ val executorResourcesAndCounts =
+ parseAllResourceRequests(sc.conf, SPARK_EXECUTOR_PREFIX)
+ .map(request => (request.id.resourceName, request.amount)).toMap
var numSlots = execCores / taskCores
var limitingResourceName = "CPU"
- taskResourcesAndCount.foreach { case (rName, taskCount) =>
+
+ taskResourceRequirements.foreach { taskReq =>
// Make sure the executor resources were specified through config.
- val execCount = executorResourcesAndCounts.getOrElse(rName,
- throw new SparkException(
- s"The executor resource config: " +
- s"${SPARK_EXECUTOR_RESOURCE_PREFIX + rName +
SPARK_RESOURCE_AMOUNT_SUFFIX} " +
- "needs to be specified since a task requirement config: " +
- s"${SPARK_TASK_RESOURCE_PREFIX + rName +
SPARK_RESOURCE_AMOUNT_SUFFIX} was specified")
+ val execCount =
executorResourcesAndCounts.getOrElse(taskReq.resourceName,
+ throw new SparkException("The executor resource config: " +
+ ResourceID(SPARK_EXECUTOR_PREFIX, taskReq.resourceName).amountConf
+
+ " needs to be specified since a task requirement config: " +
+ ResourceID(SPARK_TASK_PREFIX, taskReq.resourceName).amountConf +
+ " was specified")
)
// Make sure the executor resources are large enough to launch at
least one task.
- if (execCount.toLong < taskCount.toLong) {
- throw new SparkException(
- s"The executor resource config: " +
- s"${SPARK_EXECUTOR_RESOURCE_PREFIX + rName +
SPARK_RESOURCE_AMOUNT_SUFFIX} " +
- s"= $execCount has to be >= the task config: " +
- s"${SPARK_TASK_RESOURCE_PREFIX + rName +
SPARK_RESOURCE_AMOUNT_SUFFIX} = $taskCount")
+ if (execCount < taskReq.amount) {
+ throw new SparkException("The executor resource config: " +
+ ResourceID(SPARK_EXECUTOR_PREFIX, taskReq.resourceName).amountConf
+
+ s" = $execCount has to be >= the task config: " +
Review comment:
Just for symmetry: executor resource config <-> task resource config
----------------------------------------------------------------
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:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
