ACCUMULO-3758 Ensure classes are using their own Logger
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c55fe3eb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c55fe3eb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c55fe3eb Branch: refs/heads/master Commit: c55fe3eb6550d1775789d242c914cff1f7a60b09 Parents: 6e2e678 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Apr 28 21:58:37 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Apr 28 21:58:37 2015 -0400 ---------------------------------------------------------------------- .../accumulo/examples/simple/client/RandomBatchScanner.java | 2 +- .../apache/accumulo/server/rpc/TNonblockingServerSocket.java | 2 +- .../apache/accumulo/server/security/SecurityOperation.java | 3 +-- .../accumulo/server/security/handler/ZKPermHandler.java | 5 +---- .../java/org/apache/accumulo/server/util/TableDiskUsage.java | 2 +- .../org/apache/accumulo/master/tableOps/ClonePermissions.java | 4 ++-- .../org/apache/accumulo/master/tableOps/CompactRange.java | 3 +++ .../java/org/apache/accumulo/master/tableOps/CopyFailed.java | 7 +++++-- .../java/org/apache/accumulo/master/tableOps/ImportTable.java | 4 ++++ .../java/org/apache/accumulo/master/tableOps/LoadFiles.java | 6 +++--- .../apache/accumulo/master/tableOps/MapImportFileNames.java | 5 ++++- .../java/org/apache/accumulo/master/tableOps/MasterRepo.java | 3 --- .../apache/accumulo/master/tableOps/MoveExportedFiles.java | 5 ++++- .../accumulo/master/tableOps/PopulateMetadataTable.java | 5 ++++- .../accumulo/master/tableOps/SetupNamespacePermissions.java | 4 ++-- .../org/apache/accumulo/master/tableOps/SetupPermissions.java | 4 ++-- .../org/apache/accumulo/master/tableOps/TableRangeOp.java | 3 +++ .../org/apache/accumulo/master/tableOps/TableRangeOpWait.java | 5 ++++- .../main/java/org/apache/accumulo/master/tableOps/Utils.java | 4 ++-- .../java/org/apache/accumulo/tserver/scan/NextBatchTask.java | 2 +- 20 files changed, 48 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java index a43b97d..4bd1e61 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java @@ -44,7 +44,7 @@ import com.beust.jcommander.Parameter; * Simple example for reading random batches of data from Accumulo. See docs/examples/README.batch for instructions. */ public class RandomBatchScanner { - private static final Logger log = LoggerFactory.getLogger(CountingVerifyingReceiver.class); + private static final Logger log = LoggerFactory.getLogger(RandomBatchScanner.class); /** * Generate a number of ranges, each covering a single random row. http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java index a6dc6ab..a209e69 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java +++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; * addition of the {@link #getPort()} method to retrieve the port used by the ServerSocket. */ public class TNonblockingServerSocket extends TNonblockingServerTransport { - private static final Logger log = LoggerFactory.getLogger(TNonblockingServerTransport.class.getName()); + private static final Logger log = LoggerFactory.getLogger(TNonblockingServerSocket.class); /** * This channel is where all the nonblocking magic happens. http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java index c463cad..3bb8a6c 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java @@ -29,7 +29,6 @@ import org.apache.accumulo.core.client.NamespaceNotFoundException; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.impl.Credentials; import org.apache.accumulo.core.client.impl.Namespaces; -import org.apache.accumulo.core.client.impl.SecurityOperationsImpl; import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; @@ -65,7 +64,7 @@ import org.slf4j.LoggerFactory; * Utility class for performing various security operations with the appropriate checks */ public class SecurityOperation { - private static final Logger log = LoggerFactory.getLogger(SecurityOperationsImpl.class); + private static final Logger log = LoggerFactory.getLogger(SecurityOperation.class); protected Authorizor authorizor; protected Authenticator authenticator; http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java index b8abb20..06433c4 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java @@ -46,11 +46,8 @@ import org.apache.zookeeper.KeeperException.Code; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * - */ public class ZKPermHandler implements PermissionHandler { - private static final Logger log = LoggerFactory.getLogger(ZKAuthorizor.class); + private static final Logger log = LoggerFactory.getLogger(ZKPermHandler.class); private static PermissionHandler zkPermHandlerInstance = null; private String ZKUserPath; http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java index 684e532..235286b 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java @@ -57,7 +57,7 @@ import com.google.common.base.Joiner; public class TableDiskUsage { - private static final Logger log = LoggerFactory.getLogger(Logger.class); + private static final Logger log = LoggerFactory.getLogger(TableDiskUsage.class); private int nextInternalId = 0; private Map<String,Integer> internalIds = new HashMap<String,Integer>(); private Map<Integer,String> externalIds = new HashMap<Integer,String>(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/master/src/main/java/org/apache/accumulo/master/tableOps/ClonePermissions.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ClonePermissions.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ClonePermissions.java index 3572c31..cbcc708 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ClonePermissions.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ClonePermissions.java @@ -50,7 +50,7 @@ class ClonePermissions extends MasterRepo { AuditedSecurityOperation.getInstance(environment).grantTablePermission(environment.rpcCreds(), cloneInfo.user, cloneInfo.tableId, permission, cloneInfo.namespaceId); } catch (ThriftSecurityException e) { - LoggerFactory.getLogger(FinishCloneTable.class).error("{}", e.getMessage(), e); + LoggerFactory.getLogger(ClonePermissions.class).error("{}", e.getMessage(), e); throw e; } } @@ -70,4 +70,4 @@ class ClonePermissions extends MasterRepo { public void undo(long tid, Master environment) throws Exception { AuditedSecurityOperation.getInstance(environment).deleteTable(environment.rpcCreds(), cloneInfo.tableId, cloneInfo.namespaceId); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactRange.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactRange.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactRange.java index befaea3..2a508c5 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactRange.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactRange.java @@ -38,10 +38,13 @@ import org.apache.commons.codec.binary.Hex; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.WritableUtils; import org.apache.zookeeper.KeeperException.NoNodeException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; public class CompactRange extends MasterRepo { + private static final Logger log = LoggerFactory.getLogger(CompactRange.class); private static final long serialVersionUID = 1L; private final String tableId; http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java index e0cc8ec..5f5b298 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java @@ -22,8 +22,8 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.util.HashMap; import java.util.HashSet; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Connector; @@ -45,8 +45,11 @@ import org.apache.accumulo.server.zookeeper.DistributedWorkQueue; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; import org.apache.thrift.TException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class CopyFailed extends MasterRepo { + private static final Logger log = LoggerFactory.getLogger(CopyFailed.class); private static final long serialVersionUID = 1L; @@ -155,4 +158,4 @@ class CopyFailed extends MasterRepo { return new CleanUpBulkImport(tableId, source, bulk, error); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java index a90474f..dc33303 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java @@ -33,8 +33,12 @@ import org.apache.accumulo.fate.Repo; import org.apache.accumulo.master.Master; import org.apache.accumulo.server.ServerConstants; import org.apache.hadoop.fs.Path; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ImportTable extends MasterRepo { + private static final Logger log = LoggerFactory.getLogger(ImportTable.class); + private static final long serialVersionUID = 1L; private ImportedTableInfo tableInfo; http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java index c478a5d..4a56c6f 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java @@ -33,10 +33,10 @@ import java.util.concurrent.ThreadPoolExecutor; import org.apache.accumulo.core.client.impl.ServerClient; import org.apache.accumulo.core.client.impl.thrift.ClientService; +import org.apache.accumulo.core.client.impl.thrift.ClientService.Client; import org.apache.accumulo.core.client.impl.thrift.TableOperation; import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType; import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException; -import org.apache.accumulo.core.client.impl.thrift.ClientService.Client; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.trace.Tracer; @@ -58,7 +58,7 @@ class LoadFiles extends MasterRepo { private static final long serialVersionUID = 1L; private static ExecutorService threadPool = null; - private static final Logger log = LoggerFactory.getLogger(BulkImport.class); + private static final Logger log = LoggerFactory.getLogger(LoadFiles.class); private String tableId; private String source; @@ -206,4 +206,4 @@ class LoadFiles extends MasterRepo { return result.toString(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/master/src/main/java/org/apache/accumulo/master/tableOps/MapImportFileNames.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/MapImportFileNames.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/MapImportFileNames.java index 0ee91dd..4a43c68 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/MapImportFileNames.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/MapImportFileNames.java @@ -33,8 +33,11 @@ import org.apache.accumulo.server.fs.VolumeManager; import org.apache.accumulo.server.tablets.UniqueNameAllocator; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.Path; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class MapImportFileNames extends MasterRepo { + private static final Logger log = LoggerFactory.getLogger(MapImportFileNames.class); private static final long serialVersionUID = 1L; @@ -108,4 +111,4 @@ class MapImportFileNames extends MasterRepo { public void undo(long tid, Master env) throws Exception { env.getFileSystem().deleteRecursively(new Path(tableInfo.importDir)); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/master/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java index 49e07a8..b46461c 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java @@ -18,13 +18,10 @@ package org.apache.accumulo.master.tableOps; import org.apache.accumulo.fate.Repo; import org.apache.accumulo.master.Master; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public abstract class MasterRepo implements Repo<Master> { private static final long serialVersionUID = 1L; - protected static final Logger log = LoggerFactory.getLogger(MasterRepo.class); @Override public long isReady(long tid, Master environment) throws Exception { http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/master/src/main/java/org/apache/accumulo/master/tableOps/MoveExportedFiles.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/MoveExportedFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/MoveExportedFiles.java index 19395df..c1bcc49 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/MoveExportedFiles.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/MoveExportedFiles.java @@ -27,8 +27,11 @@ import org.apache.accumulo.master.Master; import org.apache.accumulo.server.fs.VolumeManager; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.Path; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class MoveExportedFiles extends MasterRepo { + private static final Logger log = LoggerFactory.getLogger(MoveExportedFiles.class); private static final long serialVersionUID = 1L; @@ -68,4 +71,4 @@ class MoveExportedFiles extends MasterRepo { "Error renaming files " + ioe.getMessage()); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java index 72832ba..e35f01a 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java @@ -49,10 +49,13 @@ import org.apache.accumulo.server.fs.VolumeManager; import org.apache.accumulo.server.util.MetadataTableUtil; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Optional; class PopulateMetadataTable extends MasterRepo { + private static final Logger log = LoggerFactory.getLogger(PopulateMetadataTable.class); private static final long serialVersionUID = 1L; @@ -214,4 +217,4 @@ class PopulateMetadataTable extends MasterRepo { public void undo(long tid, Master environment) throws Exception { MetadataTableUtil.deleteTable(tableInfo.tableId, false, environment, environment.getMasterLock()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/master/src/main/java/org/apache/accumulo/master/tableOps/SetupNamespacePermissions.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/SetupNamespacePermissions.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/SetupNamespacePermissions.java index ace3935..aca137c 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/SetupNamespacePermissions.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/SetupNamespacePermissions.java @@ -42,7 +42,7 @@ class SetupNamespacePermissions extends MasterRepo { try { security.grantNamespacePermission(env.rpcCreds(), namespaceInfo.user, namespaceInfo.namespaceId, permission); } catch (ThriftSecurityException e) { - LoggerFactory.getLogger(FinishCreateNamespace.class).error("{}", e.getMessage(), e); + LoggerFactory.getLogger(SetupNamespacePermissions.class).error("{}", e.getMessage(), e); throw e; } } @@ -52,4 +52,4 @@ class SetupNamespacePermissions extends MasterRepo { // error return new PopulateZookeeperWithNamespace(namespaceInfo); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/master/src/main/java/org/apache/accumulo/master/tableOps/SetupPermissions.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/SetupPermissions.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/SetupPermissions.java index fd3b7da..34fea72 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/SetupPermissions.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/SetupPermissions.java @@ -43,7 +43,7 @@ class SetupPermissions extends MasterRepo { try { security.grantTablePermission(env.rpcCreds(), tableInfo.user, tableInfo.tableId, permission, tableInfo.namespaceId); } catch (ThriftSecurityException e) { - LoggerFactory.getLogger(FinishCreateTable.class).error("{}", e.getMessage(), e); + LoggerFactory.getLogger(SetupPermissions.class).error("{}", e.getMessage(), e); throw e; } } @@ -60,4 +60,4 @@ class SetupPermissions extends MasterRepo { AuditedSecurityOperation.getInstance(env).deleteTable(env.rpcCreds(), tableInfo.tableId, tableInfo.namespaceId); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOp.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOp.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOp.java index 1d8b116..879470b 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOp.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOp.java @@ -29,8 +29,11 @@ import org.apache.accumulo.server.master.state.MergeInfo; import org.apache.accumulo.server.master.state.MergeInfo.Operation; import org.apache.accumulo.server.master.state.MergeState; import org.apache.hadoop.io.Text; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TableRangeOp extends MasterRepo { + private static final Logger log = LoggerFactory.getLogger(TableRangeOp.class); private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOpWait.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOpWait.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOpWait.java index bdab469..668c790 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOpWait.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOpWait.java @@ -22,6 +22,8 @@ import org.apache.accumulo.master.Master; import org.apache.accumulo.server.master.state.MergeInfo; import org.apache.accumulo.server.master.state.MergeState; import org.apache.hadoop.io.Text; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Merge makes things hard. @@ -37,6 +39,7 @@ import org.apache.hadoop.io.Text; * and prevent merges (writes) while they run. Merge operations will lock out some operations while they run. */ class TableRangeOpWait extends MasterRepo { + private static final Logger log = LoggerFactory.getLogger(TableRangeOpWait.class); private static final long serialVersionUID = 1L; private String tableId; @@ -66,4 +69,4 @@ class TableRangeOpWait extends MasterRepo { return null; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java index c83d582..0fb9138 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java @@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory; public class Utils { private static final byte[] ZERO_BYTE = new byte[] {'0'}; + private static final Logger log = LoggerFactory.getLogger(Utils.class); static void checkTableDoesNotExist(Instance instance, String tableName, String tableId, TableOperation operation) throws ThriftTableOperationException { @@ -69,14 +70,13 @@ public class Utils { }); return new String(nid, UTF_8); } catch (Exception e1) { - LoggerFactory.getLogger(CreateTable.class).error("Failed to assign tableId to " + tableName, e1); + log.error("Failed to assign tableId to " + tableName, e1); throw new ThriftTableOperationException(tableId, tableName, TableOperation.CREATE, TableOperationExceptionType.OTHER, e1.getMessage()); } } static final Lock tableNameLock = new ReentrantLock(); static final Lock idLock = new ReentrantLock(); - private static final Logger log = LoggerFactory.getLogger(Utils.class); public static long reserveTable(String tableId, long tid, boolean writeLock, boolean tableMustExist, TableOperation op) throws Exception { if (getLock(tableId, tid, writeLock).tryLock()) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/c55fe3eb/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/NextBatchTask.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/NextBatchTask.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/NextBatchTask.java index 2e0608b..768cc53 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/NextBatchTask.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/NextBatchTask.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; public class NextBatchTask extends ScanTask<ScanBatch> { - private static final Logger log = LoggerFactory.getLogger(TabletServer.class); + private static final Logger log = LoggerFactory.getLogger(NextBatchTask.class); private final long scanID;
