apache/kyuubi
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

[KUUBI-198][FOLLOWUP]Fix SparkSessionCache unit test occasionally fails (#200)

Browse Source 
* fix travis occasionally fails

* ad ut
This commit is contained in:
Kent Yao 2019-06-20 21:46:55 +08:00 committed by GitHub
parent b6591d3314
commit f4c08c6f52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kyuubi-server/src/main/scala/yaooqinn/kyuubi/ha/FailoverService.scala
View File

@ -93,6 +93,7 @@ private[kyuubi] class FailoverService(name: String, server: KyuubiServer)
override private[ha] def reset(): Unit = {
info("Reset Zookeeper leader latch")
closeLeaderLatch()
zkServiceStarted = false
startLeaderLatch()
}
}

19
kyuubi-server/src/test/scala/yaooqinn/kyuubi/ha/FailoverServiceSuite.scala
View File

@ -108,19 +108,26 @@ class FailoverServiceSuite extends SparkFunSuite
server.init(conf)
haService.init(conf)
haService.start()
Thread.sleep(10000)
Thread.sleep(5000)
val list = zooKeeperClient.getChildren.forPath("/").asScala.toList
assert(list.size === 3)
assert(list.contains("kyuubiserver"))
assert(list.contains("kyuubiserver-latch"))
val l2 = zooKeeperClient.getChildren.forPath("/kyuubiserver").asScala.toList
val ns = "kyuubiserver"
assert(list.contains(ns))
assert(list.contains(ns + "-latch"))
val l2 = zooKeeperClient.getChildren.forPath("/" + ns).asScala.toList
assert(l2.size === 1)
val l3 = zooKeeperClient.getChildren.forPath("/kyuubiserver-latch").asScala.toList
val l3 = zooKeeperClient.getChildren.forPath("/" + ns + "-latch").asScala.toList
assert(l3.size === 1)
haService.reset()
Thread.sleep(5000)
val l4 = zooKeeperClient.getChildren.forPath("/kyuubiserver-latch").asScala.toList
val l4 = zooKeeperClient.getChildren.forPath("/" + ns + "-latch").asScala.toList
assert(l4.size === 1)
assert(l3.head !== l4.head)
zooKeeperClient.delete().forPath("/" + ns + "/" + l2.head)
Thread.sleep(5000)
val l5 = zooKeeperClient.getChildren.forPath("/" + ns + "-latch").asScala.toList
assert(l5.size === 1)
assert(l5.head !== l4.head)
}
}

2
kyuubi-server/src/test/scala/yaooqinn/kyuubi/spark/SparkSessionCacheManagerSuite.scala
View File

@ -106,7 +106,7 @@ class SparkSessionCacheManagerSuite
c.decReuseTimeAndGet
c.decReuseTimeAndGet
}
Thread.sleep(1000)
Thread.sleep(5000)
assert(cacheManager.getAndIncrease("alice").isEmpty)
assert(cacheManager.getAndIncrease("bob").isEmpty)
assert(cacheManager.getAndIncrease("tom").isEmpty)