Skip to content

[SPARK-46696][CORE] In ResourceProfileManager, function calls should occur after variable declarations #44705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lyy-pineapple wants to merge 4 commits into from
Closed

[SPARK-46696][CORE] In ResourceProfileManager, function calls should occur after variable declarations #44705

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70d47f4
[SPARK-46696][CORE] In ResourceProfileManager, function calls should …
lyy-pineapple Jan 12, 2024
c297412
fix
lyy-pineapple Jan 12, 2024
1a6c751
fix
lyy-pineapple Jan 12, 2024
8944f63
add assert
lyy-pineapple Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions core/src/main/scala/org/apache/spark/resource/ResourceProfileManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@ private[spark] class ResourceProfileManager(sparkConf: SparkConf,
(lock.readLock(), lock.writeLock())
}

private val defaultProfile = ResourceProfile.getOrCreateDefaultProfile(sparkConf)
addResourceProfile(defaultProfile)

def defaultResourceProfile: ResourceProfile = defaultProfile

private val dynamicEnabled = Utils.isDynamicAllocationEnabled(sparkConf)
private val master = sparkConf.getOption("spark.master")
private val isYarn = master.isDefined && master.get.equals("yarn")
Expand All @@ -60,12 +55,18 @@ private[spark] class ResourceProfileManager(sparkConf: SparkConf,
private val notRunningUnitTests = !isTesting
private val testExceptionThrown = sparkConf.get(RESOURCE_PROFILE_MANAGER_TESTING)

private val defaultProfile = ResourceProfile.getOrCreateDefaultProfile(sparkConf)
addResourceProfile(defaultProfile)

def defaultResourceProfile: ResourceProfile = defaultProfile

/**
* If we use anything except the default profile, it's supported on YARN, Kubernetes and
* Standalone with dynamic allocation enabled, and task resource profile with dynamic allocation
* disabled on Standalone. Throw an exception if not supported.
*/
private[spark] def isSupported(rp: ResourceProfile): Boolean = {
assert(master != null)
if (rp.isInstanceOf[TaskResourceProfile] && !dynamicEnabled) {
if ((notRunningUnitTests || testExceptionThrown) &&
!(isStandaloneOrLocalCluster || isYarn || isK8s)) {
Expand Down