Remove assert in SparkContext.killExecutors

Author: shenh062326

core/src/main/scala/org/apache/spark/HeartbeatReceiver.scala

@@ -61,7 +61,7 @@ private[spark] class HeartbeatReceiver(sc: SparkContext, scheduler: TaskSchedule
     import context.dispatcher
     timeoutCheckingTask = context.system.scheduler.schedule(0.seconds,
       checkTimeoutInterval.milliseconds, self, ExpireDeadHosts)
-    super.preStart
+    super.preStart()
   }
 
   override def receiveWithLogging = {
@@ -80,8 +80,8 @@ private[spark] class HeartbeatReceiver(sc: SparkContext, scheduler: TaskSchedule
     val minSeenTime = now - executorTimeout
     for ((executorId, lastSeenMs) <- executorLastSeen) {
       if (lastSeenMs < minSeenTime) {
-        logWarning("Removing Executor " + executorId + " with no recent heartbeats: "
-          + (now - lastSeenMs) + " ms exceeds " + executorTimeout + "ms")
+        logWarning(s"Removing executor $executorId with no recent heartbeats: " +
+          s"${now - lastSeenMs} ms exceeds timeout $executorTimeout ms")
         scheduler.executorLost(executorId, SlaveLost())
         sc.killExecutor(executorId)
         executorLastSeen.remove(executorId)

core/src/main/scala/org/apache/spark/SparkContext.scala

@@ -1069,14 +1069,17 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
    */
   @DeveloperApi
   override def killExecutors(executorIds: Seq[String]): Boolean = {
-    assert(master.contains("yarn") || dynamicAllocationTesting,
-      "Killing executors is currently only supported in YARN mode")
-    schedulerBackend match {
-      case b: CoarseGrainedSchedulerBackend =>
-        b.killExecutors(executorIds)
-      case _ =>
-        logWarning("Killing executors is only supported in coarse-grained mode")
-        false
+    if (master.contains("yarn") || dynamicAllocationTesting) {
+      schedulerBackend match {
+        case b: CoarseGrainedSchedulerBackend =>
+          b.killExecutors(executorIds)
+        case _ =>
+          logWarning("Killing executors is only supported in coarse-grained mode")
+          false
+      }
+    } else {
+      logWarning("Killing executors is currently only supported in YARN mode")
+      false
     }
   }