Merge pull request #10 from mbautin/master-csd_fix_app_cores_granted

Only reduce the number of cores once when removing an executor
alteryx · Aug 1, 2013 · 2b3a795 · 2b3a795
2 parents ceaa47d + fa1918e
commit 2b3a795
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/src/main/scala/spark/deploy/master/ApplicationInfo.scala b/core/src/main/scala/spark/deploy/master/ApplicationInfo.scala
@@ -34,8 +34,10 @@ private[spark] class ApplicationInfo(
   }
 
   def removeExecutor(exec: ExecutorInfo) {
-    executors -= exec.id
-    coresGranted -= exec.cores
+    if (executors.contains(exec.id)) {
+      executors -= exec.id
+      coresGranted -= exec.cores
+    }
   }
 
   def coresLeft: Int = desc.maxCores - coresGranted

diff --git a/libpeerconnection.log b/libpeerconnection.log