You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by mo...@apache.org on 2017/07/06 21:31:40 UTC
hive git commit: HIVE-17022: Add mode in lock debug statements (Mohit
Sabharwal, reviewed by Naveen Gangam)
Repository: hive
Updated Branches:
refs/heads/master 5feb499d0 -> 4536fb74c
HIVE-17022: Add mode in lock debug statements (Mohit Sabharwal, reviewed by Naveen Gangam)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/4536fb74
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/4536fb74
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/4536fb74
Branch: refs/heads/master
Commit: 4536fb74c0c2aecfaad1a3b17d2e016a438a8bd2
Parents: 5feb499
Author: Mohit Sabharwal <mo...@cloudera.com>
Authored: Thu Jul 6 17:09:45 2017 -0400
Committer: Mohit Sabharwal <mo...@cloudera.com>
Committed: Thu Jul 6 17:09:45 2017 -0400
----------------------------------------------------------------------
.../hive/ql/lockmgr/EmbeddedLockManager.java | 22 +++++++++++++++++---
.../zookeeper/ZooKeeperHiveLockManager.java | 13 ++++++++++--
2 files changed, 30 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/4536fb74/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/EmbeddedLockManager.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/EmbeddedLockManager.java b/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/EmbeddedLockManager.java
index c15035d..57eaa85 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/EmbeddedLockManager.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/EmbeddedLockManager.java
@@ -25,7 +25,13 @@ import org.apache.hadoop.hive.ql.Driver.LockedDriverState;
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 class EmbeddedLockManager implements HiveLockManager {
@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<HiveLock> lock(List<HiveLockObj> objs, boolean keepAlive, LockedDriverState lDrvState) throws LockException {
+ public List<HiveLock> lock(List<HiveLockObj> objs, boolean keepAlive, LockedDriverState lDrvState)
+ throws LockException {
return lock(objs, numRetriesForLock, sleepTime);
}
@@ -121,9 +130,16 @@ public class EmbeddedLockManager implements HiveLockManager {
}
}
- public List<HiveLock> lock(List<HiveLockObj> objs, int numRetriesForLock, long sleepTime)
+ private List<HiveLock> lock(List<HiveLockObj> 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);
http://git-wip-us.apache.org/repos/asf/hive/blob/4536fb74/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java b/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java
index 9b46ae7..42c0042 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java
@@ -38,7 +38,16 @@ import org.slf4j.Logger;
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 @@ public class ZooKeeperHiveLockManager implements HiveLockManager {
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;