A minor change in sparkContext and heartbeatReceiver

alexrovner · Feb 12, 2015 · 7448ac6 · 7448ac6
1 parent b904aed
commit 7448ac6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/core/src/main/scala/org/apache/spark/HeartbeatReceiver.scala b/core/src/main/scala/org/apache/spark/HeartbeatReceiver.scala
@@ -83,7 +83,7 @@ private[spark] class HeartbeatReceiver(sc: SparkContext, scheduler: TaskSchedule
         logWarning(s"Removing executor $executorId with no recent heartbeats: " +
           s"${now - lastSeenMs} ms exceeds timeout $executorTimeout ms")
         scheduler.executorLost(executorId, SlaveLost())
-        if(sc.supportKillExecutor()) {
+        if (sc.supportKillExecutor()) {
           sc.killExecutor(executorId)
         }
         executorLastSeen.remove(executorId)

diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -1034,14 +1034,8 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
     logInfo("Added file " + path + " at " + key + " with timestamp " + addedFiles(key))
     postEnvironmentUpdate()
   }
-
-  def supportKillExecutor(): Boolean = {
-    if(master.contains("yarn") || dynamicAllocationTesting) {
-      true
-    } else {
-      false
-    }
-  }
+
+  private[spark] def supportKillExecutor = master.contains("yarn") || dynamicAllocationTesting
 
   /**
    * :: DeveloperApi ::