Skip to content

MINOR: Close ZooKeeperClient if waitUntilConnected fails during construction #5411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ijuma merged 8 commits into from
Jul 22, 2018
Merged

MINOR: Close ZooKeeperClient if waitUntilConnected fails during construction #5411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1b5d07c
MINOR: close Zookeeper instance incase of connect timeout in ZooKeepe…
omkreddy Jul 21, 2018
cabce51
Address review comment
omkreddy Jul 21, 2018
ec05c3e
Call ZooKeeperClient close
omkreddy Jul 21, 2018
227f889
use ZooKeeperClientException
omkreddy Jul 21, 2018
40ddf9b
Catch Throwable
omkreddy Jul 22, 2018
1a01f88
Add zookeeper SendThread count based test
omkreddy Jul 21, 2018
a19ff80
Address review comments
omkreddy Jul 22, 2018
b6735f1
Minor tweaks
ijuma Jul 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion core/src/main/scala/kafka/zookeeper/ZooKeeperClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,12 @@ class ZooKeeperClient(connectString: String,
metricNames += "SessionState"

expiryScheduler.startup()
waitUntilConnected(connectionTimeoutMs, TimeUnit.MILLISECONDS)
try waitUntilConnected(connectionTimeoutMs, TimeUnit.MILLISECONDS)
catch {
case e: Throwable =>
close()
throw e
}

override def metricName(name: String, metricTags: scala.collection.Map[String, String]): MetricName = {
explicitMetricName(metricGroup, metricType, name, metricTags)
Expand Down
16 changes: 13 additions & 3 deletions core/src/test/scala/unit/kafka/zookeeper/ZooKeeperClientTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,22 @@ class ZooKeeperClientTest extends ZooKeeperTestHarness {
System.clearProperty(JaasUtils.JAVA_LOGIN_CONFIG_PARAM)
}

@Test(expected = classOf[ZooKeeperClientTimeoutException])
@Test
def testUnresolvableConnectString(): Unit = {
new ZooKeeperClient("some.invalid.hostname.foo.bar.local", zkSessionTimeout, connectionTimeoutMs = 10,
Int.MaxValue, time, "testMetricGroup", "testMetricType").close()
try {
new ZooKeeperClient("some.invalid.hostname.foo.bar.local", zkSessionTimeout, connectionTimeoutMs = 10,
Int.MaxValue, time, "testMetricGroup", "testMetricType")
} catch {
case e: ZooKeeperClientTimeoutException =>
assertEquals("ZooKeeper client threads still running", Set.empty, runningZkSendThreads)
}
}

private def runningZkSendThreads: collection.Set[String] = Thread.getAllStackTraces.keySet.asScala
.filter(_.isAlive)
.map(_.getName)
.filter(t => t.contains("SendThread()"))

@Test(expected = classOf[ZooKeeperClientTimeoutException])
def testConnectionTimeout(): Unit = {
zookeeper.shutdown()
Expand Down