Github user squito commented on a diff in the pull request:
https://github.com/apache/spark/pull/6870#discussion_r33729007
--- Diff:
core/src/test/scala/org/apache/spark/scheduler/ExecutorBlacklistTrackerSuite.scala
---
@@ -0,0 +1,158 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.scheduler
+
+import scala.collection.mutable
+
+import org.scalatest.{BeforeAndAfter, PrivateMethodTester}
+
+import org.apache.spark._
+import
org.apache.spark.scheduler.ExecutorBlacklistTracker.ExecutorFailureStatus
+import org.apache.spark.scheduler.cluster.ExecutorInfo
+import org.apache.spark.util.ManualClock
+
+class ExecutorBlacklistTrackerSuite
+ extends SparkFunSuite
+ with LocalSparkContext
+ with BeforeAndAfter {
+ import ExecutorBlacklistTrackerSuite._
+
+ before {
+ if (sc == null) {
+ sc = createSparkContext
+ }
+ }
+
+ after {
+ if (sc != null) {
+ sc.stop()
+ sc = null
+ }
+ }
+
+ test("add executor to blacklist") {
+ // Add 5 executors
+ addExecutors(5)
+ val tracker = sc.executorBlacklistTracker.get
+ assert(numExecutorsRegistered(tracker) === 5)
+
+ // Post 5 TaskEnd event to executor-1 to add executor-1 into blacklist
+ (0 until 5).foreach(_ => postTaskEndEvent(TaskResultLost,
"executor-1"))
+
+ assert(tracker.getExecutorBlacklist === Set("executor-1"))
+ assert(executorIdToTaskFailures(tracker)("executor-1").numFailures ===
5)
+ assert(executorIdToTaskFailures(tracker)("executor-1").isBlackListed
=== true)
+
+ // Post 10 TaskEnd event to executor-2 to add executor-2 into blacklist
+ (0 until 10).foreach(_ => postTaskEndEvent(TaskResultLost,
"executor-2"))
+ assert(tracker.getExecutorBlacklist === Set("executor-1",
"executor-2"))
+ assert(executorIdToTaskFailures(tracker)("executor-2").numFailures ===
10)
+ assert(executorIdToTaskFailures(tracker)("executor-2").isBlackListed
=== true)
+
+ // Post 5 TaskEnd event to executor-3 to verify whether executor-3 is
blacklisted
+ (0 until 5).foreach(_ => postTaskEndEvent(TaskResultLost,
"executor-3"))
+ // Since the failure number of executor-3 is less than the average
blacklist threshold,
+ // though exceed the fault threshold, still should not be added into
blacklist
+ assert(tracker.getExecutorBlacklist === Set("executor-1",
"executor-2"))
+ assert(executorIdToTaskFailures(tracker)("executor-3").numFailures ===
5)
+ assert(executorIdToTaskFailures(tracker)("executor-3").isBlackListed
=== false)
+
+ // Keep post TaskEnd event to executor-3 to add executor-3 into
blacklist
+ (0 until 2).foreach(_ => postTaskEndEvent(TaskResultLost,
"executor-3"))
+ assert(tracker.getExecutorBlacklist === Set("executor-1",
"executor-2", "executor-3"))
+ assert(executorIdToTaskFailures(tracker)("executor-3").numFailures ===
7)
+ assert(executorIdToTaskFailures(tracker)("executor-3").isBlackListed
=== true)
+
+ // Post TaskEnd event to executor-4 to verify whether executor-4 could
be added into blacklist
+ (0 until 10).foreach(_ => postTaskEndEvent(TaskResultLost,
"executor-4"))
+ // Event executor-4's failure task number is above than blacklist
threshold,
+ // but the blacklisted executor number is reaching to maximum fraction,
+ // so executor-4 still cannot be added into blacklist.
+ assert(tracker.getExecutorBlacklist === Set("executor-1",
"executor-2", "executor-3"))
+ assert(executorIdToTaskFailures(tracker)("executor-4").numFailures ===
10)
+ assert(executorIdToTaskFailures(tracker)("executor-4").isBlackListed
=== false)
+ }
+
+ test("remove executor from blacklist") {
+ // Add 5 executors
+ addExecutors(5)
+ val tracker = sc.executorBlacklistTracker.get
+ val clock = new ManualClock(10000L)
+ tracker.setClock(clock)
+ assert(numExecutorsRegistered(tracker) === 5)
+
+ // Post 5 TaskEnd event to executor-1 to add executor-1 into blacklist
+ (0 until 5).foreach(_ => postTaskEndEvent(TaskResultLost,
"executor-1"))
+
+ assert(tracker.getExecutorBlacklist === Set("executor-1"))
+ assert(executorIdToTaskFailures(tracker)("executor-1").numFailures ===
5)
+ assert(executorIdToTaskFailures(tracker)("executor-1").isBlackListed
=== true)
+ assert(executorIdToTaskFailures(tracker)("executor-1").updatedTime ===
10000L)
+
+ // Advance the timer
+ clock.advance(70 * 1000)
+ expireTimeoutExecutorBlacklist(tracker)
+ assert(tracker.getExecutorBlacklist === Set.empty)
+ assert(executorIdToTaskFailures(tracker)("executor-1").numFailures ===
5)
+ assert(executorIdToTaskFailures(tracker)("executor-1").isBlackListed
=== false)
--- End diff --
per my comment above, add a task failure on some other executor, and make
sure this executor doesn't get blacklisted.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
