Skip to content

Commit 6cfb9ec

Browse files
committed
Code style, revert default minRegisteredRatio of yarn to 0, driver get --num-executors in yarn/alpha
1 parent 812c33c commit 6cfb9ec

File tree

7 files changed

+10
-18
lines changed

7 files changed

+10
-18
lines changed

core/src/main/scala/org/apache/spark/scheduler/TaskScheduler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@ private[spark] trait TaskScheduler {
5454

5555
// Get the default level of parallelism to use in the cluster, as a hint for sizing jobs.
5656
def defaultParallelism(): Int
57-
def waitBackendReady(): Unit = {return}
57+
def waitBackendReady(): Unit = { return }
5858
}

core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,12 +431,13 @@ private[spark] class TaskSchedulerImpl(
431431

432432
// By default, rack is unknown
433433
def getRackForHost(value: String): Option[String] = None
434-
override def waitBackendReady():Unit={
435-
if(backend.isReady){
434+
435+
override def waitBackendReady(): Unit = {
436+
if (backend.isReady) {
436437
return
437438
}
438-
while(!backend.isReady){
439-
synchronized{
439+
while (!backend.isReady) {
440+
synchronized {
440441
this.wait(100)
441442
}
442443
}

core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,14 +254,14 @@ class CoarseGrainedSchedulerBackend(scheduler: TaskSchedulerImpl, actorSystem: A
254254
}
255255

256256
override def isReady(): Boolean = {
257-
if (ready){
257+
if (ready) {
258258
return true
259259
}
260260
if ((System.currentTimeMillis() - createTime) >= maxRegisteredWaitingTime) {
261261
ready = true
262262
return true
263263
}
264-
return false
264+
false
265265
}
266266
}
267267

yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ class ApplicationMaster(args: ApplicationMasterArguments, conf: Configuration,
184184

185185
private def startUserClass(): Thread = {
186186
logInfo("Starting the user JAR in a separate Thread")
187+
System.setProperty("spark.executor.instances", args.numExecutors.toString)
187188
val mainMethod = Class.forName(
188189
args.userClass,
189190
false /* initialize */ ,

yarn/common/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,6 @@ private[spark] class YarnClientSchedulerBackend(
7878
logDebug("ClientArguments called with: " + argsArrayBuf)
7979
val args = new ClientArguments(argsArrayBuf.toArray, conf)
8080
totalExecutors.set(args.numExecutors)
81-
// reset default minRegisteredRatio for yarn mode
82-
if (minRegisteredRatio == 0) {
83-
minRegisteredRatio = 0.9
84-
ready = false
85-
}
8681
client = new Client(args, conf)
8782
appId = client.runApp()
8883
waitForApp()

yarn/common/src/main/scala/org/apache/spark/scheduler/cluster/YarnClusterSchedulerBackend.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,5 @@ private[spark] class YarnClusterSchedulerBackend(
4747
.foreach { case (optName, envVar, sysProp) => addArg(optName, envVar, sysProp, argsArrayBuf) }
4848
val args = new ApplicationMasterArguments(argsArrayBuf.toArray)
4949
totalExecutors.set(args.numExecutors)
50-
// reset default minRegisteredRatio for yarn mode
51-
if (minRegisteredRatio == 0) {
52-
minRegisteredRatio = 0.9
53-
ready = false
54-
}
5550
}
5651
}

yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ class ApplicationMaster(args: ApplicationMasterArguments, conf: Configuration,
164164

165165
private def startUserClass(): Thread = {
166166
logInfo("Starting the user JAR in a separate Thread")
167-
System.setProperty("spark.executor.instances",args.numExecutors.toString)
167+
System.setProperty("spark.executor.instances", args.numExecutors.toString)
168168
val mainMethod = Class.forName(
169169
args.userClass,
170170
false,

0 commit comments

Comments
 (0)