http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionDispatcher.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionDispatcher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionDispatcher.java index a6f9219..f5fc979 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionDispatcher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionDispatcher.java @@ -40,7 +40,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; */ @InterfaceAudience.Private public class ForeignExceptionDispatcher implements ForeignExceptionListener, ForeignExceptionSnare { - public static final Log LOG = LogFactory.getLog(ForeignExceptionDispatcher.class); + private static final Log LOG = LogFactory.getLog(ForeignExceptionDispatcher.class); protected final String name; protected final List<ForeignExceptionListener> listeners = new ArrayList<ForeignExceptionListener>();
http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLog.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLog.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLog.java index def36a0..422db44c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLog.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpRequestLog.java @@ -33,7 +33,7 @@ import org.mortbay.jetty.RequestLog; */ public class HttpRequestLog { - public static final Log LOG = LogFactory.getLog(HttpRequestLog.class); + private static final Log LOG = LogFactory.getLog(HttpRequestLog.class); private static final HashMap<String, String> serverToComponent; static { http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java index 1ffd515..e2688b1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java @@ -101,7 +101,7 @@ import com.sun.jersey.spi.container.servlet.ServletContainer; @InterfaceAudience.Private @InterfaceStability.Evolving public class HttpServer implements FilterContainer { - public static final Log LOG = LogFactory.getLog(HttpServer.class); + private static final Log LOG = LogFactory.getLog(HttpServer.class); static final String FILTER_INITIALIZERS_PROPERTY = "hbase.http.filter.initializers"; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java index 43bbab5..ed2e925 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java @@ -51,7 +51,7 @@ import org.apache.hadoop.hbase.util.Bytes; */ @InterfaceAudience.Private public class HalfStoreFileReader extends StoreFile.Reader { - final Log LOG = LogFactory.getLog(HalfStoreFileReader.class); + private static final Log LOG = LogFactory.getLog(HalfStoreFileReader.class); final boolean top; // This is the key we split around. Its the first possible entry on a row: // i.e. empty column and a timestamp of LATEST_TIMESTAMP. http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java index f014f17..08fc9e4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java @@ -133,6 +133,7 @@ import com.google.common.base.Preconditions; */ @InterfaceAudience.Private public class HFile { + // LOG is being used in HFileBlock and CheckSumUtil static final Log LOG = LogFactory.getLog(HFile.class); /** http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java index 48e4cad..889b7e7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java @@ -99,7 +99,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; @JsonIgnoreProperties({"encodingCountsForTest"}) public class LruBlockCache implements ResizableBlockCache, HeapSize { - static final Log LOG = LogFactory.getLog(LruBlockCache.class); + private static final Log LOG = LogFactory.getLog(LruBlockCache.class); /** * Percentage of total size that eviction will evict until; e.g. if set to .8, then we will keep http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.java index df652f8..a476cfe 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.java @@ -49,7 +49,7 @@ import com.google.common.primitives.Ints; @InterfaceAudience.Private @JsonIgnoreProperties({"indexStatistics", "freeSize", "usedSize"}) public final class BucketAllocator { - static final Log LOG = LogFactory.getLog(BucketAllocator.class); + private static final Log LOG = LogFactory.getLog(BucketAllocator.class); @JsonIgnoreProperties({"completelyFree", "uninstantiated"}) public final static class Bucket { http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java index 45c75e3..259afae 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java @@ -92,7 +92,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; */ @InterfaceAudience.Private public class BucketCache implements BlockCache, HeapSize { - static final Log LOG = LogFactory.getLog(BucketCache.class); + private static final Log LOG = LogFactory.getLog(BucketCache.class); /** Priority buckets */ private static final float DEFAULT_SINGLE_FACTOR = 0.25f; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java index e2274e9..fd4de3a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java @@ -18,6 +18,8 @@ package org.apache.hadoop.hbase.ipc; */ import java.nio.channels.ClosedChannelException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.ipc.RpcServer.Call; @@ -38,6 +40,8 @@ import com.google.protobuf.Message; */ @InterfaceAudience.Private public class CallRunner { + private static final Log LOG = LogFactory.getLog(CallRunner.class); + private Call call; private RpcServerInterface rpcServer; private MonitoredRPCHandler status; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java index 8e498c4..461a8f0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java @@ -157,6 +157,7 @@ import com.google.protobuf.TextFormat; @InterfaceAudience.LimitedPrivate({HBaseInterfaceAudience.COPROC, HBaseInterfaceAudience.PHOENIX}) @InterfaceStability.Evolving public class RpcServer implements RpcServerInterface { + // LOG is being used in CallRunner and the log level is being changed in tests public static final Log LOG = LogFactory.getLog(RpcServer.class); private static final CallQueueTooBigException CALL_QUEUE_TOO_BIG_EXCEPTION = new CallQueueTooBigException(); http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java index d8ae3ba..2889d8d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java @@ -37,7 +37,7 @@ import org.apache.hadoop.hbase.util.BoundedPriorityBlockingQueue; @InterfaceAudience.LimitedPrivate({HBaseInterfaceAudience.COPROC, HBaseInterfaceAudience.PHOENIX}) @InterfaceStability.Evolving public class SimpleRpcScheduler extends RpcScheduler { - public static final Log LOG = LogFactory.getLog(SimpleRpcScheduler.class); + private static final Log LOG = LogFactory.getLog(SimpleRpcScheduler.class); public static final String CALL_QUEUE_READ_SHARE_CONF_KEY = "hbase.ipc.server.callqueue.read.ratio"; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java index c577c54..a3daf7a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java @@ -44,7 +44,7 @@ import static org.apache.hadoop.hbase.mapreduce.TableRecordReaderImpl.LOG_PER_RO @InterfaceAudience.Public @InterfaceStability.Stable public class TableRecordReaderImpl { - static final Log LOG = LogFactory.getLog(TableRecordReaderImpl.class); + private static final Log LOG = LogFactory.getLog(TableRecordReaderImpl.class); private byte [] startRow; private byte [] endRow; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java index 6d6feb1..ceb7768 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java @@ -57,7 +57,7 @@ import com.google.common.annotations.VisibleForTesting; @InterfaceAudience.Public @InterfaceStability.Stable public class HFileOutputFormat extends FileOutputFormat<ImmutableBytesWritable, KeyValue> { - static Log LOG = LogFactory.getLog(HFileOutputFormat.class); + private static final Log LOG = LogFactory.getLog(HFileOutputFormat.class); // This constant is public since the client can modify this when setting // up their conf object and thus refer to this symbol. http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java index 465be56..e533bf2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java @@ -86,7 +86,7 @@ import com.google.common.annotations.VisibleForTesting; @InterfaceStability.Evolving public class HFileOutputFormat2 extends FileOutputFormat<ImmutableBytesWritable, Cell> { - static Log LOG = LogFactory.getLog(HFileOutputFormat2.class); + private static final Log LOG = LogFactory.getLog(HFileOutputFormat2.class); // The following constants are private since these are used by // HFileOutputFormat2 to internally transfer data between job setup and http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java index 890cfdd..f4a3eb1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java @@ -59,7 +59,7 @@ import java.util.Iterator; public abstract class MultiTableInputFormatBase extends InputFormat<ImmutableBytesWritable, Result> { - final Log LOG = LogFactory.getLog(MultiTableInputFormatBase.class); + private static final Log LOG = LogFactory.getLog(MultiTableInputFormatBase.class); /** Holds the set of scans used to define the input. */ private List<Scan> scans; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java index ef35df6..82378d1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java @@ -115,7 +115,7 @@ extends InputFormat<ImmutableBytesWritable, Result> { * default is true. False means the table is using binary row key*/ public static final String TABLE_ROW_TEXTKEY = "hbase.table.row.textkey"; - final Log LOG = LogFactory.getLog(TableInputFormatBase.class); + private static final Log LOG = LogFactory.getLog(TableInputFormatBase.class); private static final String NOT_INITIALIZED = "The input format instance has not been properly " + "initialized. Ensure you call initializeTable either in your constructor or initialize " + http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java index 149752b..c3466f3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java @@ -70,7 +70,7 @@ import com.yammer.metrics.core.MetricsRegistry; @InterfaceAudience.Public @InterfaceStability.Stable public class TableMapReduceUtil { - static Log LOG = LogFactory.getLog(TableMapReduceUtil.class); + private static final Log LOG = LogFactory.getLog(TableMapReduceUtil.class); /** * Use this before submitting a TableMap job. It will appropriately set up http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java index 06fa712..f859780 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java @@ -49,7 +49,7 @@ public class TableRecordReaderImpl { public static final String LOG_PER_ROW_COUNT = "hbase.mapreduce.log.scanner.rowcount"; - static final Log LOG = LogFactory.getLog(TableRecordReaderImpl.class); + private static final Log LOG = LogFactory.getLog(TableRecordReaderImpl.class); // HBASE_COUNTER_GROUP_NAME is the name of mapreduce counter group for HBase private static final String HBASE_COUNTER_GROUP_NAME = http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java index 090b1a2..7111668 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java @@ -43,6 +43,8 @@ import org.apache.hadoop.mapreduce.InputSplit; @InterfaceStability.Evolving public class TableSplit extends InputSplit implements Writable, Comparable<TableSplit> { + /** @deprecated LOG variable would be made private. */ + @Deprecated public static final Log LOG = LogFactory.getLog(TableSplit.class); // should be < 0 (@see #readFields(DataInput)) http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java index c76828a..f481c0b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java @@ -68,7 +68,7 @@ import java.util.TreeMap; @InterfaceAudience.Public @InterfaceStability.Stable public class WALPlayer extends Configured implements Tool { - final static Log LOG = LogFactory.getLog(WALPlayer.class); + private static final Log LOG = LogFactory.getLog(WALPlayer.class); final static String NAME = "WALPlayer"; final static String BULK_OUTPUT_CONF_KEY = "wal.bulk.output"; final static String TABLES_KEY = "wal.input.tables"; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentVerificationReport.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentVerificationReport.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentVerificationReport.java index 9994dbc..53de19d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentVerificationReport.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentVerificationReport.java @@ -41,7 +41,7 @@ import org.apache.hadoop.hbase.master.balancer.FavoredNodesPlan; */ @InterfaceAudience.Private public class AssignmentVerificationReport { - protected static final Log LOG = LogFactory.getLog( + private static final Log LOG = LogFactory.getLog( AssignmentVerificationReport.class.getName()); private TableName tableName = null; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java index 4f09a9c..9fbe36f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java @@ -180,7 +180,7 @@ import com.google.protobuf.ServiceException; @SuppressWarnings("deprecation") public class MasterRpcServices extends RSRpcServices implements MasterService.BlockingInterface, RegionServerStatusService.BlockingInterface { - protected static final Log LOG = LogFactory.getLog(MasterRpcServices.class.getName()); + private static final Log LOG = LogFactory.getLog(MasterRpcServices.class.getName()); private final HMaster master; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMaster.java index 9731b4e..b6d3b27 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMaster.java @@ -37,7 +37,7 @@ import org.apache.hadoop.hbase.master.MetricsMasterWrapper; @InterfaceStability.Evolving @InterfaceAudience.Private public class MetricsMaster { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(MetricsMaster.class); private MetricsMasterSource masterSource; public MetricsMaster(MetricsMasterWrapper masterWrapper) { http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RackManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RackManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RackManager.java index 498b95c..ea4612a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RackManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RackManager.java @@ -36,7 +36,7 @@ import org.apache.hadoop.net.ScriptBasedMapping; */ @InterfaceAudience.Private public class RackManager { - static final Log LOG = LogFactory.getLog(RackManager.class); + private static final Log LOG = LogFactory.getLog(RackManager.class); public static final String UNKNOWN_RACK = "Unknown Rack"; private DNSToSwitchMapping switchMapping; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/FavoredNodesPlan.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/FavoredNodesPlan.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/FavoredNodesPlan.java index ca1ef72..17be833 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/FavoredNodesPlan.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/FavoredNodesPlan.java @@ -37,7 +37,7 @@ import org.apache.hadoop.hbase.ServerName; */ @InterfaceAudience.Private public class FavoredNodesPlan { - protected static final Log LOG = LogFactory.getLog( + private static final Log LOG = LogFactory.getLog( FavoredNodesPlan.class.getName()); /** the map between each region and its favored region server list */ http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java index 3da4110..f201417 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java @@ -51,7 +51,7 @@ import com.google.common.cache.LoadingCache; */ class RegionLocationFinder { - private static Log LOG = LogFactory.getLog(RegionLocationFinder.class); + private static final Log LOG = LogFactory.getLog(RegionLocationFinder.class); private Configuration conf; private ClusterStatus status; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java index f68bfa2..1cc8d48 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java @@ -35,7 +35,7 @@ import org.apache.hadoop.hbase.wal.DefaultWALProvider; */ @InterfaceAudience.Private public class LogCleaner extends CleanerChore<BaseLogCleanerDelegate> { - static final Log LOG = LogFactory.getLog(LogCleaner.class.getName()); + private static final Log LOG = LogFactory.getLog(LogCleaner.class.getName()); /** * @param p the period of time to sleep between each run http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java index c4ca9d3..e821b2e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java @@ -32,7 +32,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG) public class TimeToLiveHFileCleaner extends BaseHFileCleanerDelegate { - public static final Log LOG = LogFactory.getLog(TimeToLiveHFileCleaner.class.getName()); + private static final Log LOG = LogFactory.getLog(TimeToLiveHFileCleaner.class.getName()); public static final String TTL_CONF_KEY = "hbase.master.hfilecleaner.ttl"; // default ttl = 5 minutes public static final long DEFAULT_TTL = 60000 * 5; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveLogCleaner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveLogCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveLogCleaner.java index 9d68601..e46d6e1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveLogCleaner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveLogCleaner.java @@ -31,7 +31,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; */ @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG) public class TimeToLiveLogCleaner extends BaseLogCleanerDelegate { - static final Log LOG = LogFactory.getLog(TimeToLiveLogCleaner.class.getName()); + private static final Log LOG = LogFactory.getLog(TimeToLiveLogCleaner.class.getName()); // Configured time a log can be kept after it was closed private long ttl; private boolean stopped = false; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceAuditor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceAuditor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceAuditor.java index 2ba771d..99ad2fc 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceAuditor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceAuditor.java @@ -33,7 +33,7 @@ import com.google.common.annotations.VisibleForTesting; */ @InterfaceAudience.Public public class NamespaceAuditor { - private static Log LOG = LogFactory.getLog(NamespaceAuditor.class); + private static final Log LOG = LogFactory.getLog(NamespaceAuditor.class); static final String NS_AUDITOR_INIT_TIMEOUT = "hbase.namespace.auditor.init.timeout"; static final int DEFAULT_NS_AUDITOR_INIT_TIMEOUT = 120000; private NamespaceStateManager stateManager; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceStateManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceStateManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceStateManager.java index b2e47c3..6ee7d00 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceStateManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceStateManager.java @@ -45,7 +45,7 @@ import org.apache.zookeeper.data.Stat; @InterfaceAudience.Private class NamespaceStateManager extends ZooKeeperListener { - private static Log LOG = LogFactory.getLog(NamespaceStateManager.class); + private static final Log LOG = LogFactory.getLog(NamespaceStateManager.class); private ConcurrentMap<String, NamespaceTableAndRegionInfo> nsStateCache; private MasterServices master; private volatile boolean initialized = false; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java index 1a85101..3e32ca2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java @@ -38,7 +38,7 @@ import com.google.protobuf.InvalidProtocolBufferException; */ @InterfaceAudience.Private public class ZKProcedureCoordinatorRpcs implements ProcedureCoordinatorRpcs { - public static final Log LOG = LogFactory.getLog(ZKProcedureCoordinatorRpcs.class); + private static final Log LOG = LogFactory.getLog(ZKProcedureCoordinatorRpcs.class); private ZKProcedureUtil zkProc = null; protected ProcedureCoordinator coordinator = null; // if started this should be non-null http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.java index 29228db..c66c0d5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.java @@ -69,7 +69,7 @@ import com.google.protobuf.TextFormat; //to figure out whether it is a meta region or not. @InterfaceAudience.Private class AnnotationReadingPriorityFunction implements PriorityFunction { - public static final Log LOG = + private static final Log LOG = LogFactory.getLog(AnnotationReadingPriorityFunction.class.getName()); /** Used to control the scan delay, currently sqrt(numNextCall * weight) */ http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java index 4e30897..8062ad1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java @@ -56,7 +56,7 @@ import com.google.common.base.Preconditions; */ @InterfaceAudience.Private public class CompactSplitThread implements CompactionRequestor, PropagatingConfigurationObserver { - static final Log LOG = LogFactory.getLog(CompactSplitThread.class); + private static final Log LOG = LogFactory.getLog(CompactSplitThread.class); // Configuration key for the large compaction threads. public final static String LARGE_COMPACTION_THREADS = http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java index 8305b99..22a79b4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java @@ -43,7 +43,7 @@ import com.google.common.collect.Lists; */ @InterfaceAudience.Private class DefaultStoreFileManager implements StoreFileManager { - static final Log LOG = LogFactory.getLog(DefaultStoreFileManager.class); + private static final Log LOG = LogFactory.getLog(DefaultStoreFileManager.class); private final KVComparator kvComparator; private final CompactionConfiguration comConf; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index d7626c3..a6a0c57 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -196,7 +196,7 @@ import com.google.protobuf.TextFormat; @InterfaceAudience.Private public class HRegion implements HeapSize, PropagatingConfigurationObserver, Region { - public static final Log LOG = LogFactory.getLog(HRegion.class); + private static final Log LOG = LogFactory.getLog(HRegion.class); public static final String LOAD_CFS_ON_DEMAND_CONFIG_KEY = "hbase.hregion.scan.loadColumnFamiliesOnDemand"; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java index 7c6ae65..6c8eadb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java @@ -59,7 +59,7 @@ import org.apache.hadoop.hbase.util.ServerRegionReplicaUtil; */ @InterfaceAudience.Private public class HRegionFileSystem { - public static final Log LOG = LogFactory.getLog(HRegionFileSystem.class); + private static final Log LOG = LogFactory.getLog(HRegionFileSystem.class); /** Name of the region info file that resides just under the region directory. */ public final static String REGION_INFO_FILE = ".regioninfo"; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index b8fecb2..bad3890 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -195,7 +195,7 @@ import com.google.protobuf.ServiceException; public class HRegionServer extends HasThread implements RegionServerServices, LastSequenceId { - public static final Log LOG = LogFactory.getLog(HRegionServer.class); + private static final Log LOG = LogFactory.getLog(HRegionServer.class); /* * Strings to be used in forming the exception message for http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java index c647301..cf93d59 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java @@ -133,7 +133,7 @@ public class HStore implements Store { public static final int DEFAULT_COMPACTCHECKER_INTERVAL_MULTIPLIER = 1000; public static final int DEFAULT_BLOCKING_STOREFILE_COUNT = 7; - static final Log LOG = LogFactory.getLog(HStore.class); + private static final Log LOG = LogFactory.getLog(HStore.class); protected final MemStore memstore; // This stores directory in the filesystem. http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/IncreasingToUpperBoundRegionSplitPolicy.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/IncreasingToUpperBoundRegionSplitPolicy.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/IncreasingToUpperBoundRegionSplitPolicy.java index d7a9be5..476bcdb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/IncreasingToUpperBoundRegionSplitPolicy.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/IncreasingToUpperBoundRegionSplitPolicy.java @@ -41,7 +41,7 @@ import org.apache.hadoop.hbase.HTableDescriptor; @InterfaceAudience.Private public class IncreasingToUpperBoundRegionSplitPolicy extends ConstantSizeRegionSplitPolicy { - static final Log LOG = + private static final Log LOG = LogFactory.getLog(IncreasingToUpperBoundRegionSplitPolicy.class); private long initialSize; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java index e767ced..42621c9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java @@ -54,7 +54,7 @@ import com.google.common.annotations.VisibleForTesting; @InterfaceAudience.Private @VisibleForTesting public class LogRoller extends HasThread { - static final Log LOG = LogFactory.getLog(LogRoller.class); + private static final Log LOG = LogFactory.getLog(LogRoller.class); private final ReentrantLock rollLock = new ReentrantLock(); private final AtomicBoolean rollLog = new AtomicBoolean(false); private final ConcurrentHashMap<WAL, Boolean> walNeedsRoll = http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LruHashMap.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LruHashMap.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LruHashMap.java index accd7a3..18f5198 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LruHashMap.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/LruHashMap.java @@ -52,7 +52,7 @@ import java.util.Set; public class LruHashMap<K extends HeapSize, V extends HeapSize> implements HeapSize, Map<K,V> { - static final Log LOG = LogFactory.getLog(LruHashMap.class); + private static final Log LOG = LogFactory.getLog(LruHashMap.class); /** The default size (in bytes) of the LRU */ private static final long DEFAULT_MAX_MEM_USAGE = 50000; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java index 77080d7..c4b1343 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java @@ -73,7 +73,7 @@ import com.google.common.base.Preconditions; */ @InterfaceAudience.Private class MemStoreFlusher implements FlushRequester { - static final Log LOG = LogFactory.getLog(MemStoreFlusher.class); + private static final Log LOG = LogFactory.getLog(MemStoreFlusher.class); private Configuration conf; // These two data members go together. Any entry in the one must have http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java index 1955c2b..a2e02af 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java @@ -46,7 +46,7 @@ import org.apache.hadoop.metrics2.MetricsExecutor; class MetricsRegionServerWrapperImpl implements MetricsRegionServerWrapper { - public static final Log LOG = LogFactory.getLog(MetricsRegionServerWrapperImpl.class); + private static final Log LOG = LogFactory.getLog(MetricsRegionServerWrapperImpl.class); private final HRegionServer regionServer; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java index a9d5863..320f2a8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java @@ -35,7 +35,7 @@ import com.google.common.base.Preconditions; */ @InterfaceAudience.Private class RegionMergeRequest implements Runnable { - static final Log LOG = LogFactory.getLog(RegionMergeRequest.class); + private static final Log LOG = LogFactory.getLog(RegionMergeRequest.class); private final HRegion region_a; private final HRegion region_b; private final HRegionServer server; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java index 7c8ff7d..8dfd0f4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java @@ -50,7 +50,7 @@ import org.apache.hadoop.hbase.classification.InterfaceStability; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public class ScannerContext { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(ScannerContext.class); /** * Two sets of the same fields. One for the limits, another for the progress towards those limits @@ -626,4 +626,4 @@ public class ScannerContext { return sb.toString(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java index 8c73a1b..3762e47 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java @@ -36,7 +36,7 @@ import com.google.common.base.Preconditions; */ @InterfaceAudience.Private class SplitRequest implements Runnable { - static final Log LOG = LogFactory.getLog(SplitRequest.class); + private static final Log LOG = LogFactory.getLog(SplitRequest.class); private final HRegion parent; private final byte[] midKey; private final HRegionServer server; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java index c1a6b76..dd86a5d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java @@ -80,7 +80,7 @@ import com.google.common.collect.Ordering; */ @InterfaceAudience.LimitedPrivate("Coprocessor") public class StoreFile { - static final Log LOG = LogFactory.getLog(StoreFile.class.getName()); + private static final Log LOG = LogFactory.getLog(StoreFile.class.getName()); // Keys for fileinfo values in HFile @@ -1020,7 +1020,7 @@ public class StoreFile { * Reader for a StoreFile. */ public static class Reader { - static final Log LOG = LogFactory.getLog(Reader.class.getName()); + private static final Log LOG = LogFactory.getLog(Reader.class.getName()); protected BloomFilter generalBloomFilter = null; protected BloomFilter deleteFamilyBloomFilter = null; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java index 0939529..6516a3e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java @@ -44,7 +44,7 @@ import org.apache.hadoop.hbase.util.FSUtils; */ @InterfaceAudience.Private public class StoreFileInfo { - public static final Log LOG = LogFactory.getLog(StoreFileInfo.class); + private static final Log LOG = LogFactory.getLog(StoreFileInfo.class); /** * A non-capture group, for hfiles, so that this can be embedded. http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java index a8ee091..c27b455 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java @@ -44,7 +44,7 @@ import org.apache.hadoop.hbase.regionserver.StoreFile.Reader; */ @InterfaceAudience.LimitedPrivate("Coprocessor") public class StoreFileScanner implements KeyValueScanner { - static final Log LOG = LogFactory.getLog(HStore.class); + private static final Log LOG = LogFactory.getLog(HStore.class); // the reader it comes from: private final StoreFile.Reader reader; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java index f7e06ef..54164a0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java @@ -56,7 +56,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; @InterfaceAudience.Private public class StoreScanner extends NonReversedNonLazyKeyValueScanner implements KeyValueScanner, InternalScanner, ChangedReadersObserver { - static final Log LOG = LogFactory.getLog(StoreScanner.class); + private static final Log LOG = LogFactory.getLog(StoreScanner.class); protected Store store; protected ScanQueryMatcher matcher; protected KeyValueHeap heap; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreConfig.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreConfig.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreConfig.java index bf07418..1725406 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreConfig.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreConfig.java @@ -31,7 +31,7 @@ import org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration; */ @InterfaceAudience.Private public class StripeStoreConfig { - static final Log LOG = LogFactory.getLog(StripeStoreConfig.class); + private static final Log LOG = LogFactory.getLog(StripeStoreConfig.class); /** The maximum number of files to compact within a stripe; same as for regular compaction. */ public static final String MAX_FILES_KEY = "hbase.store.stripe.compaction.maxFiles"; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreEngine.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreEngine.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreEngine.java index b910527..454262b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreEngine.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreEngine.java @@ -42,7 +42,7 @@ import com.google.common.base.Preconditions; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG) public class StripeStoreEngine extends StoreEngine<StripeStoreFlusher, StripeCompactionPolicy, StripeCompactor, StripeStoreFileManager> { - static final Log LOG = LogFactory.getLog(StripeStoreEngine.class); + private static final Log LOG = LogFactory.getLog(StripeStoreEngine.class); private StripeStoreConfig config; @Override http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.java index dff6765..1bbaefe 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.java @@ -64,7 +64,7 @@ import com.google.common.collect.ImmutableList; @InterfaceAudience.Private public class StripeStoreFileManager implements StoreFileManager, StripeCompactionPolicy.StripeInformationProvider { - static final Log LOG = LogFactory.getLog(StripeStoreFileManager.class); + private static final Log LOG = LogFactory.getLog(StripeStoreFileManager.class); /** * The file metadata fields that contain the stripe information. http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.java index 0de154c..048d128 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.java @@ -44,7 +44,7 @@ import org.apache.hadoop.hbase.regionserver.StoreConfigInformation; @InterfaceAudience.Private public class CompactionConfiguration { - static final Log LOG = LogFactory.getLog(CompactionConfiguration.class); + private static final Log LOG = LogFactory.getLog(CompactionConfiguration.class); public static final String HBASE_HSTORE_COMPACTION_RATIO_KEY = "hbase.hstore.compaction.ratio"; public static final String HBASE_HSTORE_COMPACTION_RATIO_OFFPEAK_KEY = http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java index 4e7106d..5d44224 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java @@ -43,7 +43,7 @@ import com.google.common.collect.Collections2; @InterfaceAudience.LimitedPrivate({ "coprocessor" }) @InterfaceStability.Evolving public class CompactionRequest implements Comparable<CompactionRequest> { - static final Log LOG = LogFactory.getLog(CompactionRequest.class); + private static final Log LOG = LogFactory.getLog(CompactionRequest.class); // was this compaction promoted to an off-peak private boolean isOffPeak = false; private enum DisplayCompactionType { MINOR, ALL_FILES, MAJOR } http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java index 37daa11..91876b1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java @@ -153,7 +153,7 @@ public class FSHLog implements WAL { // synchronization class used to halt the consumer at a safe point -- just after all outstanding // syncs and appends have completed -- so the log roller can swap the WAL out under it. - static final Log LOG = LogFactory.getLog(FSHLog.class); + private static final Log LOG = LogFactory.getLog(FSHLog.class); private static final int DEFAULT_SLOW_SYNC_TIME_MS = 100; // in ms http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java index 9fd2a37..8caf8df 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java @@ -53,7 +53,7 @@ import com.google.common.annotations.VisibleForTesting; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.REPLICATION) @Deprecated public class HLogKey extends WALKey implements Writable { - public static final Log LOG = LogFactory.getLog(HLogKey.class); + private static final Log LOG = LogFactory.getLog(HLogKey.class); public HLogKey() { super(); http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java index 4d465e4..24fd940 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java @@ -32,7 +32,7 @@ import org.apache.hadoop.util.StringUtils; */ @InterfaceAudience.Private public class MetricsWAL extends WALActionsListener.Base { - static final Log LOG = LogFactory.getLog(MetricsWAL.class); + private static final Log LOG = LogFactory.getLog(MetricsWAL.class); private final MetricsWALSource source; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALEditsReplay.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALEditsReplay.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALEditsReplay.java index 8a4f27c..b6b1d08 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALEditsReplay.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALEditsReplay.java @@ -29,7 +29,7 @@ import org.apache.hadoop.hbase.CompatibilitySingletonFactory; */ @InterfaceAudience.Private public class MetricsWALEditsReplay { - static final Log LOG = LogFactory.getLog(MetricsWALEditsReplay.class); + private static final Log LOG = LogFactory.getLog(MetricsWALEditsReplay.class); private final MetricsEditsReplaySource source; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java index ca80e4c..cc457bb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java @@ -44,7 +44,7 @@ import static org.apache.hadoop.hbase.regionserver.wal.ProtobufLogReader.DEFAULT */ @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG) public class ProtobufLogWriter extends WriterBase { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(ProtobufLogWriter.class); protected FSDataOutputStream output; protected Codec.Encoder cellEncoder; protected WALCellCodec.ByteStringCompressor compressor; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALEdit.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALEdit.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALEdit.java index 5d0573f..c3e0e7e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALEdit.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALEdit.java @@ -83,7 +83,7 @@ import org.apache.hadoop.io.Writable; @InterfaceAudience.LimitedPrivate({ HBaseInterfaceAudience.REPLICATION, HBaseInterfaceAudience.COPROC }) public class WALEdit implements Writable, HeapSize { - public static final Log LOG = LogFactory.getLog(WALEdit.class); + private static final Log LOG = LogFactory.getLog(WALEdit.class); // TODO: Get rid of this; see HBASE-8457 public static final byte [] METAFAMILY = Bytes.toBytes("METAFAMILY"); http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALUtil.java index 94ef072..399623f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALUtil.java @@ -46,7 +46,7 @@ import com.google.protobuf.TextFormat; */ @InterfaceAudience.Private public class WALUtil { - static final Log LOG = LogFactory.getLog(WALUtil.class); + private static final Log LOG = LogFactory.getLog(WALUtil.class); /** * Write the marker that a compaction has succeeded and is about to be committed. http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java index 04c3d2d..cf08787 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java @@ -32,7 +32,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.REPLICATION) public class MetricsSource { - public static final Log LOG = LogFactory.getLog(MetricsSource.class); + private static final Log LOG = LogFactory.getLog(MetricsSource.class); private long lastTimestamp = 0; private int lastQueueSize = 0; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java index 794a3e1..4603fa8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java @@ -76,7 +76,7 @@ import com.google.common.util.concurrent.Service; public class ReplicationSource extends Thread implements ReplicationSourceInterface { - public static final Log LOG = LogFactory.getLog(ReplicationSource.class); + private static final Log LOG = LogFactory.getLog(ReplicationSource.class); // Queue of logs to process private PriorityBlockingQueue<Path> queue; private ReplicationQueues replicationQueues; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java index 4b997b4..8d38b09 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java @@ -48,7 +48,7 @@ import org.apache.hadoop.util.ToolRunner; public class ReplicationSyncUp extends Configured implements Tool { - static final Log LOG = LogFactory.getLog(ReplicationSyncUp.class.getName()); + private static final Log LOG = LogFactory.getLog(ReplicationSyncUp.class.getName()); private static Configuration conf; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java index 3ee7a9a..b9e56d9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java @@ -46,7 +46,7 @@ import org.apache.hadoop.security.token.SecretManager.InvalidToken; */ @InterfaceAudience.Private public class HBaseSaslRpcServer { - public static final Log LOG = LogFactory.getLog(HBaseSaslRpcServer.class); + private static final Log LOG = LogFactory.getLog(HBaseSaslRpcServer.class); public static void init(Configuration conf) { SaslUtil.initSaslProperties(conf.get("hbase.rpc.protection", http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java index fafc5a5..7ff2284 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java @@ -119,7 +119,7 @@ public class AccessControlLists { /** Configuration key for superusers */ public static final String SUPERUSER_CONF_KEY = "hbase.superuser"; - private static Log LOG = LogFactory.getLog(AccessControlLists.class); + private static final Log LOG = LogFactory.getLog(AccessControlLists.class); /** * Create the ACL table http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java index aeafade..2a39f77 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java @@ -155,7 +155,7 @@ public class AccessController extends BaseMasterAndRegionObserver implements RegionServerObserver, AccessControlService.Interface, CoprocessorService, EndpointObserver, BulkLoadObserver { - public static final Log LOG = LogFactory.getLog(AccessController.class); + private static final Log LOG = LogFactory.getLog(AccessController.class); private static final Log AUDITLOG = LogFactory.getLog("SecurityLogger."+AccessController.class.getName()); http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/HbaseObjectWritableFor96Migration.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/HbaseObjectWritableFor96Migration.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/HbaseObjectWritableFor96Migration.java index 2d7d9c9..fc6f0c7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/HbaseObjectWritableFor96Migration.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/HbaseObjectWritableFor96Migration.java @@ -124,7 +124,7 @@ import com.google.protobuf.RpcController; @Deprecated @InterfaceAudience.Private class HbaseObjectWritableFor96Migration implements Writable, WritableWithSize, Configurable { - protected final static Log LOG = LogFactory.getLog(HbaseObjectWritableFor96Migration.class); + private final static Log LOG = LogFactory.getLog(HbaseObjectWritableFor96Migration.class); // Here we maintain two static maps of classes to code and vice versa. // Add new classes+codes as wanted or figure way to auto-generate these http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java index 900c09d..dc6b151 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java @@ -109,7 +109,7 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService private static final int RANDOM_WIDTH = 320; private static final int RANDOM_RADIX = 32; - private static Log LOG = LogFactory.getLog(SecureBulkLoadEndpoint.class); + private static final Log LOG = LogFactory.getLog(SecureBulkLoadEndpoint.class); private final static FsPermission PERM_ALL_ACCESS = FsPermission.valueOf("-rwxrwxrwx"); private final static FsPermission PERM_HIDDEN = FsPermission.valueOf("-rwx--x--x"); http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java index e73b23c..57adbc0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java @@ -90,7 +90,7 @@ public class TableAuthManager { } } - private static Log LOG = LogFactory.getLog(TableAuthManager.class); + private static final Log LOG = LogFactory.getLog(TableAuthManager.class); private static TableAuthManager instance; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.java index 2c051ea..d5fdd41 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.java @@ -44,7 +44,7 @@ import java.util.concurrent.CountDownLatch; */ @InterfaceAudience.Private public class ZKPermissionWatcher extends ZooKeeperListener { - private static Log LOG = LogFactory.getLog(ZKPermissionWatcher.class); + private static final Log LOG = LogFactory.getLog(ZKPermissionWatcher.class); // parent node for permissions lists static final String ACL_NODE = "acl"; TableAuthManager authManager; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java index 1473537..524b6f9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java @@ -60,7 +60,7 @@ public class AuthenticationTokenSecretManager static final String NAME_PREFIX = "SecretManager-"; - private static Log LOG = LogFactory.getLog( + private static final Log LOG = LogFactory.getLog( AuthenticationTokenSecretManager.class); private long lastKeyUpdate; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenProvider.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenProvider.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenProvider.java index 6548194..a7e6113 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenProvider.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenProvider.java @@ -50,7 +50,7 @@ import org.apache.hadoop.security.token.Token; public class TokenProvider implements AuthenticationProtos.AuthenticationService.Interface, Coprocessor, CoprocessorService { - private static Log LOG = LogFactory.getLog(TokenProvider.class); + private static final Log LOG = LogFactory.getLog(TokenProvider.class); private AuthenticationTokenSecretManager secretManager; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/ZKSecretWatcher.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/ZKSecretWatcher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/ZKSecretWatcher.java index 5fb3d40..2264193 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/ZKSecretWatcher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/ZKSecretWatcher.java @@ -38,7 +38,7 @@ import org.apache.zookeeper.KeeperException; public class ZKSecretWatcher extends ZooKeeperListener { private static final String DEFAULT_ROOT_NODE = "tokenauth"; private static final String DEFAULT_KEYS_PARENT = "keys"; - private static Log LOG = LogFactory.getLog(ZKSecretWatcher.class); + private static final Log LOG = LogFactory.getLog(ZKSecretWatcher.class); private AuthenticationTokenSecretManager secretManager; private String baseKeyZNode; http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotReferenceUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotReferenceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotReferenceUtil.java index d1f787a..d1e0236 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotReferenceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotReferenceUtil.java @@ -50,7 +50,7 @@ import org.apache.hadoop.hbase.util.FSVisitor; */ @InterfaceAudience.Private public final class SnapshotReferenceUtil { - public static final Log LOG = LogFactory.getLog(SnapshotReferenceUtil.class); + private static final Log LOG = LogFactory.getLog(SnapshotReferenceUtil.class); public interface StoreFileVisitor { void storeFile(final HRegionInfo regionInfo, final String familyName, http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompoundBloomFilterWriter.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompoundBloomFilterWriter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompoundBloomFilterWriter.java index d436a98..25e98a2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompoundBloomFilterWriter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompoundBloomFilterWriter.java @@ -43,7 +43,7 @@ import org.apache.hadoop.io.Writable; public class CompoundBloomFilterWriter extends CompoundBloomFilterBase implements BloomFilterWriter, InlineBlockWriter { - protected static final Log LOG = + private static final Log LOG = LogFactory.getLog(CompoundBloomFilterWriter.class); /** The current chunk being written to */ http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompressionTest.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompressionTest.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompressionTest.java index ba3cbe3..e131bd3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompressionTest.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompressionTest.java @@ -50,7 +50,7 @@ import org.apache.hadoop.io.compress.Compressor; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) @InterfaceStability.Evolving public class CompressionTest { - static final Log LOG = LogFactory.getLog(CompressionTest.class); + private static final Log LOG = LogFactory.getLog(CompressionTest.class); public static boolean testCompression(String codec) { codec = codec.toLowerCase(); http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java index 4ca8486..7179c0d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java @@ -47,7 +47,7 @@ import org.apache.log4j.Logger; */ @InterfaceAudience.Private public class ConnectionCache { - private static Logger LOG = Logger.getLogger(ConnectionCache.class); + private static final Logger LOG = Logger.getLogger(ConnectionCache.class); private final Map<String, ConnectionInfo> connections = new ConcurrentHashMap<String, ConnectionInfo>(); http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/util/EncryptionTest.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/EncryptionTest.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/EncryptionTest.java index 1cd6ead..f45ecff 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/EncryptionTest.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/EncryptionTest.java @@ -38,7 +38,7 @@ import org.apache.hadoop.hbase.security.EncryptionUtil; @InterfaceAudience.Public @InterfaceStability.Evolving public class EncryptionTest { - static final Log LOG = LogFactory.getLog(EncryptionTest.class); + private static final Log LOG = LogFactory.getLog(EncryptionTest.class); static final Map<String, Boolean> keyProviderResults = new ConcurrentHashMap<String, Boolean>(); static final Map<String, Boolean> cipherProviderResults = http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java index ba11ca4..d21bda1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java @@ -61,7 +61,7 @@ import java.util.Random; */ @InterfaceAudience.Private public class HBaseFsckRepair { - public static final Log LOG = LogFactory.getLog(HBaseFsckRepair.class); + private static final Log LOG = LogFactory.getLog(HBaseFsckRepair.class); /** * Fix multiple assignment by doing silent closes on each RS hosting the region http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java index 0642db1..443d512 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java @@ -57,7 +57,7 @@ import org.apache.hadoop.hbase.wal.WALFactory; @InterfaceAudience.Private class HMerge { // TODO: Where is this class used? How does it relate to Merge in same package? - static final Log LOG = LogFactory.getLog(HMerge.class); + private static final Log LOG = LogFactory.getLog(HMerge.class); static final Random rand = new Random(); /* http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java index e34039d..adab203 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java @@ -55,7 +55,7 @@ import com.google.common.base.Preconditions; */ @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class Merge extends Configured implements Tool { - static final Log LOG = LogFactory.getLog(Merge.class); + private static final Log LOG = LogFactory.getLog(Merge.class); private Path rootdir; private volatile MetaUtils utils; private TableName tableName; // Name of table http://git-wip-us.apache.org/repos/asf/hbase/blob/0dbbc8b8/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitCalculator.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitCalculator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitCalculator.java index f5cc21b..b904b43 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitCalculator.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitCalculator.java @@ -53,7 +53,7 @@ import com.google.common.collect.TreeMultimap; */ @InterfaceAudience.Private public class RegionSplitCalculator<R extends KeyRange> { - final static Log LOG = LogFactory.getLog(RegionSplitCalculator.class); + private static final Log LOG = LogFactory.getLog(RegionSplitCalculator.class); private final Comparator<R> rangeCmp; /**
