reverted recent change #1

d2iq-archive · Jul 26, 2016 · 58969bb · 58969bb
1 parent 089453b
commit 58969bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/main/scala/mesosphere/marathon/MarathonSchedulerActor.scala b/src/main/scala/mesosphere/marathon/MarathonSchedulerActor.scala
@@ -527,7 +527,10 @@ class SchedulerActions(
   def scale(driver: SchedulerDriver, app: AppDefinition): Unit = {
     import SchedulerActions._
 
-    val launchedCount = taskTracker.countAppTasksSync(app.id, _.isReachable)
+    def launchedNotLost(t: Task) = t.launched.isDefined && !t.isLost
+
+    val launchedCount = taskTracker.countAppTasksSync(app.id, launchedNotLost)
+
     val targetCount = app.instances
 
     if (targetCount > launchedCount) {

diff --git a/src/main/scala/mesosphere/marathon/core/task/Task.scala b/src/main/scala/mesosphere/marathon/core/task/Task.scala
@@ -493,5 +493,6 @@ object Task {
     def isDropped: Boolean = task.status.taskStatus == MarathonTaskStatus.Unknown
 
     def isReachable: Boolean = isStaging || isStarting || isRunning || isKilling
+    def isLost: Boolean = isDropped || isUnknown || isGone || isUnreachable
   }
 }