Update blocklist to excluded

Author: tgravescs

core/src/main/scala/org/apache/spark/scheduler/HealthTracker.scala

@@ -39,7 +39,7 @@ import org.apache.spark.util.{Clock, SystemClock, Utils}
  *  * many small stages -- this may prevent a bad executor for having many failures within one
  *      stage, but still many failures over the entire application
  *  * "flaky" executors -- they don't fail every task, but are still faulty enough to merit
- *      blocking
+ *      excluding
  *
  * See the design doc on SPARK-8425 for a more in-depth discussion.
  *
@@ -162,7 +162,7 @@ private[scheduler] class HealthTracker (
 
   private def killExcludedExecutor(exec: String): Unit = {
     if (conf.get(config.EXCLUDE_ON_FAILURE_KILL_ENABLED)) {
-      killExecutor(exec, s"Killing blocked executor id $exec since " +
+      killExecutor(exec, s"Killing excluded executor id $exec since " +
         s"${config.EXCLUDE_ON_FAILURE_KILL_ENABLED.key} is set.")
     }
   }

resource-managers/mesos/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosCoarseGrainedSchedulerBackend.scala

@@ -63,7 +63,7 @@ private[spark] class MesosCoarseGrainedSchedulerBackend(
   with MesosScheduler
   with MesosSchedulerUtils {
 
-  // Exclude a agent after this many failures
+  // Exclude an agent after this many failures
   private val MAX_AGENT_FAILURES = 2
 
   private val maxCoresOption = conf.get(config.CORES_MAX)

resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocatorNodeHealthTracker.scala

@@ -121,7 +121,7 @@ private[spark] class YarnAllocatorNodeHealthTracker(
   }
 
   private def synchronizeExcludedNodesWithYarn(nodesToExclude: Set[String]): Unit = {
-    // Update excluded node information to YARN ResourceManager for this application,
+    // Update YARN with the nodes that are excluded for this application,
     // in order to avoid allocating new Containers on the problematic nodes.
     val additions = (nodesToExclude -- currentExcludededYarnNodes).toList.sorted
     val removals = (currentExcludededYarnNodes -- nodesToExclude).toList.sorted
@@ -132,7 +132,8 @@ private[spark] class YarnAllocatorNodeHealthTracker(
       logInfo(s"removing nodes from YARN application master's excluded node list: $removals")
     }
     if (additions.nonEmpty || removals.nonEmpty) {
-      // TODO - need to update once Hadoop changes -
+      // Note YARNs api for excluding nodes is updateBlacklist.
+      // TODO - We need to update once Hadoop changes -
       // https://issues.apache.org/jira/browse/HADOOP-17169
       amClient.updateBlacklist(additions.asJava, removals.asJava)
     }

resource-managers/yarn/src/test/scala/org/apache/spark/scheduler/cluster/YarnSchedulerBackendSuite.scala

@@ -78,7 +78,7 @@ class YarnSchedulerBackendSuite extends SparkFunSuite with MockitoSugar with Loc
       val request = Map(defaultResourceProf -> numRequested)
       val req = yarnSchedulerBackendExtended.prepareRequestExecutors(request)
       assert(req.resourceProfileToTotalExecs(defaultResourceProf) === numRequested)
-      assert(req.nodeBlocklist === excludelist)
+      assert(req.excludedNodes === excludelist)
       val hosts =
         req.hostToLocalTaskCount(ResourceProfile.DEFAULT_RESOURCE_PROFILE_ID).keySet
       assert(hosts.intersect(excludelist).isEmpty)