From 58969bb8dc49374e0adbeecf52b8a70cd1e5bd8d Mon Sep 17 00:00:00 2001
From: Johannes Unterstein <junterstein@mesosphere.io>
Date: Tue, 26 Jul 2016 16:12:07 +0200
Subject: [PATCH] reverted recent change #1

---
 .../scala/mesosphere/marathon/MarathonSchedulerActor.scala   | 5 ++++-
 src/main/scala/mesosphere/marathon/core/task/Task.scala      | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/mesosphere/marathon/MarathonSchedulerActor.scala b/src/main/scala/mesosphere/marathon/MarathonSchedulerActor.scala
index 00a1ecc9792..bb901146641 100644
--- 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
index 14a081a8a49..65e4f40165a 100644
--- 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
   }
 }