Github user squito commented on a diff in the pull request: https://github.com/apache/spark/pull/19041#discussion_r179206187 --- Diff: core/src/test/scala/org/apache/spark/CacheRecoveryManagerSuite.scala --- @@ -0,0 +1,201 @@ +/* + * 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.mockito.MockitoSugar + +import org.apache.spark.CacheRecoveryManager._ +import org.apache.spark.internal.config.DYN_ALLOCATION_CACHE_RECOVERY_TIMEOUT +import org.apache.spark.network.util.ByteUnit +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 { + + val oneGB: Long = ByteUnit.GiB.toBytes(1).toLong + + 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("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(blocks.iterator, plentyOfMem) + val bmmeRef = DummyRef(bmme) + val cacheRecoveryManager = new CacheRecoveryManager(bmmeRef, eam, conf) + when(eam.killExecutors(Seq("1"))).thenReturn(Seq("1")) + + try { + val future = cacheRecoveryManager.startCacheRecovery(Seq("1")) + val results = ThreadUtils.awaitResult(future, Duration(3, TimeUnit.SECONDS)) + results.head shouldBe DoneRecovering + verify(eam).killExecutors(Seq("1")) + bmme.replicated.get("1").get shouldBe 2 + } finally { + cacheRecoveryManager.stop() + } + } + + test("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(blocks.iterator, plentyOfMem, pauseIndefinitely = true) + val bmmeRef = DummyRef(bmme) + val cacheRecoveryManager = new CacheRecoveryManager(bmmeRef, eam, conf) + + try { + val future = cacheRecoveryManager.startCacheRecovery(Seq("1")) + val results = ThreadUtils.awaitResult(future, Duration(3, TimeUnit.SECONDS)) + results.head shouldBe Timeout + verify(eam, times(1)).killExecutors(Seq("1")) + bmme.replicated.get("1").get shouldBe 1 + } finally { + cacheRecoveryManager.stop() + } + } + + 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(blocks.iterator, plentyOfMem) + val bmmeRef = DummyRef(bmme) + val cacheRecoveryManager = new CacheRecoveryManager(bmmeRef, eam, conf) + + try { + val future = cacheRecoveryManager.startCacheRecovery(Seq("1")) + val results = ThreadUtils.awaitResult(future, Duration(3, TimeUnit.SECONDS)) + + results.head shouldBe DoneRecovering + verify(eam, times(1)).killExecutors(Seq("1")) + } finally { + cacheRecoveryManager.stop() + } + } + + test("blocks won't replicate if we are running out of space") { + val conf = new SparkConf() + val eam = mock[ExecutorAllocationManager] + val blocks = Seq(RDDBlockId(1, 1), RDDBlockId(1, 1), RDDBlockId(1, 1), RDDBlockId(1, 1)) + val memStatus = Map(BlockManagerId("1", "host", 12, None) -> ((2L, 1L)), + BlockManagerId("2", "host", 12, None) -> ((3L, 1L)), + BlockManagerId("3", "host", 12, None) -> ((4L, 1L)), + BlockManagerId("4", "host", 12, None) -> ((4L, 4L))) + val bmme = FakeBMM(blocks.iterator, memStatus) + val bmmeRef = DummyRef(bmme) + val cacheRecoveryManager = new CacheRecoveryManager(bmmeRef, eam, conf) + + try { + val future = cacheRecoveryManager.startCacheRecovery(Seq("1", "2", "3")) + val results = ThreadUtils.awaitResult(future, Duration(3, TimeUnit.SECONDS)) + results.foreach { _ shouldBe DoneRecovering } + bmme.replicated.size shouldBe 2 --- End diff -- to go along with my comment about never killing executors that fail the check for having enough memory, if you add these checks it will fail: ``` assert(results.size === 3) execs.foreach { exec => verify(eam, times(1)).killExecutors(Seq(exec)) } ``` also to go along with my comment below about tying specific blocks to specific executors in FakeBMM, it would let you make more specific checks here, eg. `bmme.replicated.keySet === Set("1", "2")`
--- --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org