You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2013/10/18 17:29:43 UTC
svn commit: r1533511 -
/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java
Author: brock
Date: Fri Oct 18 15:29:43 2013
New Revision: 1533511
URL: http://svn.apache.org/r1533511
Log:
HIVE-5575: ZooKeeper connection closed when unlock with retry (Chun Chen via Brock Noland)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java?rev=1533511&r1=1533510&r2=1533511&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java Fri Oct 18 15:29:43 2013
@@ -307,10 +307,6 @@ public class ZooKeeperHiveLockManager im
try {
if (tryNum > 1) {
Thread.sleep(sleepTime);
- if (zooKeeper.getState() == ZooKeeper.States.CLOSED) {
- // Reconnect if the connection is closed.
- zooKeeper = null;
- }
prepareRetry();
}
ret = lockPrimitive(key, mode, keepAlive, parentCreated);
@@ -752,6 +748,10 @@ public class ZooKeeperHiveLockManager im
@Override
public void prepareRetry() throws LockException {
try {
+ if (zooKeeper != null && zooKeeper.getState() == ZooKeeper.States.CLOSED) {
+ // Reconnect if the connection is closed.
+ zooKeeper = null;
+ }
renewZookeeperInstance(sessionTimeout, quorumServers);
} catch (Exception e) {
throw new LockException(e);