You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2013/10/24 21:15:13 UTC
svn commit: r1535503 - in /hbase/branches/0.94/src:
main/java/org/apache/hadoop/hbase/master/metrics/MasterMetrics.java
test/java/org/apache/hadoop/hbase/master/metrics/TestMasterStatistics.java
Author: tedyu
Date: Thu Oct 24 19:15:13 2013
New Revision: 1535503
URL: http://svn.apache.org/r1535503
Log:
HBASE-8397 Revert due to test failure in secure build
Removed:
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/metrics/TestMasterStatistics.java
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/metrics/MasterMetrics.java
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/metrics/MasterMetrics.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/metrics/MasterMetrics.java?rev=1535503&r1=1535502&r2=1535503&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/metrics/MasterMetrics.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/metrics/MasterMetrics.java Thu Oct 24 19:15:13 2013
@@ -30,6 +30,7 @@ import org.apache.hadoop.metrics.Metrics
import org.apache.hadoop.metrics.MetricsUtil;
import org.apache.hadoop.metrics.Updater;
import org.apache.hadoop.metrics.jvm.JvmMetrics;
+import org.apache.hadoop.metrics.util.MetricsLongValue;
import org.apache.hadoop.metrics.util.MetricsRegistry;
@@ -89,7 +90,7 @@ public class MasterMetrics implements Up
// get custom attributes
try {
- Object m =
+ Object m =
ContextFactory.getFactory().getAttribute("hbase.extendedperiod");
if (m instanceof String) {
this.extendedPeriod = Long.parseLong((String) m)*1000;
@@ -134,7 +135,7 @@ public class MasterMetrics implements Up
public void resetAllMinMax() {
// Nothing to do
}
-
+
/**
* Record a single instance of a split
* @param time time that the split took