You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ek...@apache.org on 2016/07/26 22:29:07 UTC
hive git commit: HIVE-14330 fix LockHandle
TxnHandler.acquireLock(String key) retry logic (Eugene Koifman,
reviewed by Wei Zheng)
Repository: hive
Updated Branches:
refs/heads/master cd4d291e2 -> abbe4ecc9
HIVE-14330 fix LockHandle TxnHandler.acquireLock(String key) retry logic (Eugene Koifman, reviewed by Wei Zheng)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/abbe4ecc
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/abbe4ecc
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/abbe4ecc
Branch: refs/heads/master
Commit: abbe4ecc91bd52b0434ae118da553e303ed6b492
Parents: cd4d291
Author: Eugene Koifman <ek...@hortonworks.com>
Authored: Tue Jul 26 15:29:01 2016 -0700
Committer: Eugene Koifman <ek...@hortonworks.com>
Committed: Tue Jul 26 15:29:01 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/abbe4ecc/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java b/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
index bcb0342..b121644 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.hive.metastore.txn;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.util.concurrent.Service;
import com.jolbox.bonecp.BoneCPConfig;
import com.jolbox.bonecp.BoneCPDataSource;
import org.apache.commons.dbcp.ConnectionFactory;
@@ -3254,9 +3253,8 @@ abstract class TxnHandler implements TxnStore, TxnStore.MutexAPI {
}
}
catch(RetryException ex) {
- acquireLock(key);
+ return acquireLock(key);
}
- throw new MetaException("This can't happen because checkRetryable() has a retry limit");
}
public void acquireLock(String key, LockHandle handle) {
//the idea is that this will use LockHandle.dbConn