turboFei commented on code in PR #3088: URL: https://github.com/apache/celeborn/pull/3088#discussion_r1953450350
########## assets/spark-patch/Celeborn_Dynamic_Allocation_spark3_5.patch: ########## @@ -0,0 +1,98 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Subject: [PATCH] [CORE][SHUFFLE] Support enabling DRA with Apache Celeborn +--- +Index: core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala b/core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala +index 441bf60e489..8e967825fd3 100644 +--- a/core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala ++++ b/core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala +@@ -210,7 +210,7 @@ private[spark] class ExecutorAllocationManager( + } else if (decommissionEnabled && + conf.get(config.STORAGE_DECOMMISSION_SHUFFLE_BLOCKS_ENABLED)) { + logInfo("Shuffle data decommission is enabled without a shuffle service.") +- } else if (!testing) { ++ } else if (!testing && !Utils.isCelebornEnabled(conf)) { + throw new SparkException("Dynamic allocation of executors requires one of the " + + "following conditions: 1) enabling external shuffle service through " + + s"${config.SHUFFLE_SERVICE_ENABLED.key}. 2) enabling shuffle tracking through " + +diff --git a/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala b/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala +index 89d16e57934..d7456d37e46 100644 +--- a/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala ++++ b/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala +@@ -2585,7 +2585,8 @@ private[spark] class DAGScheduler( + // if the cluster manager explicitly tells us that the entire worker was lost, then + // we know to unregister shuffle output. (Note that "worker" specifically refers to the process + // from a Standalone cluster, where the shuffle service lives in the Worker.) +- val fileLost = !sc.shuffleDriverComponents.supportsReliableStorage() && ++ val fileLost = !Utils.isCelebornEnabled(sc.getConf) && ++ !sc.shuffleDriverComponents.supportsReliableStorage() && Review Comment: Per the doc: ``` # Support Spark Dynamic Resource Allocation # Required Spark version >= 3.5.0 spark.shuffle.sort.io.plugin.class org.apache.spark.shuffle.celeborn.CelebornShuffleDataIO ``` -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
