Only reduce the number of cores once when removing an executor

mbautin · markhamstra · commit e8bec8365f65 · 2013-08-05T13:13:56.000-07:00
diff --git a/core/src/main/scala/spark/deploy/master/ApplicationInfo.scala b/core/src/main/scala/spark/deploy/master/ApplicationInfo.scala
@@ -52,8 +52,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

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,10 @@ private[spark] class ApplicationInfo(`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`def removeExecutor(exec: ExecutorInfo) {`
`55`		`- executors -= exec.id`
`56`		`- coresGranted -= exec.cores`
	`55`	`+ if (executors.contains(exec.id)) {`
	`56`	`+ executors -= exec.id`
	`57`	`+ coresGranted -= exec.cores`
	`58`	`+ }`
`57`	`59`	`}`
`58`	`60`
`59`	`61`	`def coresLeft: Int = desc.maxCores - coresGranted`