diff --git ql/src/java/org/apache/hadoop/hive/ql/lockmgr/EmbeddedLockManager.java ql/src/java/org/apache/hadoop/hive/ql/lockmgr/EmbeddedLockManager.java index c15035d254b61c019fceaf48280a0106c3f95dee..57eaa858d8626469fd5a6d5e5b2f1e9ec2104806 100644 --- ql/src/java/org/apache/hadoop/hive/ql/lockmgr/EmbeddedLockManager.java +++ ql/src/java/org/apache/hadoop/hive/ql/lockmgr/EmbeddedLockManager.java @@ -25,7 +25,13 @@ import org.apache.hadoop.hive.ql.lockmgr.HiveLockObject.HiveLockObjectData; import org.apache.hadoop.hive.ql.metadata.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Stack; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; @@ -56,11 +62,14 @@ public void setContext(HiveLockManagerCtx ctx) throws LockException { @Override public HiveLock lock(HiveLockObject key, HiveLockMode mode, boolean keepAlive) throws LockException { + LOG.debug("Acquiring lock for {} with mode {} {}", key.getName(), mode, + key.getData().getLockMode()); return lock(key, mode, numRetriesForLock, sleepTime); } @Override - public List lock(List objs, boolean keepAlive, LockedDriverState lDrvState) throws LockException { + public List lock(List objs, boolean keepAlive, LockedDriverState lDrvState) + throws LockException { return lock(objs, numRetriesForLock, sleepTime); } @@ -121,9 +130,16 @@ private void sleep(long sleepTime) { } } - public List lock(List objs, int numRetriesForLock, long sleepTime) + private List lock(List objs, int numRetriesForLock, long sleepTime) throws LockException { sortLocks(objs); + if (LOG.isDebugEnabled()) { + for (HiveLockObj obj : objs) { + LOG.debug("Acquiring lock for {} with mode {}", obj.getObj().getName(), + obj.getMode()); + } + } + for (int i = 0; i <= numRetriesForLock; i++) { if (i > 0) { sleep(sleepTime); diff --git ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java index 9b46ae7098c6ff29eaba9f108d7337723914f7c6..42c004287d78bd45c6599964f2c1d8d56a1464f7 100644 --- ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java +++ ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java @@ -38,7 +38,16 @@ import org.slf4j.LoggerFactory; import java.net.InetAddress; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Queue; +import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -279,7 +288,7 @@ private String getLockName(String parent, HiveLockMode mode) { private ZooKeeperHiveLock lock (HiveLockObject key, HiveLockMode mode, boolean keepAlive, boolean parentCreated) throws LockException { - LOG.debug("Acquiring lock for {} with mode {}", key.getName(), + LOG.debug("Acquiring lock for {} with mode {} {}", key.getName(), mode, key.getData().getLockMode()); int tryNum = 0;