spark-reviews mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vanzin <...@git.apache.org>
Subject [GitHub] spark pull request #19041: [SPARK-21097][CORE] Add option to recover cached ...
Date Mon, 22 Jan 2018 20:12:05 GMT
Github user vanzin commented on a diff in the pull request:

    https://github.com/apache/spark/pull/19041#discussion_r163052910
  
    --- 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"))
    +    val minimumTime = System.currentTimeMillis() + 1000
    +
    +    eventually(timeout(Span(1500, Millis)), interval(Span(500, Millis))) {
    +      // should be killed once not twice
    +      verify(eam, times(1)).killExecutors(Seq("1"))
    +      // wait at least a second to be sure we don't kill executor twice
    +      System.currentTimeMillis() should be > minimumTime
    +    }
    +
    +    cleanup(result, cacheRecoveryManager)
    +  }
    +
    +  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(1, blocks.iterator, memStatus)
    +    val bmmeRef = DummyRef(bmme)
    +    val cacheRecoveryManager = new CacheRecoveryManager(bmmeRef, eam, conf)
    +
    +    val result = cacheRecoveryManager.startCacheRecovery(Seq("1", "2", "3"))
    +    eventually {
    +      bmme.replicated.size shouldBe  2
    +    }
    +
    +    cleanup(result, cacheRecoveryManager)
    +  }
    +
    +  test("Blocks won't replicate if we are stopping all executors") {
    +    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) -> ((2L, 1L)),
    +      BlockManagerId("3", "host", 12, None) -> ((2L, 1L)),
    +      BlockManagerId("4", "host", 12, None) -> ((2L, 1L)))
    +    val bmme = FakeBMM(1, blocks.iterator, memStatus)
    +    val bmmeRef = DummyRef(bmme)
    +    val cacheRecoveryManager = new CacheRecoveryManager(bmmeRef, eam, conf)
    +    val result = cacheRecoveryManager.startCacheRecovery(Seq("1", "2", "3", "4"))
    +
    +    eventually {
    --- End diff --
    
    Same suggestion about checking the futures instead of this.


---

---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org


Mime
View raw message