Index: ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java (revision 997989) +++ ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java (working copy) @@ -236,8 +236,8 @@ try { children = zkpClient.getChildren("/" + parent, false); } catch (Exception e) { - LOG.error("Failed to get ZooKeeper children: " + e); - throw new LockException(e); + // no locks present + return locks; } for (String child : children) {