http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterProcSourceFactory.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterProcSourceFactory.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterProcSourceFactory.java index b282e06..197f9f9 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterProcSourceFactory.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterProcSourceFactory.java @@ -18,9 +18,12 @@ package org.apache.hadoop.hbase.master; +import org.apache.yetus.audience.InterfaceAudience; + /** * Interface of a factory to create MetricsMasterSource when given a MetricsMasterWrapper */ [email protected] public interface MetricsMasterProcSourceFactory { MetricsMasterProcSource create(MetricsMasterWrapper masterWrapper);
http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterQuotaSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterQuotaSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterQuotaSource.java index 99c5441..8450432 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterQuotaSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterQuotaSource.java @@ -17,10 +17,12 @@ package org.apache.hadoop.hbase.master; import org.apache.hadoop.hbase.metrics.BaseSource; +import org.apache.yetus.audience.InterfaceAudience; /** * A collection of exposed metrics for space quotas from the HBase Master. */ [email protected] public interface MetricsMasterQuotaSource extends BaseSource { String METRICS_NAME = "Quotas"; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterQuotaSourceFactory.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterQuotaSourceFactory.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterQuotaSourceFactory.java index 6e10746..2dcd945 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterQuotaSourceFactory.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterQuotaSourceFactory.java @@ -16,9 +16,12 @@ */ package org.apache.hadoop.hbase.master; +import org.apache.yetus.audience.InterfaceAudience; + /** * Interface of a factory to create MetricsMasterQuotaSource when given a MetricsMasterWrapper. */ [email protected] public interface MetricsMasterQuotaSourceFactory { MetricsMasterQuotaSource create(MetricsMasterWrapper masterWrapper); http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSource.java index d187bb1..dcfc600 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSource.java @@ -20,10 +20,12 @@ package org.apache.hadoop.hbase.master; import org.apache.hadoop.hbase.metrics.BaseSource; import org.apache.hadoop.hbase.metrics.OperationMetrics; +import org.apache.yetus.audience.InterfaceAudience; /** * Interface that classes that expose metrics about the master will implement. */ [email protected] public interface MetricsMasterSource extends BaseSource { /** http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceFactory.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceFactory.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceFactory.java index 63a85a3..fce574a 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceFactory.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceFactory.java @@ -18,9 +18,12 @@ package org.apache.hadoop.hbase.master; +import org.apache.yetus.audience.InterfaceAudience; + /** * Interface of a factory to create MetricsMasterSource when given a MetricsMasterWrapper */ [email protected] public interface MetricsMasterSourceFactory { MetricsMasterSource create(MetricsMasterWrapper masterWrapper); http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapper.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapper.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapper.java index 80e0892..e6b2bc5 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapper.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapper.java @@ -20,11 +20,13 @@ package org.apache.hadoop.hbase.master; import java.util.Map; import java.util.Map.Entry; +import org.apache.yetus.audience.InterfaceAudience; /** * This is the interface that will expose information to hadoop1/hadoop2 implementations of the * MetricsMasterSource. */ [email protected] public interface MetricsMasterWrapper { /** http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsSnapshotSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsSnapshotSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsSnapshotSource.java index 371a316..15315b6 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsSnapshotSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsSnapshotSource.java @@ -19,7 +19,9 @@ package org.apache.hadoop.hbase.master; import org.apache.hadoop.hbase.metrics.BaseSource; +import org.apache.yetus.audience.InterfaceAudience; [email protected] public interface MetricsSnapshotSource extends BaseSource { /** * The name of the metrics http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsBalancerSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsBalancerSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsBalancerSource.java index 1c9a61e..5add25f 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsBalancerSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsBalancerSource.java @@ -19,7 +19,9 @@ package org.apache.hadoop.hbase.master.balancer; import org.apache.hadoop.hbase.metrics.BaseSource; +import org.apache.yetus.audience.InterfaceAudience; [email protected] public interface MetricsBalancerSource extends BaseSource { /** http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsStochasticBalancerSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsStochasticBalancerSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsStochasticBalancerSource.java index 1621932..6eecc12 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsStochasticBalancerSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsStochasticBalancerSource.java @@ -18,12 +18,15 @@ package org.apache.hadoop.hbase.master.balancer; +import org.apache.yetus.audience.InterfaceAudience; + /** - * This interface extends the basic metrics balancer source to add a function - * to report metrics that related to stochastic load balancer. The purpose is to + * This interface extends the basic metrics balancer source to add a function + * to report metrics that related to stochastic load balancer. The purpose is to * offer an insight to the internal cost calculations that can be useful to tune * the balancer. For details, refer to HBASE-13965 */ [email protected] public interface MetricsStochasticBalancerSource extends MetricsBalancerSource { /** http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/BaseSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/BaseSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/BaseSource.java index 652aae1..76391bb 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/BaseSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/BaseSource.java @@ -18,10 +18,13 @@ package org.apache.hadoop.hbase.metrics; +import org.apache.yetus.audience.InterfaceAudience; + /** * BaseSource for dynamic metrics to announce to Metrics2. * In hbase-hadoop{1|2}-compat there is an implementation of this interface. */ [email protected] public interface BaseSource { String HBASE_METRICS_SYSTEM_NAME = "HBase"; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/ExceptionTrackingSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/ExceptionTrackingSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/ExceptionTrackingSource.java index fa252fc..53d3d18 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/ExceptionTrackingSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/ExceptionTrackingSource.java @@ -18,10 +18,13 @@ package org.apache.hadoop.hbase.metrics; +import org.apache.yetus.audience.InterfaceAudience; + /** * Common interface for metrics source implementations which need to track individual exception * types thrown or received. */ [email protected] public interface ExceptionTrackingSource extends BaseSource { String EXCEPTIONS_NAME="exceptions"; String EXCEPTIONS_DESC="Exceptions caused by requests"; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/JvmPauseMonitorSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/JvmPauseMonitorSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/JvmPauseMonitorSource.java index af6eeed..6cb5425 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/JvmPauseMonitorSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/JvmPauseMonitorSource.java @@ -18,9 +18,12 @@ package org.apache.hadoop.hbase.metrics; +import org.apache.yetus.audience.InterfaceAudience; + /** * Interface for sources that will export JvmPauseMonitor metrics */ [email protected] public interface JvmPauseMonitorSource { String INFO_THRESHOLD_COUNT_KEY = "pauseInfoThresholdExceeded"; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/MBeanSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/MBeanSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/MBeanSource.java index e4ff880..575ca31 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/MBeanSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/MBeanSource.java @@ -19,10 +19,12 @@ package org.apache.hadoop.hbase.metrics; import javax.management.ObjectName; +import org.apache.yetus.audience.InterfaceAudience; /** * Object that will register an mbean with the underlying metrics implementation. */ [email protected] public interface MBeanSource { /** http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/OperationMetrics.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/OperationMetrics.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/OperationMetrics.java index f3e14c0..064c9ca 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/OperationMetrics.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/metrics/OperationMetrics.java @@ -18,12 +18,15 @@ package org.apache.hadoop.hbase.metrics; +import org.apache.yetus.audience.InterfaceAudience; + import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; /** * Container class for commonly collected metrics for most operations. Instantiate this class to * collect submitted count, failed count and time histogram for an operation. */ [email protected] public class OperationMetrics { private static final String SUBMITTED_COUNT = "SubmittedCount"; private static final String TIME = "Time"; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsHeapMemoryManagerSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsHeapMemoryManagerSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsHeapMemoryManagerSource.java index 532c5af..868acd8 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsHeapMemoryManagerSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsHeapMemoryManagerSource.java @@ -19,11 +19,13 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.hbase.metrics.BaseSource; +import org.apache.yetus.audience.InterfaceAudience; /** * This interface will be implemented by a MetricsSource that will export metrics from * HeapMemoryManager in RegionServer into the hadoop metrics system. */ [email protected] public interface MetricsHeapMemoryManagerSource extends BaseSource { /** * The name of the metrics http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionAggregateSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionAggregateSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionAggregateSource.java index 578ce49..23d0259 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionAggregateSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionAggregateSource.java @@ -19,11 +19,13 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.hbase.metrics.BaseSource; +import org.apache.yetus.audience.InterfaceAudience; /** * This interface will be implemented by a MetricsSource that will export metrics from * multiple regions into the hadoop metrics system. */ [email protected] public interface MetricsRegionAggregateSource extends BaseSource { /** http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerQuotaSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerQuotaSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerQuotaSource.java index 3175aad..9795374 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerQuotaSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerQuotaSource.java @@ -17,10 +17,12 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.hbase.metrics.BaseSource; +import org.apache.yetus.audience.InterfaceAudience; /** * A collection of exposed metrics for space quotas from an HBase RegionServer. */ [email protected] public interface MetricsRegionServerQuotaSource extends BaseSource { String METRICS_NAME = "Quotas"; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java index 3dd4445..70c6da8 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java @@ -20,10 +20,12 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.hbase.metrics.BaseSource; import org.apache.hadoop.hbase.metrics.JvmPauseMonitorSource; +import org.apache.yetus.audience.InterfaceAudience; /** * Interface for classes that expose metrics about the regionserver. */ [email protected] public interface MetricsRegionServerSource extends BaseSource, JvmPauseMonitorSource { /** http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactory.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactory.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactory.java index d581fd5..bf4e0bc 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactory.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactory.java @@ -20,10 +20,12 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.hbase.io.MetricsIOSource; import org.apache.hadoop.hbase.io.MetricsIOWrapper; +import org.apache.yetus.audience.InterfaceAudience; /** * Interface of a factory to create Metrics Sources used inside of regionservers. */ [email protected] public interface MetricsRegionServerSourceFactory { /** http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java index 761945a..83a8339 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java @@ -18,10 +18,13 @@ package org.apache.hadoop.hbase.regionserver; +import org.apache.yetus.audience.InterfaceAudience; + /** * This is the interface that will expose RegionServer information to hadoop1/hadoop2 * implementations of the MetricsRegionServerSource. */ [email protected] public interface MetricsRegionServerWrapper { /** http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSource.java index d5738cf..2a198d6 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSource.java @@ -18,11 +18,13 @@ package org.apache.hadoop.hbase.regionserver; +import org.apache.yetus.audience.InterfaceAudience; /** * This interface will be implemented to allow single regions to push metrics into * MetricsRegionAggregateSource that will in turn push data to the Hadoop metrics system. */ [email protected] public interface MetricsRegionSource extends Comparable<MetricsRegionSource> { String OPS_SAMPLE_NAME = "ops"; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapper.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapper.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapper.java index 371f9ba..491c1a9 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapper.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapper.java @@ -18,10 +18,13 @@ package org.apache.hadoop.hbase.regionserver; +import org.apache.yetus.audience.InterfaceAudience; + /** * Interface of class that will wrap an HRegion and export numbers so they can be * used in MetricsRegionSource */ [email protected] public interface MetricsRegionWrapper { /** http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSource.java index 6ee0c3d..39e2372 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSource.java @@ -19,11 +19,13 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.hbase.metrics.BaseSource; +import org.apache.yetus.audience.InterfaceAudience; /** * This interface will be implemented by a MetricsSource that will export metrics from * multiple regions of a table into the hadoop metrics system. */ [email protected] public interface MetricsTableAggregateSource extends BaseSource { /** http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableLatencies.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableLatencies.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableLatencies.java index 67e651a..231bad1 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableLatencies.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableLatencies.java @@ -16,9 +16,12 @@ */ package org.apache.hadoop.hbase.regionserver; +import org.apache.yetus.audience.InterfaceAudience; + /** * Latency metrics for a specific table in a RegionServer. */ [email protected] public interface MetricsTableLatencies { /** http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSource.java index ee0d3b4..b8476bf 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSource.java @@ -18,10 +18,13 @@ package org.apache.hadoop.hbase.regionserver; +import org.apache.yetus.audience.InterfaceAudience; + /** * This interface will be implemented to allow region server to push table metrics into * MetricsRegionAggregateSource that will in turn push data to the Hadoop metrics system. */ [email protected] public interface MetricsTableSource extends Comparable<MetricsTableSource> { String READ_REQUEST_COUNT = "readRequestCount"; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregate.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregate.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregate.java index 910c729..e1d2ab2 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregate.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregate.java @@ -18,11 +18,13 @@ package org.apache.hadoop.hbase.regionserver; +import org.apache.yetus.audience.InterfaceAudience; /** * Interface of class that will wrap a MetricsTableSource and export numbers so they can be * used in MetricsTableSource */ [email protected] public interface MetricsTableWrapperAggregate { /** http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALSource.java index a665571..fbe95f5 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALSource.java @@ -19,10 +19,12 @@ package org.apache.hadoop.hbase.regionserver.wal; import org.apache.hadoop.hbase.metrics.BaseSource; +import org.apache.yetus.audience.InterfaceAudience; /** * Interface of the source that will export metrics about the region server's WAL. */ [email protected] public interface MetricsWALSource extends BaseSource { http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSinkSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSinkSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSinkSource.java index 9fb8415..1d6251b 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSinkSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSinkSource.java @@ -18,6 +18,9 @@ package org.apache.hadoop.hbase.replication.regionserver; +import org.apache.yetus.audience.InterfaceAudience; + [email protected] public interface MetricsReplicationSinkSource { public static final String SINK_AGE_OF_LAST_APPLIED_OP = "sink.ageOfLastAppliedOp"; public static final String SINK_APPLIED_BATCHES = "sink.appliedBatches"; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSource.java index 6a91701..6fb5d71 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSource.java @@ -19,11 +19,13 @@ package org.apache.hadoop.hbase.replication.regionserver; import org.apache.hadoop.hbase.metrics.BaseSource; +import org.apache.yetus.audience.InterfaceAudience; /** * Provides access to gauges and counters. Implementers will hide the details of hadoop1 or * hadoop2's metrics2 classes and publishing. */ [email protected] public interface MetricsReplicationSource extends BaseSource { /** * The name of the metrics http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceFactory.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceFactory.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceFactory.java index 0e1c5cc..6534b11 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceFactory.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceFactory.java @@ -18,6 +18,9 @@ package org.apache.hadoop.hbase.replication.regionserver; +import org.apache.yetus.audience.InterfaceAudience; + [email protected] public interface MetricsReplicationSourceFactory { public MetricsReplicationSinkSource getSink(); public MetricsReplicationSourceSource getSource(String id); http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSource.java index 9075a68..f56139b 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSource.java @@ -19,7 +19,9 @@ package org.apache.hadoop.hbase.replication.regionserver; import org.apache.hadoop.hbase.metrics.BaseSource; +import org.apache.yetus.audience.InterfaceAudience; [email protected] public interface MetricsReplicationSourceSource extends BaseSource { public static final String SOURCE_SIZE_OF_LOG_QUEUE = "source.sizeOfLogQueue"; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSource.java index a5101e0..22c8753 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSource.java @@ -20,10 +20,12 @@ package org.apache.hadoop.hbase.rest; import org.apache.hadoop.hbase.metrics.BaseSource; import org.apache.hadoop.hbase.metrics.JvmPauseMonitorSource; +import org.apache.yetus.audience.InterfaceAudience; /** * Interface of the Metrics Source that will export data to Hadoop's Metrics2 system. */ [email protected] public interface MetricsRESTSource extends BaseSource, JvmPauseMonitorSource { String METRICS_NAME = "REST"; @@ -47,9 +49,9 @@ public interface MetricsRESTSource extends BaseSource, JvmPauseMonitorSource { String FAILED_PUT_KEY = "failedPut"; String FAILED_DELETE_KEY = "failedDelete"; - + String SUCCESSFUL_SCAN_KEY = "successfulScanCount"; - + String FAILED_SCAN_KEY = "failedScanCount"; String SUCCESSFUL_APPEND_KEY = "successfulAppendCount"; @@ -108,14 +110,14 @@ public interface MetricsRESTSource extends BaseSource, JvmPauseMonitorSource { * @param inc The number of failed delete requests. */ void incrementFailedDeleteRequests(int inc); - + /** * Increment the number of successful scan requests. * * @param inc Number of successful scan requests. */ void incrementSucessfulScanRequests(final int inc); - + /** * Increment the number failed scan requests. * http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSource.java index 276a40c..1e95782 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSource.java @@ -20,10 +20,12 @@ package org.apache.hadoop.hbase.thrift; import org.apache.hadoop.hbase.metrics.ExceptionTrackingSource; import org.apache.hadoop.hbase.metrics.JvmPauseMonitorSource; +import org.apache.yetus.audience.InterfaceAudience; /** * Interface of a class that will export metrics about Thrift to hadoop's metrics2. */ [email protected] public interface MetricsThriftServerSource extends ExceptionTrackingSource, JvmPauseMonitorSource { String BATCH_GET_KEY = "batchGet"; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactory.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactory.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactory.java index a4608b5..7918d73 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactory.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactory.java @@ -18,7 +18,10 @@ package org.apache.hadoop.hbase.thrift; +import org.apache.yetus.audience.InterfaceAudience; + /** Factory that will be used to create metrics sources for the two diffent types of thrift servers. */ [email protected] public interface MetricsThriftServerSourceFactory { String METRICS_NAME = "Thrift"; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSource.java index 7a40464..3e97124 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSource.java @@ -18,10 +18,12 @@ package org.apache.hadoop.hbase.zookeeper; import org.apache.hadoop.hbase.metrics.BaseSource; +import org.apache.yetus.audience.InterfaceAudience; /** * Interface of the source that will export metrics about the ZooKeeper. */ [email protected] public interface MetricsZooKeeperSource extends BaseSource { /** http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/metrics2/MetricHistogram.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/metrics2/MetricHistogram.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/metrics2/MetricHistogram.java index 9d24a23..835c50b 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/metrics2/MetricHistogram.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/metrics2/MetricHistogram.java @@ -18,10 +18,13 @@ package org.apache.hadoop.metrics2; +import org.apache.yetus.audience.InterfaceAudience; + /** * Metrics Histogram interface. Implementing classes will expose computed * quartile values through the metrics system. */ [email protected] public interface MetricHistogram { //Strings used to create metrics names. http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop-compat/src/main/java/org/apache/hadoop/metrics2/MetricsExecutor.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/metrics2/MetricsExecutor.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/metrics2/MetricsExecutor.java index f2ebc94..1366fd0 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/metrics2/MetricsExecutor.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/metrics2/MetricsExecutor.java @@ -19,10 +19,12 @@ package org.apache.hadoop.metrics2; import java.util.concurrent.ScheduledExecutorService; +import org.apache.yetus.audience.InterfaceAudience; /** * ScheduledExecutorService for metrics. */ [email protected] public interface MetricsExecutor { ScheduledExecutorService getExecutor(); http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop2-compat/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml index d0e4025..5db80e6 100644 --- a/hbase-hadoop2-compat/pom.xml +++ b/hbase-hadoop2-compat/pom.xml @@ -67,6 +67,10 @@ limitations under the License. </execution> </executions> </plugin> + <plugin> + <groupId>net.revelc.code</groupId> + <artifactId>warbucks-maven-plugin</artifactId> + </plugin> </plugins> <pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/io/MetricsIOSourceImpl.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/io/MetricsIOSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/io/MetricsIOSourceImpl.java index 3edbc55..edbb925 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/io/MetricsIOSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/io/MetricsIOSourceImpl.java @@ -23,7 +23,9 @@ import org.apache.hadoop.metrics2.MetricHistogram; import org.apache.hadoop.metrics2.MetricsCollector; import org.apache.hadoop.metrics2.MetricsRecordBuilder; import org.apache.hadoop.metrics2.lib.Interns; +import org.apache.yetus.audience.InterfaceAudience; [email protected] public class MetricsIOSourceImpl extends BaseSourceImpl implements MetricsIOSource { private final MetricsIOWrapper wrapper; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/ExceptionTrackingSourceImpl.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/ExceptionTrackingSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/ExceptionTrackingSourceImpl.java index 9ed61a1..3af27d8 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/ExceptionTrackingSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/ExceptionTrackingSourceImpl.java @@ -19,11 +19,13 @@ package org.apache.hadoop.hbase.metrics; import org.apache.hadoop.metrics2.lib.MutableFastCounter; +import org.apache.yetus.audience.InterfaceAudience; /** * Common base implementation for metrics sources which need to track exceptions thrown or * received. */ [email protected] public class ExceptionTrackingSourceImpl extends BaseSourceImpl implements ExceptionTrackingSource { protected MutableFastCounter exceptions; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/impl/GlobalMetricRegistriesAdapter.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/impl/GlobalMetricRegistriesAdapter.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/impl/GlobalMetricRegistriesAdapter.java index 5150dff..96fc954 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/impl/GlobalMetricRegistriesAdapter.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/impl/GlobalMetricRegistriesAdapter.java @@ -17,15 +17,13 @@ */ package org.apache.hadoop.hbase.metrics.impl; - import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; +import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.Optional; - import org.apache.hadoop.hbase.metrics.MetricRegistries; import org.apache.hadoop.hbase.metrics.MetricRegistry; import org.apache.hadoop.hbase.metrics.MetricRegistryInfo; @@ -36,8 +34,10 @@ import org.apache.hadoop.metrics2.impl.JmxCacheBuster; import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; import org.apache.hadoop.metrics2.lib.DefaultMetricsSystemHelper; import org.apache.hadoop.metrics2.lib.MetricsExecutorImpl; +import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; /** @@ -62,7 +62,8 @@ import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesti * initialization should be moved here. * </p> */ -public class GlobalMetricRegistriesAdapter { [email protected] +public final class GlobalMetricRegistriesAdapter { private static final Logger LOG = LoggerFactory.getLogger(GlobalMetricRegistriesAdapter.class); http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/impl/HBaseMetrics2HadoopMetricsAdapter.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/impl/HBaseMetrics2HadoopMetricsAdapter.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/impl/HBaseMetrics2HadoopMetricsAdapter.java index b6a17cf..e4d8710 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/impl/HBaseMetrics2HadoopMetricsAdapter.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/impl/HBaseMetrics2HadoopMetricsAdapter.java @@ -33,7 +33,6 @@ package org.apache.hadoop.hbase.metrics.impl; import java.util.Map; - import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.hbase.metrics.Counter; import org.apache.hadoop.hbase.metrics.Gauge; @@ -48,6 +47,7 @@ import org.apache.hadoop.metrics2.MetricsInfo; import org.apache.hadoop.metrics2.MetricsRecordBuilder; import org.apache.hadoop.metrics2.lib.Interns; import org.apache.hadoop.metrics2.lib.MutableHistogram; +import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,6 +59,7 @@ import org.slf4j.LoggerFactory; * * Some of the code is forked from https://github.com/joshelser/dropwizard-hadoop-metrics2. */ [email protected] public class HBaseMetrics2HadoopMetricsAdapter { private static final Logger LOG = LoggerFactory.getLogger(HBaseMetrics2HadoopMetricsAdapter.class); http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java index 712096d..5d18ccb 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java @@ -21,7 +21,9 @@ package org.apache.hadoop.hbase.replication.regionserver; import org.apache.hadoop.metrics2.lib.MutableFastCounter; import org.apache.hadoop.metrics2.lib.MutableGaugeLong; import org.apache.hadoop.metrics2.lib.MutableHistogram; +import org.apache.yetus.audience.InterfaceAudience; [email protected] public class MetricsReplicationGlobalSourceSource implements MetricsReplicationSourceSource{ private static final String KEY_PREFIX = "source."; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSinkSourceImpl.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSinkSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSinkSourceImpl.java index 74592d9..485764e 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSinkSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSinkSourceImpl.java @@ -19,9 +19,10 @@ package org.apache.hadoop.hbase.replication.regionserver; import org.apache.hadoop.metrics2.lib.MutableFastCounter; -import org.apache.hadoop.metrics2.lib.MutableGaugeLong; import org.apache.hadoop.metrics2.lib.MutableHistogram; +import org.apache.yetus.audience.InterfaceAudience; [email protected] public class MetricsReplicationSinkSourceImpl implements MetricsReplicationSinkSource { private final MutableHistogram ageHist; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceFactoryImpl.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceFactoryImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceFactoryImpl.java index b07790f..af310f0 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceFactoryImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceFactoryImpl.java @@ -17,6 +17,9 @@ */ package org.apache.hadoop.hbase.replication.regionserver; +import org.apache.yetus.audience.InterfaceAudience; + [email protected] public class MetricsReplicationSourceFactoryImpl implements MetricsReplicationSourceFactory { private static enum SourceHolder { http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSourceImpl.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSourceImpl.java index 0b6a1e1..be62e3d 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceSourceImpl.java @@ -20,7 +20,9 @@ package org.apache.hadoop.hbase.replication.regionserver; import org.apache.hadoop.metrics2.lib.MutableFastCounter; import org.apache.hadoop.metrics2.lib.MutableGaugeLong; import org.apache.hadoop.metrics2.lib.MutableHistogram; +import org.apache.yetus.audience.InterfaceAudience; [email protected] public class MetricsReplicationSourceSourceImpl implements MetricsReplicationSourceSource { private final MetricsReplicationSourceImpl rms; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/DefaultMetricsSystemHelper.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/DefaultMetricsSystemHelper.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/DefaultMetricsSystemHelper.java index 3ecd888..87b83e5 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/DefaultMetricsSystemHelper.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/DefaultMetricsSystemHelper.java @@ -20,9 +20,11 @@ package org.apache.hadoop.metrics2.lib; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.HashMap; +import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; [email protected] public class DefaultMetricsSystemHelper { private static final Logger LOG = LoggerFactory.getLogger(DefaultMetricsSystemHelper.class); http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableFastCounter.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableFastCounter.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableFastCounter.java index 645b8cc..7b5ec02 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableFastCounter.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableFastCounter.java @@ -22,7 +22,9 @@ import java.util.concurrent.atomic.LongAdder; import org.apache.hadoop.metrics2.MetricsInfo; import org.apache.hadoop.metrics2.MetricsRecordBuilder; +import org.apache.yetus.audience.InterfaceAudience; [email protected] public class MutableFastCounter extends MutableCounter { private final LongAdder counter; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-http/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml index dd94e32..149131a 100644 --- a/hbase-http/pom.xml +++ b/hbase-http/pom.xml @@ -120,6 +120,10 @@ </systemPropertyVariables> </configuration> </plugin> + <plugin> + <groupId>net.revelc.code</groupId> + <artifactId>warbucks-maven-plugin</artifactId> + </plugin> </plugins> <!-- General Resources --> <pluginManagement> http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-http/src/main/java/org/apache/hadoop/hbase/http/FilterContainer.java ---------------------------------------------------------------------- diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/FilterContainer.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/FilterContainer.java index 7a79acc..5869ce3 100644 --- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/FilterContainer.java +++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/FilterContainer.java @@ -18,10 +18,12 @@ package org.apache.hadoop.hbase.http; import java.util.Map; +import org.apache.yetus.audience.InterfaceAudience; /** * A container interface to add javax.servlet.Filter. */ [email protected] public interface FilterContainer { /** * Add a filter to the container. http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-http/src/main/java/org/apache/hadoop/hbase/http/FilterInitializer.java ---------------------------------------------------------------------- diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/FilterInitializer.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/FilterInitializer.java index d317343..7e8595e 100644 --- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/FilterInitializer.java +++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/FilterInitializer.java @@ -18,10 +18,12 @@ package org.apache.hadoop.hbase.http; import org.apache.hadoop.conf.Configuration; +import org.apache.yetus.audience.InterfaceAudience; /** * Initialize a javax.servlet.Filter. */ [email protected] public abstract class FilterInitializer { /** * Initialize a Filter to a FilterContainer. http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HtmlQuoting.java ---------------------------------------------------------------------- diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HtmlQuoting.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HtmlQuoting.java index 7f4bb83..e2eebb2 100644 --- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HtmlQuoting.java +++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HtmlQuoting.java @@ -20,11 +20,13 @@ package org.apache.hadoop.hbase.http; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; +import org.apache.yetus.audience.InterfaceAudience; /** * This class is responsible for quoting HTML characters. */ -public class HtmlQuoting { [email protected] +public final class HtmlQuoting { private static final byte[] ampBytes = "&".getBytes(); private static final byte[] aposBytes = "'".getBytes(); private static final byte[] gtBytes = ">".getBytes(); @@ -212,4 +214,5 @@ public class HtmlQuoting { } } + private HtmlQuoting() {} } http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLog.java ---------------------------------------------------------------------- diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLog.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLog.java index 243da1b..c83fa4f 100644 --- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLog.java +++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLog.java @@ -18,11 +18,11 @@ package org.apache.hadoop.hbase.http; import java.util.HashMap; - import org.apache.commons.logging.LogConfigurationException; import org.apache.commons.logging.impl.Log4JLogger; import org.apache.log4j.Appender; import org.apache.log4j.LogManager; +import org.apache.yetus.audience.InterfaceAudience; import org.eclipse.jetty.server.NCSARequestLog; import org.eclipse.jetty.server.RequestLog; import org.slf4j.Logger; @@ -32,7 +32,8 @@ import org.slf4j.impl.Log4jLoggerAdapter; /** * RequestLog object for use with Http */ -public class HttpRequestLog { [email protected] +public final class HttpRequestLog { private static final Logger LOG = LoggerFactory.getLogger(HttpRequestLog.class); private static final HashMap<String, String> serverToComponent; @@ -101,4 +102,6 @@ public class HttpRequestLog { return null; } } + + private HttpRequestLog() {} } http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLogAppender.java ---------------------------------------------------------------------- diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLogAppender.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLogAppender.java index 8039b34..b6ce3c1 100644 --- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLogAppender.java +++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLogAppender.java @@ -19,10 +19,12 @@ package org.apache.hadoop.hbase.http; import org.apache.log4j.spi.LoggingEvent; import org.apache.log4j.AppenderSkeleton; +import org.apache.yetus.audience.InterfaceAudience; /** * Log4j Appender adapter for HttpRequestLog */ [email protected] public class HttpRequestLogAppender extends AppenderSkeleton { private String filename; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServerUtil.java ---------------------------------------------------------------------- diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServerUtil.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServerUtil.java index 0b33fd1..777ced0 100644 --- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServerUtil.java +++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServerUtil.java @@ -17,15 +17,17 @@ */ package org.apache.hadoop.hbase.http; -import org.eclipse.jetty.security.ConstraintSecurityHandler; -import org.eclipse.jetty.util.security.Constraint; +import org.apache.yetus.audience.InterfaceAudience; import org.eclipse.jetty.security.ConstraintMapping; +import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.util.security.Constraint; /** * HttpServer utility. */ -public class HttpServerUtil { [email protected] +public final class HttpServerUtil { /** * Add constraints to a Jetty Context to disallow undesirable Http methods. * @param ctxHandler The context to modify @@ -49,4 +51,6 @@ public class HttpServerUtil { ctxHandler.setSecurityHandler(securityHandler); } + + private HttpServerUtil() {} } http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-http/src/main/java/org/apache/hadoop/hbase/http/jmx/JMXJsonServlet.java ---------------------------------------------------------------------- diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/jmx/JMXJsonServlet.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/jmx/JMXJsonServlet.java index 13d6c40..b42c270 100644 --- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/jmx/JMXJsonServlet.java +++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/jmx/JMXJsonServlet.java @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.http.jmx; import java.io.IOException; import java.io.PrintWriter; import java.lang.management.ManagementFactory; - import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; @@ -30,9 +29,9 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.hadoop.hbase.http.HttpServer; import org.apache.hadoop.hbase.util.JSONBean; +import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -110,6 +109,7 @@ import org.slf4j.LoggerFactory; * </p> * */ [email protected] public class JMXJsonServlet extends HttpServlet { private static final Logger LOG = LoggerFactory.getLogger(JMXJsonServlet.class); http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-http/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java ---------------------------------------------------------------------- diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java index 0d40972..2f62313 100644 --- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java +++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java @@ -24,28 +24,26 @@ import java.io.PrintWriter; import java.net.URL; import java.net.URLConnection; import java.util.regex.Pattern; - import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.commons.logging.impl.Jdk14Logger; import org.apache.commons.logging.impl.Log4JLogger; +import org.apache.hadoop.hbase.http.HttpServer; +import org.apache.hadoop.util.ServletUtil; +import org.apache.log4j.LogManager; import org.apache.yetus.audience.InterfaceAudience; import org.apache.yetus.audience.InterfaceStability; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.impl.Log4jLoggerAdapter; -import org.apache.hadoop.hbase.http.HttpServer; -import org.apache.hadoop.util.ServletUtil; -import org.apache.log4j.LogManager; /** * Change log level in runtime. */ [email protected] -public class LogLevel { [email protected] +public final class LogLevel { public static final String USAGES = "\nUsage: General options are:\n" + "\t[-getlevel <host:httpPort> <name>]\n" + "\t[-setlevel <host:httpPort> <name> <level>]\n"; @@ -174,4 +172,6 @@ public class LogLevel { out.println(MARKER + "Effective level: <b>" + lev + "</b><br />"); } } + + private LogLevel() {} } http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-it/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index e5650b8..db54fe7 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -154,6 +154,10 @@ -verbose:gc -XX:+PrintCommandLineFlags -XX:+PrintFlagsFinal</argLine> </configuration> </plugin> + <plugin> + <groupId>net.revelc.code</groupId> + <artifactId>warbucks-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-mapreduce/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml index 4e2f5de..34d405c 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -64,6 +64,10 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> + <plugin> + <groupId>net.revelc.code</groupId> + <artifactId>warbucks-maven-plugin</artifactId> + </plugin> </plugins> <pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileInputFormat.java ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileInputFormat.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileInputFormat.java index 01248ba..11e6c08 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileInputFormat.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileInputFormat.java @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.mapreduce; import java.io.IOException; import java.util.ArrayList; import java.util.List; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; @@ -37,6 +36,7 @@ import org.apache.hadoop.mapreduce.RecordReader; import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; import org.apache.hadoop.mapreduce.lib.input.FileSplit; +import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,6 +45,7 @@ import org.slf4j.LoggerFactory; * This code was borrowed from Apache Crunch project. * Updated to the recent version of HBase. */ [email protected] public class HFileInputFormat extends FileInputFormat<NullWritable, Cell> { private static final Logger LOG = LoggerFactory.getLogger(HFileInputFormat.class); http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HashTable.java ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HashTable.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HashTable.java index e1c69a5..b67225e 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HashTable.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HashTable.java @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Properties; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.FSDataInputStream; @@ -54,12 +53,15 @@ import org.apache.hadoop.mapreduce.lib.partition.TotalOrderPartitioner; import org.apache.hadoop.util.GenericOptionsParser; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; +import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.hbase.thirdparty.com.google.common.base.Charsets; import org.apache.hbase.thirdparty.com.google.common.base.Throwables; import org.apache.hbase.thirdparty.com.google.common.collect.Ordering; [email protected] public class HashTable extends Configured implements Tool { private static final Logger LOG = LoggerFactory.getLogger(HashTable.class); http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/JarFinder.java ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/JarFinder.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/JarFinder.java index 24efbb3..0127b51 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/JarFinder.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/JarFinder.java @@ -18,8 +18,6 @@ */ package org.apache.hadoop.hbase.mapreduce; -import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; - import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; @@ -35,6 +33,9 @@ import java.util.jar.JarOutputStream; import java.util.jar.Manifest; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import org.apache.yetus.audience.InterfaceAudience; + +import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; /** * Finds the Jar for a class. If the class is in a directory in the @@ -44,7 +45,8 @@ import java.util.zip.ZipOutputStream; * * This file was forked from hadoop/common/branches/branch-2@1377176. */ -public class JarFinder { [email protected] +public final class JarFinder { private static void copyToZipStream(File file, ZipEntry entry, ZipOutputStream zos) throws IOException { @@ -183,4 +185,6 @@ public class JarFinder { } return null; } + + private JarFinder() {} } http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/MultithreadedTableMapper.java ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/MultithreadedTableMapper.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/MultithreadedTableMapper.java index 5cd87ae..ca82e2a 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/MultithreadedTableMapper.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/MultithreadedTableMapper.java @@ -22,7 +22,6 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; @@ -39,6 +38,7 @@ import org.apache.hadoop.mapreduce.StatusReporter; import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.mapreduce.TaskAttemptID; import org.apache.hadoop.util.ReflectionUtils; +import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,6 +57,7 @@ import org.slf4j.LoggerFactory; * <p> */ [email protected] public class MultithreadedTableMapper<K2, V2> extends TableMapper<K2, V2> { private static final Logger LOG = LoggerFactory.getLogger(MultithreadedTableMapper.class); private Class<? extends Mapper<ImmutableBytesWritable, Result,K2,V2>> mapClass; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java index 6382aff..206963f 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java @@ -18,9 +18,8 @@ package org.apache.hadoop.hbase.mapreduce; import java.io.IOException; -import java.util.Iterator; import java.util.Collections; - +import java.util.Iterator; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.FileStatus; @@ -48,10 +47,13 @@ import org.apache.hadoop.mapreduce.lib.output.NullOutputFormat; import org.apache.hadoop.util.GenericOptionsParser; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; +import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.hbase.thirdparty.com.google.common.base.Throwables; [email protected] public class SyncTable extends Configured implements Tool { private static final Logger LOG = LoggerFactory.getLogger(SyncTable.class); http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java index 9065f4e..6a5f435 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java @@ -21,7 +21,6 @@ package org.apache.hadoop.hbase.mapreduce.replication; import java.io.IOException; import java.util.Arrays; import java.util.UUID; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.FileSystem; @@ -45,8 +44,8 @@ import org.apache.hadoop.hbase.filter.PrefixFilter; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.mapreduce.TableInputFormat; import org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil; -import org.apache.hadoop.hbase.mapreduce.TableSnapshotInputFormat; import org.apache.hadoop.hbase.mapreduce.TableMapper; +import org.apache.hadoop.hbase.mapreduce.TableSnapshotInputFormat; import org.apache.hadoop.hbase.mapreduce.TableSplit; import org.apache.hadoop.hbase.replication.ReplicationException; import org.apache.hadoop.hbase.replication.ReplicationFactory; @@ -65,8 +64,10 @@ import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.mapreduce.lib.output.NullOutputFormat; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; +import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; /** @@ -79,6 +80,7 @@ import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesti * Two counters are provided, Verifier.Counters.GOODROWS and BADROWS. The reason * for a why a row is different is shown in the map's log. */ [email protected] public class VerifyReplication extends Configured implements Tool { private static final Logger LOG = http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-metrics-api/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-metrics-api/pom.xml b/hbase-metrics-api/pom.xml index d7859b9..bd108e9 100644 --- a/hbase-metrics-api/pom.xml +++ b/hbase-metrics-api/pom.xml @@ -68,6 +68,10 @@ <failOnViolation>true</failOnViolation> </configuration> </plugin> + <plugin> + <groupId>net.revelc.code</groupId> + <artifactId>warbucks-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-metrics/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-metrics/pom.xml b/hbase-metrics/pom.xml index 5c913fb..c4cee1a 100644 --- a/hbase-metrics/pom.xml +++ b/hbase-metrics/pom.xml @@ -68,6 +68,10 @@ <failOnViolation>true</failOnViolation> </configuration> </plugin> + <plugin> + <groupId>net.revelc.code</groupId> + <artifactId>warbucks-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-procedure/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-procedure/pom.xml b/hbase-procedure/pom.xml index 2862cc0..8bd3fbc 100644 --- a/hbase-procedure/pom.xml +++ b/hbase-procedure/pom.xml @@ -46,6 +46,10 @@ <skipAssembly>true</skipAssembly> </configuration> </plugin> + <plugin> + <groupId>net.revelc.code</groupId> + <artifactId>warbucks-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-protocol-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml index 46a9cce..67dde6c 100644 --- a/hbase-protocol-shaded/pom.xml +++ b/hbase-protocol-shaded/pom.xml @@ -178,6 +178,10 @@ <failOnViolation>true</failOnViolation> </configuration> </plugin> + <plugin> + <groupId>net.revelc.code</groupId> + <artifactId>warbucks-maven-plugin</artifactId> + </plugin> </plugins> <pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-protocol/pom.xml b/hbase-protocol/pom.xml index 09264e3..e57c15b 100644 --- a/hbase-protocol/pom.xml +++ b/hbase-protocol/pom.xml @@ -75,6 +75,10 @@ </execution> </executions> </plugin> + <plugin> + <groupId>net.revelc.code</groupId> + <artifactId>warbucks-maven-plugin</artifactId> + </plugin> </plugins> <pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-protocol/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java ---------------------------------------------------------------------- diff --git a/hbase-protocol/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java b/hbase-protocol/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java index 9d75612..f10d30f 100644 --- a/hbase-protocol/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java +++ b/hbase-protocol/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java @@ -17,6 +17,8 @@ */ package com.google.protobuf; // This is a lie. +import org.apache.yetus.audience.InterfaceAudience; + /** * Helper class to extract byte arrays from {@link ByteString} without copy. * <p> @@ -27,6 +29,7 @@ package com.google.protobuf; // This is a lie. * * @since 0.96.1 */ [email protected] public final class HBaseZeroCopyByteString extends LiteralByteString { // Gotten from AsyncHBase code base with permission. /** Private constructor so this class cannot be instantiated. */ http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-replication/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-replication/pom.xml b/hbase-replication/pom.xml index 0621bdd..d1a06f5 100644 --- a/hbase-replication/pom.xml +++ b/hbase-replication/pom.xml @@ -45,6 +45,10 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> + <plugin> + <groupId>net.revelc.code</groupId> + <artifactId>warbucks-maven-plugin</artifactId> + </plugin> </plugins> <pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-rest/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index b9bc5be..df5b9dd 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -136,6 +136,10 @@ </execution> </executions> </plugin> + <plugin> + <groupId>net.revelc.code</groupId> + <artifactId>warbucks-maven-plugin</artifactId> + </plugin> </plugins> <pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ProtobufStreamingOutput.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ProtobufStreamingOutput.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ProtobufStreamingOutput.java index 5ea8a31..1c137e4 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ProtobufStreamingOutput.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ProtobufStreamingOutput.java @@ -20,10 +20,8 @@ package org.apache.hadoop.hbase.rest; import java.io.IOException; import java.io.OutputStream; import java.util.List; - import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.StreamingOutput; - import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.client.Result; @@ -32,9 +30,11 @@ import org.apache.hadoop.hbase.rest.model.CellModel; import org.apache.hadoop.hbase.rest.model.CellSetModel; import org.apache.hadoop.hbase.rest.model.RowModel; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; [email protected] public class ProtobufStreamingOutput implements StreamingOutput { private static final Logger LOG = LoggerFactory.getLogger(ProtobufStreamingOutput.class); http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/AuthFilter.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/AuthFilter.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/AuthFilter.java index 5dfa58c..216a3fc 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/AuthFilter.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/AuthFilter.java @@ -24,19 +24,19 @@ import static org.apache.hadoop.hbase.rest.Constants.REST_DNS_NAMESERVER; import java.io.IOException; import java.util.Map; import java.util.Properties; - import javax.servlet.FilterConfig; import javax.servlet.ServletException; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.util.DNS; import org.apache.hadoop.hbase.util.Strings; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.authentication.server.AuthenticationFilter; +import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; [email protected] public class AuthFilter extends AuthenticationFilter { private static final Logger LOG = LoggerFactory.getLogger(AuthFilter.class); private static final String REST_PREFIX = "hbase.rest.authentication."; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-rsgroup/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-rsgroup/pom.xml b/hbase-rsgroup/pom.xml index 1b3188f..d7011b7 100644 --- a/hbase-rsgroup/pom.xml +++ b/hbase-rsgroup/pom.xml @@ -63,6 +63,10 @@ <failOnViolation>true</failOnViolation> </configuration> </plugin> + <plugin> + <groupId>net.revelc.code</groupId> + <artifactId>warbucks-maven-plugin</artifactId> + </plugin> </plugins> <pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-server/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 2009f6e..7a0864c 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -235,6 +235,10 @@ </systemPropertyVariables> </configuration> </plugin> + <plugin> + <groupId>net.revelc.code</groupId> + <artifactId>warbucks-maven-plugin</artifactId> + </plugin> </plugins> <!-- General Resources --> <pluginManagement> http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-server/src/main/java/org/apache/hadoop/hbase/DaemonThreadFactory.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/DaemonThreadFactory.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/DaemonThreadFactory.java index 11da20f..fff68c7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/DaemonThreadFactory.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/DaemonThreadFactory.java @@ -19,10 +19,12 @@ package org.apache.hadoop.hbase; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.yetus.audience.InterfaceAudience; /** * Thread factory that creates daemon threads */ [email protected] public class DaemonThreadFactory implements ThreadFactory { private static final AtomicInteger poolNumber = new AtomicInteger(1); private final ThreadGroup group; http://git-wip-us.apache.org/repos/asf/hbase/blob/70c17072/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java index 8ab139f..c78f3b3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java @@ -20,12 +20,14 @@ package org.apache.hadoop.hbase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HealthChecker.HealthCheckerExitStatus; import org.apache.hadoop.util.StringUtils; +import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * The Class HealthCheckChore for running health checker regularly. */ [email protected] public class HealthCheckChore extends ScheduledChore { private static final Logger LOG = LoggerFactory.getLogger(HealthCheckChore.class); private HealthChecker healthChecker;
