Github user vanzin commented on a diff in the pull request:
https://github.com/apache/spark/pull/19041#discussion_r163052459
--- Diff:
core/src/test/scala/org/apache/spark/CacheRecoveryManagerSuite.scala ---
@@ -0,0 +1,200 @@
+/*
+ * 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
+
+import java.util.concurrent.{ConcurrentHashMap, TimeUnit}
+import java.util.concurrent.atomic.AtomicInteger
+
+import scala.concurrent.{Future, Promise}
+import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.duration.Duration
+import scala.reflect.ClassTag
+
+import org.mockito.Mockito._
+import org.scalatest.Matchers
+import org.scalatest.concurrent.Eventually
+import org.scalatest.mockito.MockitoSugar
+import org.scalatest.time.{Millis, Span}
+
+import
org.apache.spark.internal.config.DYN_ALLOCATION_CACHE_RECOVERY_TIMEOUT
+import org.apache.spark.rpc._
+import org.apache.spark.storage.{BlockId, BlockManagerId, RDDBlockId}
+import org.apache.spark.storage.BlockManagerMessages._
+import org.apache.spark.util.ThreadUtils
+
+class CacheRecoveryManagerSuite
+ extends SparkFunSuite with MockitoSugar with Matchers with Eventually {
+
+ val oneGB: Long = 1024L * 1024L * 1024L * 1024L
+ val plentyOfMem = Map(
+ BlockManagerId("1", "host", 12, None) -> ((oneGB, oneGB)),
+ BlockManagerId("2", "host", 12, None) -> ((oneGB, oneGB)),
+ BlockManagerId("3", "host", 12, None) -> ((oneGB, oneGB)))
+
+ test("CacheRecoveryManager will replicate blocks until empty and then
kill executor") {
+ val conf = new SparkConf()
+ val eam = mock[ExecutorAllocationManager]
+ val blocks = Seq(RDDBlockId(1, 1), RDDBlockId(2, 1))
+ val bmme = FakeBMM(1, blocks.iterator, plentyOfMem)
+ val bmmeRef = DummyRef(bmme)
+ val cacheRecoveryManager = new CacheRecoveryManager(bmmeRef, eam, conf)
+ when(eam.killExecutors(Seq("1"))).thenReturn(Seq("1"))
+ val result = cacheRecoveryManager.startCacheRecovery(Seq("1"))
+
+ eventually {
+ verify(eam).killExecutors(Seq("1"))
+ bmme.replicated.get("1").get shouldBe 2
+ }
+
+ cleanup(result, cacheRecoveryManager)
+ }
+
+ test("CacheRecoveryManager will kill executor if it takes too long to
replicate") {
+ val conf = new
SparkConf().set(DYN_ALLOCATION_CACHE_RECOVERY_TIMEOUT.key, "1s")
+ val eam = mock[ExecutorAllocationManager]
+ val blocks = Set(RDDBlockId(1, 1), RDDBlockId(2, 1), RDDBlockId(3, 1),
RDDBlockId(4, 1))
+ val bmme = FakeBMM(600, blocks.iterator, plentyOfMem)
+ val bmmeRef = DummyRef(bmme)
+ val cacheRecoveryManager = new CacheRecoveryManager(bmmeRef, eam, conf)
+ val result = cacheRecoveryManager.startCacheRecovery(Seq("1"))
+
+ eventually(timeout(Span(1010, Millis)), interval(Span(500, Millis))) {
+ verify(eam, times(1)).killExecutors(Seq("1"))
+ bmme.replicated.get("1").get shouldBe 1
+ }
+
+ cleanup(result, cacheRecoveryManager)
+ }
+
+ test("shutdown timer will get cancelled if replication finishes") {
+ val conf = new
SparkConf().set(DYN_ALLOCATION_CACHE_RECOVERY_TIMEOUT.key, "1s")
+ val eam = mock[ExecutorAllocationManager]
+ val blocks = Set(RDDBlockId(1, 1))
+ val bmme = FakeBMM(1, blocks.iterator, plentyOfMem)
+ val bmmeRef = DummyRef(bmme)
+ val cacheRecoveryManager = new CacheRecoveryManager(bmmeRef, eam, conf)
+
+ val result = cacheRecoveryManager.startCacheRecovery(Seq("1"))
--- End diff --
Shouldn't this test be asserting that the replication finished
successfully, e.g. by checking the futures returned here?
Then your checks below should be a lot simpler.
- make sure the future finishes with a successful status
- make sure the timer was killed just once
I generally try to avoid fancy timeout-based checks in tests to avoid
flakiness.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
