You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ns...@apache.org on 2011/10/11 04:08:40 UTC
svn commit: r1181440 - in
/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase:
metrics/HBaseInfo.java metrics/MetricsMBeanBase.java
metrics/MetricsString.java regionserver/metrics/RegionServerMetrics.java
Author: nspiegelberg
Date: Tue Oct 11 02:08:39 2011
New Revision: 1181440
URL: http://svn.apache.org/viewvc?rev=1181440&view=rev
Log:
Add VersionInfo to JMX
Summary:
Adds VersionInfo for both HBase & its HDFS client jar to JMX so we can get info
on the currently-running processes.
Test Plan:
tested on local dev cluster
DiffCamp Revision: 180594
Reviewed By: kannan
CC: nspiegelberg, mwelty, achao, kannan, gsmyth
Revert Plan:
OK
Added:
hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/metrics/HBaseInfo.java
hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/metrics/MetricsString.java
Modified:
hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java
hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java
Added: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/metrics/HBaseInfo.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/metrics/HBaseInfo.java?rev=1181440&view=auto
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/metrics/HBaseInfo.java (added)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/metrics/HBaseInfo.java Tue Oct 11 02:08:39 2011
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2010 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.metrics;
+
+import org.apache.hadoop.hbase.metrics.MetricsMBeanBase;
+import org.apache.hadoop.metrics.MetricsContext;
+import org.apache.hadoop.metrics.MetricsRecord;
+import org.apache.hadoop.metrics.MetricsUtil;
+import org.apache.hadoop.metrics.util.MBeanUtil;
+import org.apache.hadoop.metrics.util.MetricsRegistry;
+
+import javax.management.ObjectName;
+
+/**
+ * Exports HBase system information as an MBean for JMX observation.
+ */
+public class HBaseInfo {
+ protected static class HBaseInfoMBean extends MetricsMBeanBase {
+ private final ObjectName mbeanName;
+
+ public HBaseInfoMBean(MetricsRegistry registry, String rsName) {
+ super(registry, "HBaseInfo");
+ mbeanName = MBeanUtil.registerMBean("HBase",
+ "Info", this);
+ }
+
+ public void shutdown() {
+ if (mbeanName != null)
+ MBeanUtil.unregisterMBean(mbeanName);
+ }
+ }
+
+ protected final MetricsRecord mr;
+ protected final HBaseInfoMBean mbean;
+ protected MetricsRegistry registry = new MetricsRegistry();
+
+ private static HBaseInfo theInstance = null;
+ public synchronized static HBaseInfo init() {
+ if (theInstance == null) {
+ theInstance = new HBaseInfo();
+ }
+ return theInstance;
+ }
+
+ // HBase jar info
+ private MetricsString date = new MetricsString("date", registry,
+ org.apache.hadoop.hbase.util.VersionInfo.getDate());
+ private MetricsString revision = new MetricsString("revision", registry,
+ org.apache.hadoop.hbase.util.VersionInfo.getRevision());
+ private MetricsString url = new MetricsString("url", registry,
+ org.apache.hadoop.hbase.util.VersionInfo.getUrl());
+ private MetricsString user = new MetricsString("user", registry,
+ org.apache.hadoop.hbase.util.VersionInfo.getUser());
+ private MetricsString version = new MetricsString("version", registry,
+ org.apache.hadoop.hbase.util.VersionInfo.getVersion());
+
+ // Info on the HDFS jar that HBase has (aka: HDFS Client)
+ private MetricsString hdfsDate = new MetricsString("hdfsDate", registry,
+ org.apache.hadoop.util.VersionInfo.getDate());
+ private MetricsString hdfsRev = new MetricsString("hdfsRevision", registry,
+ org.apache.hadoop.util.VersionInfo.getRevision());
+ private MetricsString hdfsUrl = new MetricsString("hdfsUrl", registry,
+ org.apache.hadoop.util.VersionInfo.getUrl());
+ private MetricsString hdfsUser = new MetricsString("hdfsUser", registry,
+ org.apache.hadoop.util.VersionInfo.getUser());
+ private MetricsString hdfsVer = new MetricsString("hdfsVersion", registry,
+ org.apache.hadoop.util.VersionInfo.getVersion());
+
+ protected HBaseInfo() {
+ MetricsContext context = MetricsUtil.getContext("hbase");
+ mr = MetricsUtil.createRecord(context, "info");
+ String name = Thread.currentThread().getName();
+ mr.setTag("Info", name);
+
+ // export for JMX
+ mbean = new HBaseInfoMBean(this.registry, name);
+ }
+
+}
Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java?rev=1181440&r1=1181439&r2=1181440&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java Tue Oct 11 02:08:39 2011
@@ -95,10 +95,14 @@ public class MetricsMBeanBase extends Me
continue;
// add on custom HBase metric types
- if (metric instanceof org.apache.hadoop.hbase.metrics.MetricsRate) {
+ if (metric instanceof MetricsRate) {
attributes.add( new MBeanAttributeInfo(metric.getName(),
"java.lang.Float", metric.getDescription(), true, false, false) );
extendedAttributes.put(metric.getName(), metric);
+ } else if (metric instanceof MetricsString) {
+ attributes.add( new MBeanAttributeInfo(metric.getName(),
+ "java.lang.String", metric.getDescription(), true, false, false) );
+ extendedAttributes.put(metric.getName(), metric);
}
// else, its probably a hadoop metric already registered. Skip it.
}
@@ -140,6 +144,8 @@ public class MetricsMBeanBase extends Me
if (metric != null) {
if (metric instanceof MetricsRate) {
return ((MetricsRate) metric).getPreviousIntervalValue();
+ } else if (metric instanceof MetricsString) {
+ return ((MetricsString)metric).getValue();
} else {
LOG.warn( String.format("unknown metrics type %s for attribute %s",
metric.getClass().getName(), name) );
Added: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/metrics/MetricsString.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/metrics/MetricsString.java?rev=1181440&view=auto
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/metrics/MetricsString.java (added)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/metrics/MetricsString.java Tue Oct 11 02:08:39 2011
@@ -0,0 +1,56 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.metrics;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.metrics.MetricsRecord;
+import org.apache.hadoop.metrics.util.MetricsBase;
+import org.apache.hadoop.metrics.util.MetricsRegistry;
+
+/**
+ * Publishes a string to the metrics collector
+ */
+public class MetricsString extends MetricsBase {
+ private static final Log LOG = LogFactory.getLog("org.apache.hadoop.hbase.metrics");
+
+ private String value;
+
+ public MetricsString(final String name, final MetricsRegistry registry,
+ final String value) {
+ super(name, NO_DESCRIPTION);
+ this.value = value;
+ registry.add(name, this);
+ }
+ public MetricsString(final String name, final String description,
+ final MetricsRegistry registry, final String value) {
+ super(name, description);
+ this.value = value;
+ registry.add(name, this);
+ }
+
+ public String getValue() {
+ return this.value;
+ }
+
+ @Override
+ public synchronized void pushMetric(final MetricsRecord mr) {
+ // NOOP
+ // MetricsMBeanBase.getAttribute is where we actually fill the data
+ }
+}
\ No newline at end of file
Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java?rev=1181440&r1=1181439&r2=1181440&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java Tue Oct 11 02:08:39 2011
@@ -22,6 +22,7 @@ package org.apache.hadoop.hbase.regionse
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.io.hfile.HFile;
+import org.apache.hadoop.hbase.metrics.HBaseInfo;
import org.apache.hadoop.hbase.metrics.MetricsRate;
import org.apache.hadoop.hbase.metrics.PersistentMetricsTimeVaryingRate;
import org.apache.hadoop.hbase.regionserver.wal.HLog;
@@ -174,6 +175,8 @@ public class RegionServerMetrics impleme
context.registerUpdater(this);
// Add jvmmetrics.
JvmMetrics.init("RegionServer", name);
+ // Add Hbase Info metrics
+ HBaseInfo.init();
// export for JMX
statistics = new RegionServerStatistics(this.registry, name);