Merge pull request apache#44 in BDP/apache-spark from fix_min_reg_resources_wait to netflix/2.1.1-unstable

dgshep · dgshep · commit 8522eea842a5 · 2018-09-19T19:29:31.000Z
* commit 'd68183c4087fb436a7e62d739804c1765f734184':
  Only check for minRegistered ratio if maxCoresOption is set
diff --git a/mesos/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosCoarseGrainedSchedulerBackend.scala b/mesos/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosCoarseGrainedSchedulerBackend.scala
@@ -276,7 +276,7 @@ private[spark] class MesosCoarseGrainedSchedulerBackend(
   }
 
   override def sufficientResourcesRegistered(): Boolean = {
-    totalCoreCount.get >= maxCoresOption.getOrElse(0) * minRegisteredRatio
+    maxCoresOption.isEmpty || totalCoreCount.get >= maxCores * minRegisteredRatio
   }
 
   override def disconnected(d: org.apache.mesos.SchedulerDriver) {}

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ private[spark] class MesosCoarseGrainedSchedulerBackend(`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`override def sufficientResourcesRegistered(): Boolean = {`
`279`		`- totalCoreCount.get >= maxCoresOption.getOrElse(0) * minRegisteredRatio`
	`279`	`+ maxCoresOption.isEmpty \|\| totalCoreCount.get >= maxCores * minRegisteredRatio`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`override def disconnected(d: org.apache.mesos.SchedulerDriver) {}`