You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2014/08/26 19:55:17 UTC
[2/2] git commit: HBASE-9746 Addendum.
HBASE-9746 Addendum.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d15df977
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d15df977
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d15df977
Branch: refs/heads/0.98
Commit: d15df9773ab9331a5d83e699c1216634982a4e1b
Parents: e88b9e4
Author: Lars Hofhansl <la...@apache.org>
Authored: Tue Aug 26 10:51:08 2014 -0700
Committer: Lars Hofhansl <la...@apache.org>
Committed: Tue Aug 26 10:52:14 2014 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/d15df977/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java
index 103d4b8..ee2fd0f 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java
@@ -130,7 +130,7 @@ public class RecoverableZooKeeper {
/**
* Try to create a Zookeeper connection. Turns any exception encountered into a
- * {@link KeeperException.OperationTimeoutException} so it can retried.
+ * KeeperException.OperationTimeoutException so it can retried.
* @return The created Zookeeper connection object
* @throws KeeperException
*/
@@ -138,8 +138,8 @@ public class RecoverableZooKeeper {
if (this.zk == null) {
try {
this.zk = new ZooKeeper(quorumServers, sessionTimeout, watcher);
- } catch (Exception uhe) {
- LOG.warn("Unable to create ZooKeeper Connection", uhe);
+ } catch (IOException ex) {
+ LOG.warn("Unable to create ZooKeeper Connection", ex);
throw new KeeperException.OperationTimeoutException();
}
}
@@ -152,6 +152,8 @@ public class RecoverableZooKeeper {
LOG.info("Closing dead ZooKeeper connection, session" +
" was: 0x"+Long.toHexString(zk.getSessionId()));
zk.close();
+ // reset the Zookeeper connection
+ zk = null;
}
checkZk();
LOG.info("Recreated a ZooKeeper, session" +