diff --git a/common/src/java/org/apache/hadoop/hive/common/metrics/common/MetricsConstant.java b/common/src/java/org/apache/hadoop/hive/common/metrics/common/MetricsConstant.java index d1ebe12f5c825c98799429b697ffe1fb398733c0..52b61b78cf3fdc0152cbf2249ba5f716349f35f0 100644 --- a/common/src/java/org/apache/hadoop/hive/common/metrics/common/MetricsConstant.java +++ b/common/src/java/org/apache/hadoop/hive/common/metrics/common/MetricsConstant.java @@ -22,6 +22,8 @@ */ public class MetricsConstant { + public static String HIVE_ZK_CONNECTIONS = "hive_zookeeper_connections"; + public static String JVM_PAUSE_INFO = "jvm.pause.info-threshold"; public static String JVM_PAUSE_WARN = "jvm.pause.warn-threshold"; public static String JVM_EXTRA_SLEEP = "jvm.pause.extraSleepTime"; @@ -32,4 +34,9 @@ public static String JDO_ROLLBACK_TRANSACTIONS = "rollbacked_jdo_transactions"; public static String JDO_COMMIT_TRANSACTIONS = "committed_jdo_transactions"; public static String JDO_OPEN_TRANSACTIONS = "opened_jdo_transactions"; + + public static String METASTORE_HIVE_LOCKS = "metastore_hive_locks"; + public static String ZOOKEEPER_HIVE_SHAREDLOCKS = "zookeeper_hive_sharedlocks"; + public static String ZOOKEEPER_HIVE_EXCLUSIVELOCKS = "zookeeper_hive_exclusivelocks"; + public static String ZOOKEEPER_HIVE_SEMISHAREDLOCKS = "zookeeper_hive_semisharedlocks"; } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbLockManager.java b/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbLockManager.java index 82e227f15dab3482a040d21c7a8165a77f2bac7e..bb9da9d8b7a6f84fb185ce9f78cf23d5db3b04e7 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbLockManager.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbLockManager.java @@ -20,6 +20,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hive.common.JavaUtils; +import org.apache.hadoop.hive.common.metrics.common.Metrics; +import org.apache.hadoop.hive.common.metrics.common.MetricsConstant; +import org.apache.hadoop.hive.common.metrics.common.MetricsFactory; import org.apache.hadoop.hive.metastore.HiveMetaStoreClient; import org.apache.hadoop.hive.metastore.IMetaStoreClient; import org.apache.hadoop.hive.metastore.api.*; @@ -99,6 +102,16 @@ LockState lock(LockRequest lock, String queryId, boolean isBlocking, List