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

Changes from 3 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
8 changes: 7 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,13 @@ class ZooKeeperClient(connectString: String,
metricNames += "SessionState"

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

@ijuma ijuma Jul 21, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should just be a finally instead of catch, I think.

@ijuma ijuma Jul 21, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thinking about it some more, we actually need to shutdown the scheduler too.

@ijuma ijuma Jul 21, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can call ZooKeeperClient.close()?

@ijuma ijuma Jul 22, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: we don't need the block for try, e.g.

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


@ijuma ijuma Jul 21, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for updating, I still think we should use a finally block instead of catching a specific exception.

@ijuma ijuma Jul 21, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh wait. I was wrong, we can't use finally here. But we should probably catch a more general exception?

@omkreddy omkreddy Jul 21, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, we can user ZooKeeperClientException, which parent is parent class for zk excpetions

@ijuma ijuma Jul 21, 2018 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, as other exceptions can be thrown too. But to be honest, we might as well catch Throwable since we rethrow he exception anyway. We just want to avoid leaking the resource.

@omkreddy omkreddy Jul 22, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the PR with Throwable . Not sure, if we can catch parent constructor exception in subclass constructor. For now, added a test based on zk thread count.

override def metricName(name: String, metricTags: scala.collection.Map[String, String]): MetricName = {
explicitMetricName(metricGroup, metricType, name, metricTags)
Expand Down