This is an automated email from the ASF dual-hosted git repository. mmiller pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 05f9a67e55387c77e956b002711ba7dc2073e094 Author: Mike Miller <[email protected]> AuthorDate: Thu Aug 24 17:21:44 2017 -0400 ACCUMULO-3652 Cleaned up logging, removed TLevel Closes #32 Closes #294 --- .../accumulo/core/client/impl/MasterClient.java | 2 +- .../client/impl/MultiTableBatchWriterImpl.java | 2 +- .../accumulo/core/client/impl/ServerClient.java | 4 +- .../core/client/impl/TableOperationsImpl.java | 7 ++- .../core/client/impl/TabletServerBatchReader.java | 2 +- .../impl/TabletServerBatchReaderIterator.java | 5 +- .../core/client/impl/TabletServerBatchWriter.java | 11 ++--- .../apache/accumulo/core/client/impl/Writer.java | 4 +- .../core/client/mock/MockInstanceOperations.java | 2 +- .../core/client/mock/MockNamespaceOperations.java | 2 +- .../core/client/mock/MockTableOperations.java | 2 +- .../accumulo/core/conf/AccumuloConfiguration.java | 2 +- .../org/apache/accumulo/core/conf/Property.java | 6 +-- .../accumulo/core/conf/SiteConfiguration.java | 4 +- .../accumulo/core/file/BloomFilterLayer.java | 20 ++++---- .../file/blockfile/impl/CachableBlockFile.java | 6 +-- .../core/file/rfile/bcfile/Compression.java | 29 ++++++------ .../core/metadata/MetadataLocationObtainer.java | 1 + .../core/security/crypto/CryptoModuleFactory.java | 14 +++--- .../accumulo/core/trace/DistributedTrace.java | 2 +- .../apache/accumulo/core/volume/VolumeImpl.java | 2 +- .../apache/accumulo/core/zookeeper/ZooUtil.java | 4 +- .../java/org/apache/accumulo/fate/AdminUtil.java | 2 +- .../java/org/apache/accumulo/fate/AgeOffStore.java | 2 +- .../main/java/org/apache/accumulo/fate/Fate.java | 2 +- .../fate/zookeeper/DistributedReadWriteLock.java | 2 +- .../apache/accumulo/fate/zookeeper/ZooCache.java | 4 +- .../apache/accumulo/fate/zookeeper/ZooLock.java | 4 +- .../apache/accumulo/fate/zookeeper/ZooSession.java | 2 +- .../minicluster/impl/MiniAccumuloConfigImpl.java | 2 +- .../java/org/apache/accumulo/server/Accumulo.java | 5 +- .../accumulo/server/client/BulkImporter.java | 6 +-- .../org/apache/accumulo/server/fs/VolumeUtil.java | 2 +- .../apache/accumulo/server/init/Initialize.java | 3 +- .../server/master/balancer/TabletBalancer.java | 4 +- .../server/master/recovery/HadoopLogCloser.java | 2 +- .../server/master/state/DeadServerList.java | 2 +- .../accumulo/server/problems/ProblemReports.java | 2 +- .../server/security/AuditedSecurityOperation.java | 8 ++-- .../server/security/SecurityOperation.java | 6 +-- .../accumulo/server/security/SecurityUtil.java | 2 +- .../org/apache/accumulo/server/util/FileUtil.java | 8 ++-- .../server/util/VerifyTabletAssignments.java | 2 +- .../server/zookeeper/DistributedWorkQueue.java | 6 +-- .../accumulo/gc/GarbageCollectWriteAheadLogs.java | 2 +- .../apache/accumulo/gc/SimpleGarbageCollector.java | 16 +++---- .../replication/CloseWriteAheadLogReferences.java | 6 +-- .../java/org/apache/accumulo/master/Master.java | 5 +- .../master/MasterClientServiceHandler.java | 6 +-- .../apache/accumulo/master/TabletGroupWatcher.java | 8 ++-- .../accumulo/master/recovery/RecoveryManager.java | 6 +-- .../apache/accumulo/master/state/MergeStats.java | 7 ++- .../accumulo/master/tableOps/BulkImport.java | 2 +- .../java/org/apache/accumulo/monitor/Monitor.java | 8 ++-- .../apache/accumulo/monitor/ZooKeeperStatus.java | 2 +- .../apache/accumulo/tracer/AsyncSpanReceiver.java | 6 +-- .../apache/accumulo/tracer/SendSpansViaThrift.java | 2 +- .../org/apache/accumulo/tracer/TraceServer.java | 16 +++---- .../org/apache/accumulo/tracer/ZooTraceClient.java | 2 +- .../accumulo/tserver/BulkFailedCopyProcessor.java | 4 +- .../org/apache/accumulo/tserver/FileManager.java | 4 +- .../org/apache/accumulo/tserver/InMemoryMap.java | 2 +- .../java/org/apache/accumulo/tserver/TLevel.java | 53 ---------------------- .../org/apache/accumulo/tserver/TabletServer.java | 29 ++++++------ .../tserver/constraints/ConstraintChecker.java | 2 +- .../org/apache/accumulo/tserver/log/LogSorter.java | 4 +- .../accumulo/tserver/log/TabletServerLogger.java | 4 +- .../apache/accumulo/tserver/scan/LookupTask.java | 2 +- .../accumulo/tserver/scan/NextBatchTask.java | 2 +- .../apache/accumulo/tserver/tablet/Compactor.java | 10 ++-- .../accumulo/tserver/tablet/DatafileManager.java | 22 ++++----- .../tserver/tablet/MinorCompactionTask.java | 2 +- .../accumulo/tserver/tablet/MinorCompactor.java | 6 +-- .../apache/accumulo/tserver/tablet/RootFiles.java | 2 +- .../org/apache/accumulo/tserver/tablet/Tablet.java | 32 ++++++------- .../main/java/org/apache/accumulo/start/Main.java | 4 +- .../vfs/AccumuloReloadingVFSClassLoader.java | 6 +-- .../org/apache/accumulo/test/CreateRFiles.java | 2 +- .../accumulo/test/NativeMapConcurrencyTest.java | 2 +- .../apache/accumulo/test/QueryMetadataTable.java | 2 +- .../accumulo/test/TableConfigurationUpdateIT.java | 4 +- .../org/apache/accumulo/test/VerifyIngest.java | 5 +- .../apache/accumulo/test/functional/CleanUpIT.java | 2 +- 83 files changed, 228 insertions(+), 284 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java b/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java index 500006f..166f623 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java @@ -76,7 +76,7 @@ public class MasterClient { // do not expect to recover from this throw new RuntimeException(tte); } - log.debug("Failed to connect to master={}, will retry... ", master, tte); + log.debug("Failed to connect to master=" + master + ", will retry... ", tte); return null; } } diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java index 433ea42..aa0d469 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java @@ -143,7 +143,7 @@ public class MultiTableBatchWriterImpl implements MultiTableBatchWriter { try { close(); } catch (MutationsRejectedException mre) { - log.error("{} internal error.", MultiTableBatchWriterImpl.class.getSimpleName() , mre); + log.error(MultiTableBatchWriterImpl.class.getSimpleName() + " internal error.", mre); throw new RuntimeException("Exception when closing " + MultiTableBatchWriterImpl.class.getSimpleName(), mre); } } diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java index d1cb2d6..bfaaefb 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java @@ -94,7 +94,7 @@ public class ServerClient { } catch (TApplicationException tae) { throw new AccumuloServerException(server, tae); } catch (TTransportException tte) { - log.debug("ClientService request failed {}, retrying ...", server, tte); + log.debug("ClientService request failed " + server + ", retrying ... ", tte); sleepUninterruptibly(100, TimeUnit.MILLISECONDS); } finally { if (client != null) @@ -116,7 +116,7 @@ public class ServerClient { } catch (TApplicationException tae) { throw new AccumuloServerException(server, tae); } catch (TTransportException tte) { - log.debug("ClientService request failed {}, retrying ...", server, tte); + log.debug("ClientService request failed " + server + ", retrying ... ", tte); sleepUninterruptibly(100, TimeUnit.MILLISECONDS); } finally { if (client != null) diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java index 0a8e0f7..a5b72c1 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java @@ -1239,8 +1239,7 @@ public class TableOperationsImpl extends TableOperationsHelper { waitTime = waitFor * 10; waitTime = Math.max(100, waitTime); waitTime = Math.min(5000, waitTime); - log.trace("Waiting for {}({}) tablets, startRow = {} lastRow = {}, holes={} sleeping:{}ms", - waitFor, maxPerServer, startRow, lastRow, holes, waitTime); + log.trace("Waiting for {}({}) tablets, startRow = {} lastRow = {}, holes={} sleeping:{}ms", waitFor, maxPerServer, startRow, lastRow, holes, waitTime); sleepUninterruptibly(waitTime, TimeUnit.MILLISECONDS); } else { break; @@ -1436,8 +1435,8 @@ public class TableOperationsImpl extends TableOperationsHelper { for (Entry<String,String> entry : props.entrySet()) { if (Property.isClassProperty(entry.getKey()) && !entry.getValue().contains(Constants.CORE_PACKAGE_NAME)) { - LoggerFactory.getLogger(this.getClass()).info( - "Imported table sets '{}' to '{}'. Ensure this class is on Accumulo classpath.", entry.getKey(), entry.getValue()); + LoggerFactory.getLogger(this.getClass()).info("Imported table sets '{}' to '{}'. Ensure this class is on Accumulo classpath.", entry.getKey(), + entry.getValue()); } } diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java index 61b5248..0999090 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java @@ -83,7 +83,7 @@ public class TabletServerBatchReader extends ScannerOptions implements BatchScan @Override protected void finalize() { if (!queryThreadPool.isShutdown()) { - log.warn("{} not shutdown; did you forget to call close()? ", TabletServerBatchReader.class.getSimpleName(), ex); + log.warn(TabletServerBatchReader.class.getSimpleName() + " not shutdown; did you forget to call close()?", ex); close(); } } diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java index e2d6070..963fa41 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java @@ -250,6 +250,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value if (log.isTraceEnabled()) log.trace("Failed to bin {} ranges, tablet locations were null, retrying in 100ms", failures.size()); + try { Thread.sleep(100); } catch (InterruptedException e) { @@ -709,7 +710,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value ThriftUtil.returnClient(client); } } catch (TTransportException e) { - log.debug("Server : {} msg : {}", server, e.getMessage(), e); + log.debug("Server : {} msg : {}", server, e.getMessage()); timeoutTracker.errorOccured(e); throw new IOException(e); } catch (ThriftSecurityException e) { @@ -722,7 +723,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value log.debug("Server : {} msg : {}", server, e.getMessage(), e); throw new IOException(e); } catch (TSampleNotPresentException e) { - log.debug("Server : {} msg : {}", server, e.getMessage(), e); + log.debug("Server : " + server + " msg : " + e.getMessage(), e); String tableInfo = "?"; if (e.getExtent() != null) { Table.ID tableId = new KeyExtent(e.getExtent()).getTableId(); diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java index bd80da4..78f05d5 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java @@ -546,7 +546,7 @@ public class TabletServerBatchWriter { somethingFailed = true; this.serverSideErrors.add(server); this.notifyAll(); - log.error("Server side error on {}: ", server, e); + log.error("Server side error on {}", server, e); } private synchronized void updateUnknownErrors(String msg, Throwable t) { @@ -555,9 +555,9 @@ public class TabletServerBatchWriter { this.lastUnknownError = t; this.notifyAll(); if (t instanceof TableDeletedException || t instanceof TableOfflineException || t instanceof TimedOutException) - log.debug(msg, t); // this is not unknown + log.debug("{}", msg, t); // this is not unknown else - log.error(msg, t); + log.error("{}", msg, t); } private void checkForFailures() throws MutationsRejectedException { @@ -866,9 +866,8 @@ public class TabletServerBatchWriter { failures = sendMutationsToTabletServer(location, mutationBatch, timeoutTracker); long st2 = System.currentTimeMillis(); if (log.isTraceEnabled()) - log.trace("{}", - String.format("sent %,d mutations to %s in %.2f secs (%,.2f mutations/sec) with %,d failures", - count, location, (st2 - st1) / 1000.0, count / ((st2 - st1) / 1000.0), failures.size())); + log.trace("sent " + String.format("%,d", count) + " mutations to " + location + " in " + + String.format("%.2f secs (%,.2f mutations/sec) with %,d failures", (st2 - st1) / 1000.0, count / ((st2 - st1) / 1000.0), failures.size())); long successBytes = 0; for (Entry<KeyExtent,List<Mutation>> entry : mutationBatch.entrySet()) { diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java index 3836d58..b288472 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java @@ -99,12 +99,12 @@ public class Writer { log.trace("Not serving tablet, server = {}", parsedLocation); TabletLocator.getLocator(context, tableId).invalidateCache(tabLoc.tablet_extent); } catch (ConstraintViolationException cve) { - log.error("error sending update to {}: ", parsedLocation, cve); + log.error("error sending update to {}", parsedLocation, cve); // probably do not need to invalidate cache, but it does not hurt TabletLocator.getLocator(context, tableId).invalidateCache(tabLoc.tablet_extent); throw cve; } catch (TException e) { - log.error("error sending update to {}: ", parsedLocation, e); + log.error("error sending update to {}", parsedLocation, e); TabletLocator.getLocator(context, tableId).invalidateCache(tabLoc.tablet_extent); } diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java index 5975bf4..e264104 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java @@ -76,7 +76,7 @@ class MockInstanceOperations implements InstanceOperations { try { AccumuloVFSClassLoader.loadClass(className, Class.forName(asTypeName)); } catch (ClassNotFoundException e) { - log.warn("Could not find class named '{}' in testClassLoad. ", className, e); + log.warn("Could not find class named '" + className + "' in testClassLoad.", e); return false; } return true; diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespaceOperations.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespaceOperations.java index 49c11ce..b1cb980 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespaceOperations.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespaceOperations.java @@ -130,7 +130,7 @@ class MockNamespaceOperations extends NamespaceOperationsHelper { try { AccumuloVFSClassLoader.loadClass(className, Class.forName(asTypeName)); } catch (ClassNotFoundException e) { - log.warn("Could not load class '{}' with type name '{}' in testClassLoad() ", className, asTypeName, e); + log.warn("Could not load class '" + className + "' with type name '" + asTypeName + "' in testClassLoad()", e); return false; } return true; diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java index 6d4bd72..112b6a9 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java @@ -480,7 +480,7 @@ class MockTableOperations extends TableOperationsHelper { try { AccumuloVFSClassLoader.loadClass(className, Class.forName(asTypeName)); } catch (ClassNotFoundException e) { - log.warn("Could not load class '{}' with type name '{}' in testClassLoad(). ", className, asTypeName, e); + log.warn("Could not load class '" + className + "' with type name '" + asTypeName + "' in testClassLoad().", e); return false; } return true; diff --git a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java index 8de21b8..2c53407 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java @@ -303,7 +303,7 @@ public abstract class AccumuloConfiguration implements Iterable<Entry<String,Str try { Class<? extends T> clazz = AccumuloVFSClassLoader.loadClass(clazzName, base); instance = clazz.newInstance(); - log.info("Loaded class : {}", clazzName); + log.info("Loaded class : {}", clazzName); } catch (Exception e) { log.warn("Failed to load class ", e); } diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java index d5a7295..810c3fe 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java @@ -384,8 +384,8 @@ public enum Property { + "no longer in use are removed from the filesystem."), GC_PORT("gc.port.client", "9998", PropertyType.PORT, "The listening port for the garbage collector's monitor service"), GC_DELETE_THREADS("gc.threads.delete", "16", PropertyType.COUNT, "The number of threads used to delete files"), - GC_TRASH_IGNORE("gc.trash.ignore", "false", PropertyType.BOOLEAN, "Do not use the Trash, even if it is configured"), - GC_FILE_ARCHIVE("gc.file.archive", "false", PropertyType.BOOLEAN, "Archive any files/directories instead of moving to the HDFS trash or deleting"), + GC_TRASH_IGNORE("gc.trash.ignore", "false", PropertyType.BOOLEAN, "Do not use the Trash, even if it is configured."), + GC_FILE_ARCHIVE("gc.file.archive", "false", PropertyType.BOOLEAN, "Archive any files/directories instead of moving to the HDFS trash or deleting."), GC_TRACE_PERCENT("gc.trace.percent", "0.01", PropertyType.FRACTION, "Percent of gc cycles to trace"), // properties that are specific to the monitor server behavior @@ -931,7 +931,7 @@ public enum Property { if (loaded.put(clazzName, clazz) != clazz) log.debug("Loaded class : {}", clazzName); } catch (Exception e) { - log.warn("Failed to load class {}", e); + log.warn("Failed to load class ", e); } if (instance == null) { diff --git a/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java index 8549e33..cd35ad8 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java @@ -132,7 +132,7 @@ public class SiteConfiguration extends AccumuloConfiguration { return new String(value); } } catch (IOException e) { - log.warn("Failed to extract sensitive property ({}) from Hadoop CredentialProvider, falling back to accumulo-site.xml", key, e); + log.warn("Failed to extract sensitive property (" + key + ") from Hadoop CredentialProvider, falling back to accumulo-site.xml", e); } } } @@ -142,7 +142,7 @@ public class SiteConfiguration extends AccumuloConfiguration { if (value == null || !property.getType().isValidFormat(value)) { if (value != null) - log.error("Using default value for {} due to improperly formatted {}: ", key, property.getType(), value); + log.error("Using default value for {} due to improperly formatted {}: {}", key, property.getType(), value); value = parent.get(property); } return value; diff --git a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java index 4dffc64..01fb699 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java +++ b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java @@ -69,7 +69,7 @@ import org.slf4j.LoggerFactory; * */ public class BloomFilterLayer { - private static final Logger log = LoggerFactory.getLogger(BloomFilterLayer.class); + private static final Logger LOG = LoggerFactory.getLogger(BloomFilterLayer.class); public static final String BLOOM_FILE_NAME = "acu_bloom"; public static final int HASH_COUNT = 5; @@ -132,7 +132,7 @@ public class BloomFilterLayer { transformer = clazz.newInstance(); } catch (Exception e) { - log.error("Failed to find KeyFunctor: {}", acuconf.get(Property.TABLE_BLOOM_KEY_FUNCTOR), e); + LOG.error("Failed to find KeyFunctor: " + acuconf.get(Property.TABLE_BLOOM_KEY_FUNCTOR), e); throw new IllegalArgumentException("Failed to find KeyFunctor: " + acuconf.get(Property.TABLE_BLOOM_KEY_FUNCTOR)); } @@ -252,31 +252,31 @@ public class BloomFilterLayer { // file does not have a bloom filter, ignore it } catch (IOException ioe) { if (!closed) - log.warn("Can't open BloomFilter", ioe); + LOG.warn("Can't open BloomFilter", ioe); else - log.debug("Can't open BloomFilter, file closed : {}", ioe.getMessage()); + LOG.debug("Can't open BloomFilter, file closed : {}", ioe.getMessage()); bloomFilter = null; } catch (ClassNotFoundException e) { - log.error("Failed to find KeyFunctor in config: {}", ClassName, e); + LOG.error("Failed to find KeyFunctor in config: " + ClassName, e); bloomFilter = null; } catch (InstantiationException e) { - log.error("Could not instantiate KeyFunctor: {}", ClassName, e); + LOG.error("Could not instantiate KeyFunctor: " + ClassName, e); bloomFilter = null; } catch (IllegalAccessException e) { - log.error("Illegal acess exception", e); + LOG.error("Illegal acess exception", e); bloomFilter = null; } catch (RuntimeException rte) { if (!closed) throw rte; else - log.debug("Can't open BloomFilter, RTE after closed", rte); + LOG.debug("Can't open BloomFilter, RTE after closed ", rte); } finally { if (in != null) { try { in.close(); } catch (IOException e) { - log.warn("Failed to close", e); + LOG.warn("Failed to close ", e); } } } @@ -298,7 +298,7 @@ public class BloomFilterLayer { loadTask.run(); } else { // load the bloom filter in the background - ltp.execute(new LoggingRunnable(log, loadTask)); + ltp.execute(new LoggingRunnable(LOG, loadTask)); } } finally { // set load task to null so no one else can initiate the load diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java index 3047ebc..46824ca 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java +++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java @@ -310,7 +310,7 @@ public class CachableBlockFile { try { _iCache.cacheBlock(_lookup, b); } catch (Exception e) { - log.warn("Already cached block: {}", _lookup, e); + log.warn("Already cached block: " + _lookup, e); } } @@ -355,7 +355,7 @@ public class CachableBlockFile { b = new byte[(int) _currBlock.getRawSize()]; _currBlock.readFully(b); } catch (IOException e) { - log.debug("Error full blockRead for file {} for block {}", fileName, block, e); + log.debug("Error full blockRead for file " + fileName + " for block " + block, e); throw e; } finally { _currBlock.close(); @@ -365,7 +365,7 @@ public class CachableBlockFile { try { ce = cache.cacheBlock(_lookup, b); } catch (Exception e) { - log.warn("Already cached block: {}", _lookup, e); + log.warn("Already cached block: " + _lookup, e); } if (ce == null) diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java index cdd188e..974729b 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java +++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java @@ -48,7 +48,8 @@ import com.google.common.collect.Maps; * Compression related stuff. */ public final class Compression { - private static final Logger log = LoggerFactory.getLogger(Compression.class); + static final Logger log = LoggerFactory.getLogger(Compression.class); + /** * Prevent the instantiation of class. */ @@ -132,30 +133,32 @@ public final class Compression { private static final int DEFAULT_BUFFER_SIZE = 64 * 1024; @Override - public boolean isSupported() { + public boolean isSupported() { return codec != null; } @Override - public void initializeDefaultCodec() {if (!checked.get()) { - checked .set( true); + public void initializeDefaultCodec() { + if (!checked.get()) { + checked.set(true); codec = createNewCodec(DEFAULT_BUFFER_SIZE); } } @Override - CompressionCodec createNewCodec(int bufferSize) {String extClazz = (conf.get(CONF_LZO_CLASS) == null ? System.getProperty(CONF_LZO_CLASS) : null); - String clazz = (extClazz != null) ? extClazz : defaultClazz; - try { - log.info("Trying to load Lzo codec class: {}" , clazz); - Configuration myConf = new Configuration(conf); + CompressionCodec createNewCodec(int bufferSize) { + String extClazz = (conf.get(CONF_LZO_CLASS) == null ? System.getProperty(CONF_LZO_CLASS) : null); + String clazz = (extClazz != null) ? extClazz : defaultClazz; + try { + log.info("Trying to load Lzo codec class: {}", clazz); + Configuration myConf = new Configuration(conf); // only use the buffersize if > 0, otherwise we'll use - // the default defined within the codec if (bufferSize > 0) + // the default defined within the codec + if (bufferSize > 0) myConf.setInt(BUFFER_SIZE_OPT, bufferSize); return (CompressionCodec) ReflectionUtils.newInstance(Class.forName(clazz), myConf); - } catch (ClassNotFoundException e) { - // that is okay - + } catch (ClassNotFoundException e) { + // that is okay } return null; } diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java index 07bcdff..6336d12 100644 --- a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java +++ b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java @@ -62,6 +62,7 @@ import org.slf4j.LoggerFactory; public class MetadataLocationObtainer implements TabletLocationObtainer { private static final Logger log = LoggerFactory.getLogger(MetadataLocationObtainer.class); + private SortedSet<Column> locCols; private ArrayList<Column> columns; diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java index 37c2ef8..6a295ad 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java +++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java @@ -105,13 +105,12 @@ public class CryptoModuleFactory { log.debug("Successfully instantiated crypto module {}", cryptoModuleClassname); } catch (InstantiationException e) { - log.warn("Got instantiation exception {} when instantiating crypto module \"{}\". No encryption will be used.", e.getCause().getClass() - .getName(), cryptoModuleClassname); + log.warn("Got instantiation exception {} when instantiating crypto module \"{}\". No encryption will be used.", e.getCause().getClass().getName(), + cryptoModuleClassname); log.warn("InstantiationException {}", e.getCause()); return new NullCryptoModule(); } catch (IllegalAccessException e) { - log.warn("Got illegal access exception when trying to instantiate crypto module \"{}\". No encryption will be used.", - cryptoModuleClassname); + log.warn("Got illegal access exception when trying to instantiate crypto module \"{}\". No encryption will be used.", cryptoModuleClassname); log.warn("IllegalAccessException", e); return new NullCryptoModule(); } @@ -182,13 +181,12 @@ public class CryptoModuleFactory { log.debug("Successfully instantiated secret key encryption strategy {}", className); } catch (InstantiationException e) { - log.warn("Got instantiation exception {} when instantiating secret key encryption strategy \"{}\". No encryption will be used.", e - .getCause().getClass().getName(), className); + log.warn("Got instantiation exception {} when instantiating secret key encryption strategy \"{}\". No encryption will be used.", e.getCause() + .getClass().getName(), className); log.warn("InstantiationException {}", e.getCause()); return new NullSecretKeyEncryptionStrategy(); } catch (IllegalAccessException e) { - log.warn("Got illegal access exception when trying to instantiate secret key encryption strategy \"{}\". No encryption will be used.", - className); + log.warn("Got illegal access exception when trying to instantiate secret key encryption strategy \"{}\". No encryption will be used.", className); log.warn("IllegalAccessException", e); return new NullSecretKeyEncryptionStrategy(); } diff --git a/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java index b0bd57f..4cf819f 100644 --- a/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java +++ b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java @@ -199,7 +199,7 @@ public class DistributedTrace { try { rcvr.close(); } catch (IOException e) { - log.warn("Unable to close SpanReceiver correctly: {} {}", e.getMessage(), e); + log.warn("Unable to close SpanReceiver correctly: {}", e.getMessage(), e); } } receivers.clear(); diff --git a/core/src/main/java/org/apache/accumulo/core/volume/VolumeImpl.java b/core/src/main/java/org/apache/accumulo/core/volume/VolumeImpl.java index a55ff0d..a77da40 100644 --- a/core/src/main/java/org/apache/accumulo/core/volume/VolumeImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/volume/VolumeImpl.java @@ -76,7 +76,7 @@ public class VolumeImpl implements Volume { try { other = p.getFileSystem(CachedConfiguration.getInstance()); } catch (IOException e) { - log.warn("Could not determine filesystem from path: {}", p); + log.warn("Could not determine filesystem from path: {}", p, e); return false; } diff --git a/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java b/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java index bf21440..ee52f57 100644 --- a/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java @@ -72,12 +72,12 @@ public class ZooUtil extends org.apache.accumulo.fate.zookeeper.ZooUtil { return result; } } catch (IOException e) { - log.error("Problem reading instance id out of hdfs at {}", instanceDirectory, e); + log.error("Problem reading instance id out of hdfs at " + instanceDirectory, e); throw new RuntimeException("Can't tell if Accumulo is initialized; can't read instance id at " + instanceDirectory, e); } catch (IllegalArgumentException exception) { /* HDFS throws this when there's a UnknownHostException due to DNS troubles. */ if (exception.getCause() instanceof UnknownHostException) { - log.error("Problem reading instance id out of hdfs at {}", instanceDirectory, exception); + log.error("Problem reading instance id out of hdfs at " + instanceDirectory, exception); } throw exception; } diff --git a/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java b/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java index 65938ac..93c8a37 100644 --- a/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java +++ b/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java @@ -226,7 +226,7 @@ public class AdminUtil<T> { } } catch (Exception e) { - log.error("Failed to read locks for {} continuing.", id, e); + log.error("Failed to read locks for " + id + " continuing.", e); } } diff --git a/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java b/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java index aa31653..e819327 100644 --- a/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java +++ b/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java @@ -105,7 +105,7 @@ public class AgeOffStore<T> implements TStore<T> { store.unreserve(txid, 0); } } catch (Exception e) { - log.warn("Failed to age off FATE tx {}", String.format("%016x", txid), e); + log.warn("Failed to age off FATE tx " + String.format("%016x", txid), e); } } } diff --git a/fate/src/main/java/org/apache/accumulo/fate/Fate.java b/fate/src/main/java/org/apache/accumulo/fate/Fate.java index 9389428..73257b6 100644 --- a/fate/src/main/java/org/apache/accumulo/fate/Fate.java +++ b/fate/src/main/java/org/apache/accumulo/fate/Fate.java @@ -152,7 +152,7 @@ public class Fate<T> { try { op.undo(tid, environment); } catch (Exception e) { - log.warn("Failed to undo Repo, tid={}", String.format("%016x", tid), e); + log.warn("Failed to undo Repo, tid=" + String.format("%016x", tid), e); } } diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java index b6e5be8..6153107 100644 --- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java +++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java @@ -145,7 +145,7 @@ public class DistributedReadWriteLock implements java.util.concurrent.locks.Read public boolean tryLock() { if (entry == -1) { entry = qlock.addEntry(new ParsedLock(this.lockType(), this.userData).getLockData()); - log.info("Added lock entry {} userData {} lockTpye {}", entry, new String(this.userData, UTF_8), lockType()); + log.info("Added lock entry {} userData {} lockTpye {}", entry, new String(this.userData, UTF_8), lockType()); } SortedMap<Long,byte[]> entries = qlock.getEarlierEntries(entry); for (Entry<Long,byte[]> entry : entries.entrySet()) { diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java index 712ac83..632e46d 100644 --- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java +++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java @@ -191,9 +191,9 @@ public class ZooCache { } catch (KeeperException e) { final Code code = e.code(); if (code == Code.NONODE) { - log.error("Looked up non-existent node in cache {}", e.getPath(), e); + log.error("Looked up non-existent node in cache " + e.getPath(), e); } else if (code == Code.CONNECTIONLOSS || code == Code.OPERATIONTIMEOUT || code == Code.SESSIONEXPIRED) { - log.warn("Saw (possibly) transient exception communicating with ZooKeeper, will retry {}", e); + log.warn("Saw (possibly) transient exception communicating with ZooKeeper, will retry", e); } else { log.warn("Zookeeper error, will retry", e); } diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java index c102397..7b7681d 100644 --- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java +++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java @@ -277,7 +277,7 @@ public class ZooLock implements Watcher { } } catch (Throwable e) { lockWatcher.unableToMonitorLockNode(e); - log.error("Failed to stat lock node {}", asyncLockPath, e); + log.error("Failed to stat lock node " + asyncLockPath, e); } } @@ -388,7 +388,7 @@ public class ZooLock implements Watcher { } catch (Exception ex) { if (lock != null || asyncLock != null) { lockWatcher.unableToMonitorLockNode(ex); - log.error("Error resetting watch on ZooLock {} {}", lock == null ? asyncLock : lock, event, ex); + log.error("Error resetting watch on ZooLock " + lock == null ? asyncLock : lock + " " + event, ex); } } diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java index 6dc8062..e6250d5 100644 --- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java +++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java @@ -109,7 +109,7 @@ public class ZooSession { */ sleepTime = Math.max(sleepTime, (AddressUtil.getAddressCacheNegativeTtl((UnknownHostException) e) + 1) * 1000); } - log.warn("Connection to zooKeeper failed, will try again in {} {}", String.format("%.2f secs", sleepTime / 1000.0), e); + log.warn("Connection to zooKeeper failed, will try again in " + String.format("%.2f secs", sleepTime / 1000.0), e); } finally { if (tryAgain && zooKeeper != null) try { diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java index 8505146..0f4634d 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java @@ -214,7 +214,7 @@ public class MiniAccumuloConfigImpl { try { CredentialProviderFactoryShim.createEntry(conf, entry.getKey(), entry.getValue().toCharArray()); } catch (IOException e) { - log.warn("Attempted to add {} to CredentialProvider but failed", entry.getKey(), e); + log.warn("Attempted to add " + entry.getKey() + " to CredentialProvider but failed", e); continue; } diff --git a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java index 802ff93..a73faf8 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java +++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java @@ -48,10 +48,9 @@ import org.apache.accumulo.server.zookeeper.ZooReaderWriter; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.log4j.helpers.LogLog; import org.apache.zookeeper.KeeperException; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class Accumulo { @@ -217,7 +216,7 @@ public class Accumulo { if (unknownHostTries > 0) { log.warn("Unable to connect to HDFS, will retry. cause: {}", exception.getCause()); /* We need to make sure our sleep period is long enough to avoid getting a cached failure of the host lookup. */ - sleep = Math.max(sleep, (org.apache.accumulo.fate.util.AddressUtil.getAddressCacheNegativeTtl((UnknownHostException) (exception.getCause())) + 1) * 1000); + sleep = Math.max(sleep, (AddressUtil.getAddressCacheNegativeTtl((UnknownHostException) (exception.getCause())) + 1) * 1000); } else { log.error("Unable to connect to HDFS and have exceeded the maximum number of retries.", exception); throw exception; diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java index f17deed..bb10a1a 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java +++ b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java @@ -147,7 +147,7 @@ public class BulkImporter { try { tabletsToAssignMapFileTo = findOverlappingTablets(context, fs, locator, mapFile); } catch (Exception ex) { - log.warn("Unable to find tablets that overlap file {}", mapFile.toString(), ex); + log.warn("Unable to find tablets that overlap file " + mapFile.toString(), ex); } log.debug("Map file {} found to overlap {} tablets", mapFile, tabletsToAssignMapFileTo.size()); if (tabletsToAssignMapFileTo.size() == 0) { @@ -210,7 +210,7 @@ public class BulkImporter { tabletsToAssignMapFileTo.addAll(findOverlappingTablets(context, fs, locator, entry.getKey(), ke)); keListIter.remove(); } catch (Exception ex) { - log.warn("Exception finding overlapping tablets, will retry tablet {}", ke, ex); + log.warn("Exception finding overlapping tablets, will retry tablet " + ke, ex); } timer.stop(Timers.QUERY_METADATA); } @@ -345,7 +345,7 @@ public class BulkImporter { mapFileSizes.put(path, fs.getContentSummary(path).getLength()); } } catch (IOException e) { - log.error("Failed to get map files in for {}: {}", paths, e.getMessage(), e); + log.error("Failed to get map files in for {}: {}", paths, e.getMessage(), e); throw new RuntimeException(e); } diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java index adfd9dd..d009d1e 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java @@ -166,7 +166,7 @@ public class VolumeUtil { String newLocation = switchVolume(location, FileType.TABLE, ServerConstants.getVolumeReplacements()); if (newLocation != null) { MetadataTableUtil.setRootTabletDir(newLocation); - log.info("Volume replaced: {} -> {}", location, newLocation); + log.info("Volume replaced: {} -> {}", location, newLocation); return new Path(newLocation).toString(); } return location; diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java index 1cf1859..50f901e 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java +++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java @@ -722,7 +722,8 @@ public class Initialize implements KeywordExecutable { for (Pair<Path,Path> replacementVolume : ServerConstants.getVolumeReplacements()) { if (aBasePath.equals(replacementVolume.getFirst())) log.error("{} is set to be replaced in {} and should not appear in {}" - + ". It is highly recommended that this property be removed as data could still be written to this volume.", aBasePath, Property.INSTANCE_VOLUMES_REPLACEMENTS, Property.INSTANCE_VOLUMES); + + ". It is highly recommended that this property be removed as data could still be written to this volume.", aBasePath, + Property.INSTANCE_VOLUMES_REPLACEMENTS, Property.INSTANCE_VOLUMES); } if (ServerConstants.DATA_VERSION != Accumulo.getAccumuloPersistentVersion(versionPath.getFileSystem(CachedConfiguration.getInstance()), versionPath)) { diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java index 03e9ea9..c1229f9 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java @@ -235,11 +235,11 @@ public abstract class TabletBalancer { continue; } if (m.newServer == null) { - log.warn("Balancer did not set the destination {}", m); + log.warn("Balancer did not set the destination {}", m); continue; } if (m.oldServer == null) { - log.warn("Balancer did not set the source {}", m); + log.warn("Balancer did not set the source {}", m); continue; } if (!current.contains(m.oldServer)) { diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java b/server/base/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java index 5b778bd..ac21ea9 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java @@ -60,7 +60,7 @@ public class HadoopLogCloser implements LogCloser { } catch (FileNotFoundException ex) { throw ex; } catch (Exception ex) { - log.warn("Error recovering lease on {}", source.toString(), ex); + log.warn("Error recovering lease on " + source.toString(), ex); ns.append(source).close(); log.info("Recovered lease on {} using append", source.toString()); } diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java index 8abab08..0be5f45 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java @@ -41,7 +41,7 @@ public class DeadServerList { try { zoo.mkdirs(path); } catch (Exception ex) { - log.error("Unable to make parent directories of {}", path, ex); + log.error("Unable to make parent directories of " + path, ex); } } diff --git a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java index 2d53c49..8bb179f 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java +++ b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java @@ -105,7 +105,7 @@ public class ProblemReports implements Iterable<ProblemReport> { pr.saveToMetadataTable(context); } } catch (Exception e) { - log.error("Failed to file problem report {} {} {}", pr.getTableId(), pr.getProblemType(), pr.getResource(), e); + log.error("Failed to file problem report " + pr.getTableId() + " " + pr.getProblemType() + " " + pr.getResource(), e); } } diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java b/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java index 2d6e257..81fb76f 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java @@ -51,8 +51,8 @@ import org.apache.accumulo.server.security.handler.Authenticator; import org.apache.accumulo.server.security.handler.Authorizor; import org.apache.accumulo.server.security.handler.PermissionHandler; import org.apache.hadoop.io.Text; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -111,7 +111,7 @@ public class AuditedSecurityOperation extends SecurityOperation { * digging through loads of other code to find it. */ private void audit(TCredentials credentials, ThriftSecurityException ex, String template, Object... args) { - audit.warn("operation: failed; user: {}; {}; exception: {}",credentials.getPrincipal(), String.format(template, args), ex.toString()); + audit.warn("operation: failed; user: {}; {}; exception: {}", credentials.getPrincipal(), String.format(template, args), ex.toString()); } private void audit(TCredentials credentials, String template, Object... args) { @@ -123,8 +123,8 @@ public class AuditedSecurityOperation extends SecurityOperation { private void audit(TCredentials credentials, boolean permitted, String template, Object... args) { if (shouldAudit(credentials)) { String prefix = permitted ? "permitted" : "denied"; - audit.info("operation: {}; user: {}; client: {}; {}", - prefix, credentials.getPrincipal(), TServerUtils.clientAddress.get(), String.format(template, args)); + audit + .info("operation: {}; user: {}; client: {}; {}", prefix, credentials.getPrincipal(), TServerUtils.clientAddress.get(), String.format(template, args)); } } 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 c7cddaf..1918646 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 @@ -699,8 +699,7 @@ public class SecurityOperation { try { permHandle.grantNamespacePermission(user, namespace, permission); - log.info("Granted namespace permission {} for user {} on the namespace {} at the request of user {}", - permission, user, namespace, c.getPrincipal()); + log.info("Granted namespace permission {} for user {} on the namespace {} at the request of user {}", permission, user, namespace, c.getPrincipal()); } catch (AccumuloSecurityException e) { throw e.asThriftException(); } catch (NamespaceNotFoundException e) { @@ -749,8 +748,7 @@ public class SecurityOperation { try { permHandle.revokeNamespacePermission(user, namespace, permission); - log.info("Revoked namespace permission {} for user {} on the namespace {} at the request of user {}", - permission, user, namespace, c.getPrincipal()); + log.info("Revoked namespace permission {} for user {} on the namespace {} at the request of user {}", permission, user, namespace, c.getPrincipal()); } catch (AccumuloSecurityException e) { throw e.asThriftException(); diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java index f502b8c..ebad6dd 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java @@ -94,7 +94,7 @@ public class SecurityUtil { return true; } } catch (IOException io) { - log.error("Error logging in user {} using keytab at {}", principalConfig, keyTabPath, io); + log.error("Error logging in user " + principalConfig + " using keytab at " + keyTabPath, io); } return false; } diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java index 8fa5292..3e7372d 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java @@ -297,8 +297,8 @@ public class FileUtil { if (numKeys == 0) { if (useIndex) { - log.warn("Failed to find mid point using indexes, falling back to data files which is slower. No entries between {} and {} for {}", - prevEndRow, endRow, mapFiles); + log.warn("Failed to find mid point using indexes, falling back to data files which is slower. No entries between {} and {} for {}", prevEndRow, + endRow, mapFiles); // need to pass original map files, not possibly reduced indexes return findMidPoint(fs, tabletDirectory, acuConf, prevEndRow, endRow, origMapFiles, minSplit, false); } @@ -447,13 +447,13 @@ public class FileUtil { } } catch (IOException ioe) { - log.warn("Failed to read map file to determine first and last key : {} {}", mapfile, ioe); + log.warn("Failed to read map file to determine first and last key : " + mapfile, ioe); } finally { if (reader != null) { try { reader.close(); } catch (IOException ioe) { - log.warn("failed to close {} {}", mapfile, ioe); + log.warn("failed to close " + mapfile, ioe); } } } diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java b/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java index 3ee7f69..da33888 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java @@ -127,7 +127,7 @@ public class VerifyTabletAssignments { try { checkTabletServer(context, entry, failures); } catch (Exception e) { - log.error("Failure on tablet server ' {}.", entry.getKey(), e); + log.error("Failure on tablet server '" + entry.getKey() + ".", e); failures.addAll(entry.getValue()); } } diff --git a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java index 5ac3e96..e3da9b3 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java +++ b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java @@ -110,17 +110,17 @@ public class DistributedWorkQueue { try { zoo.recursiveDelete(childPath, NodeMissingPolicy.SKIP); } catch (Exception e) { - log.error("Error received when trying to delete entry in zookeeper {}", childPath, e); + log.error("Error received when trying to delete entry in zookeeper " + childPath, e); } } catch (Exception e) { - log.warn("Failed to process work {}", child, e); + log.warn("Failed to process work " + child, e); } try { zoo.recursiveDelete(lockPath, NodeMissingPolicy.SKIP); } catch (Exception e) { - log.error("Error received when trying to delete entry in zookeeper {}", childPath, e); + log.error("Error received when trying to delete entry in zookeeper " + childPath, e); } } finally { diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java index 439287b..b20c420 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java @@ -246,7 +246,7 @@ public class GarbageCollectWriteAheadLogs { } catch (FileNotFoundException ex) { // ignored } catch (IOException ex) { - log.error("Unable to delete wal {}: ", path, ex); + log.error("Unable to delete wal {}", path, ex); } } return status.currentLog.deleted; diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java index d47c85c..feafa1c 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java @@ -411,7 +411,7 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa putMarkerDeleteMutation(delete, finalWriter); } } catch (Exception e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } } @@ -426,7 +426,7 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa try { while (!deleteThreadPool.awaitTermination(1000, TimeUnit.MILLISECONDS)) {} } catch (InterruptedException e1) { - log.error(e1.getMessage(), e1); + log.error("{}", e1.getMessage(), e1); } if (writer != null) { @@ -504,7 +504,7 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa try { getZooLock(startStatsService()); } catch (Exception ex) { - log.error(ex.getMessage(), ex); + log.error("{}", ex.getMessage(), ex); System.exit(1); } @@ -513,7 +513,7 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa log.debug("Sleeping for {} milliseconds before beginning garbage collection cycles", delay); Thread.sleep(delay); } catch (InterruptedException e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); return; } @@ -542,7 +542,7 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa status.current = new GcCycleStats(); } catch (Exception e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } tStop = System.currentTimeMillis(); @@ -567,7 +567,7 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa log.info("Beginning garbage collection of write-ahead logs"); walogCollector.collect(status); } catch (Exception e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } finally { waLogs.stop(); } @@ -579,7 +579,7 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa connector.tableOperations().compact(MetadataTable.NAME, null, null, true, true); connector.tableOperations().compact(RootTable.NAME, null, null, true, true); } catch (Exception e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); } Trace.off(); @@ -588,7 +588,7 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa log.debug("Sleeping for {} milliseconds", gcDelay); Thread.sleep(gcDelay); } catch (InterruptedException e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); return; } } diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java b/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java index 7075702..e5bd561 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java @@ -251,7 +251,7 @@ public class CloseWriteAheadLogReferences implements Runnable { } return ThriftUtil.getClient(new MasterClientService.Client.Factory(), address, context); } catch (Exception e) { - log.warn("Issue with masterConnection ({}) {}", address, e, e); + log.warn("Issue with masterConnection (" + address + ") " + e, e); } return null; } @@ -290,10 +290,10 @@ public class CloseWriteAheadLogReferences implements Runnable { tserverClient = ThriftUtil.getClient(new TabletClientService.Client.Factory(), server, context); return tserverClient.getActiveLogs(tinfo, context.rpcCreds()); } catch (TTransportException e) { - log.warn("Failed to fetch active write-ahead logs from {}", server, e); + log.warn("Failed to fetch active write-ahead logs from " + server, e); return null; } catch (TException e) { - log.warn("Failed to fetch active write-ahead logs from {}", server, e); + log.warn("Failed to fetch active write-ahead logs from " + server, e); return null; } finally { ThriftUtil.returnClient(tserverClient); diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java index 8ccbf69..900081b 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/Master.java +++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java @@ -417,7 +417,8 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List for (String tableId : zoo.getChildren(tables)) { Namespace.ID targetNamespace = (MetadataTable.ID.canonicalID().equals(tableId) || RootTable.ID.canonicalID().equals(tableId)) ? Namespace.ID.ACCUMULO : Namespace.ID.DEFAULT; - log.debug("Upgrade moving table {} (ID: {}) into namespace with ID {}", new String(zoo.getData(tables + "/" + tableId + Constants.ZTABLE_NAME, null), UTF_8), tableId, targetNamespace); + log.debug("Upgrade moving table {} (ID: {}) into namespace with ID {}", new String(zoo.getData(tables + "/" + tableId + Constants.ZTABLE_NAME, null), + UTF_8), tableId, targetNamespace); zoo.putPersistentData(tables + "/" + tableId + Constants.ZTABLE_NAMESPACE, targetNamespace.getUtf8(), NodeExistsPolicy.SKIP); } @@ -1047,7 +1048,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List if (connection != null) connection.fastHalt(masterLock); } catch (TException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } tserverSet.remove(instance); } diff --git a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java index dafd8f3..970efa1 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java +++ b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java @@ -134,7 +134,7 @@ public class MasterClientServiceHandler extends FateServiceHandler implements Ma } catch (NoNodeException nne) { throw new ThriftTableOperationException(tableId.canonicalID(), null, TableOperation.FLUSH, TableOperationExceptionType.NOTFOUND, null); } catch (Exception e) { - Master.log.warn(e.getMessage(), e); + Master.log.warn("{}", e.getMessage(), e); throw new ThriftTableOperationException(tableId.canonicalID(), null, TableOperation.FLUSH, TableOperationExceptionType.OTHER, null); } return Long.parseLong(new String(fid)); @@ -249,10 +249,10 @@ public class MasterClientServiceHandler extends FateServiceHandler implements Ma } catch (TabletDeletedException tde) { Master.log.debug("Failed to scan {} table to wait for flush {}", MetadataTable.NAME, tableId, tde); } catch (AccumuloSecurityException e) { - Master.log.warn(e.getMessage(), e); + Master.log.warn("{}", e.getMessage(), e); throw new ThriftSecurityException(); } catch (TableNotFoundException e) { - Master.log.error(e.getMessage(), e); + Master.log.error("{}", e.getMessage(), e); throw new ThriftTableOperationException(); } } diff --git a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java index 86cf00e..a24e4f7 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java +++ b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java @@ -382,7 +382,7 @@ abstract class TabletGroupWatcher extends Daemon { Master.log.info("Detected change in current tserver set, re-running state machine."); } } catch (Exception ex) { - Master.log.error("Error processing table state for store {}", store.name(), ex); + Master.log.error("Error processing table state for store " + store.name(), ex); if (ex.getCause() != null && ex.getCause() instanceof BadLocationStateException) { repairMetadata(((BadLocationStateException) ex.getCause()).getEncodedEndRow()); } else { @@ -393,7 +393,7 @@ abstract class TabletGroupWatcher extends Daemon { try { iter.close(); } catch (IOException ex) { - Master.log.warn("Error closing TabletLocationState iterator:", ex); + Master.log.warn("Error closing TabletLocationState iterator: " + ex, ex); } } } @@ -456,7 +456,7 @@ abstract class TabletGroupWatcher extends Daemon { } Master.log.error("Metadata table is inconsistent at {} and all assigned/future tservers are still online.", row); } catch (Throwable e) { - Master.log.error("Error attempting repair of metadata {}: ", row, e); + Master.log.error("Error attempting repair of metadata " + row + ": " + e, e); } } @@ -562,7 +562,7 @@ abstract class TabletGroupWatcher extends Daemon { } } } catch (Exception ex) { - Master.log.error("Unable to update merge state for merge {} ", stats.getMergeInfo().getExtent(), ex); + Master.log.error("Unable to update merge state for merge " + stats.getMergeInfo().getExtent(), ex); } } } diff --git a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java b/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java index 7880432..a6a97c9 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java +++ b/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java @@ -71,7 +71,7 @@ public class RecoveryManager { List<String> workIDs = new DistributedWorkQueue(ZooUtil.getRoot(master.getInstance()) + Constants.ZRECOVERY, aconf).getWorkQueued(); sortsQueued.addAll(workIDs); } catch (Exception e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); } } @@ -102,9 +102,9 @@ public class RecoveryManager { initiateSort(sortId, source, destination, aconf); } } catch (FileNotFoundException e) { - log.debug("Unable to initate log sort for {}: ", source, e); + log.debug("Unable to initate log sort for " + source + ": " + e); } catch (Exception e) { - log.warn("Failed to initiate log sort {}", source, e); + log.warn("Failed to initiate log sort " + source, e); } finally { if (!rescheduled) { synchronized (RecoveryManager.this) { diff --git a/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java b/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java index 315c8c5..63f8c46 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java +++ b/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java @@ -150,7 +150,7 @@ public class MergeStats { // Perhaps a split occurred after we chopped, but before we went offline: start over state = MergeState.WAITING_FOR_CHOPPED; } else { - log.info("{} tablets are chopped, {} are offline {}", chopped, unassigned, info.getExtent()); + log.info("{} tablets are chopped, {} are offline {}", chopped, unassigned, info.getExtent()); if (unassigned == total && chopped == needsToBeChopped) { if (verifyMergeConsistency(connector, master)) state = MergeState.MERGING; @@ -198,7 +198,7 @@ public class MergeStats { try { tls = MetaDataTableScanner.createTabletLocationState(entry.getKey(), entry.getValue()); } catch (BadLocationStateException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); return false; } log.debug("consistency check: {} walogs {}", tls, tls.walogs.size()); @@ -236,8 +236,7 @@ public class MergeStats { break; } } - log.debug("chopped {} v.chopped {} unassigned {} v.unassigned {} verify.total {}", - chopped, verify.chopped, unassigned, verify.unassigned, verify.total); + log.debug("chopped {} v.chopped {} unassigned {} v.unassigned {} verify.total {}", chopped, verify.chopped, unassigned, verify.unassigned, verify.total); return chopped == verify.chopped && unassigned == verify.unassigned && unassigned == verify.total; } diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java index ff3b057..9c0a506 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java @@ -140,7 +140,7 @@ public class BulkImport extends MasterRepo { log.debug(" tid {} bulkDir {}", tid, bulkDir); return new LoadFiles(tableId, sourceDir, bulkDir, errorDir, setTime); } catch (IOException ex) { - log.error("error preparing the bulk import directory {}", ex); + log.error("error preparing the bulk import directory", ex); throw new AcceptableThriftTableOperationException(tableId.canonicalID(), null, TableOperation.BULK_IMPORT, TableOperationExceptionType.BULK_BAD_INPUT_DIRECTORY, sourceDir + ": " + ex); } diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java index 972da46..2f0174d 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java @@ -412,7 +412,7 @@ public class Monitor implements HighlyAvailableService { } } } catch (Exception ex) { - log.warn("Unable to contact the garbage collector at {}", address, ex); + log.warn("Unable to contact the garbage collector at " + address, ex); } return result; } @@ -509,7 +509,7 @@ public class Monitor implements HighlyAvailableService { try { Monitor.fetchData(); } catch (Exception e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); } sleepUninterruptibly(333, TimeUnit.MILLISECONDS); @@ -525,7 +525,7 @@ public class Monitor implements HighlyAvailableService { try { Monitor.fetchScans(); } catch (Exception e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); } sleepUninterruptibly(5, TimeUnit.SECONDS); } @@ -706,7 +706,7 @@ public class Monitor implements HighlyAvailableService { @Override public synchronized void failedToAcquireLock(Exception e) { - log.warn("Failed to get monitor lock", e); + log.warn("Failed to get monitor lock " + e); if (acquiredLock) { Halt.halt("Zoolock in unexpected state FAL " + acquiredLock + " " + failedToAcquireLock, -1); diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java index 704e737..62f872f 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java @@ -130,7 +130,7 @@ public class ZooKeeperStatus implements Runnable { } update.add(new ZooKeeperState(keeper, mode, clients)); } catch (Exception ex) { - log.info("Exception talking to zookeeper {}", keeper, ex); + log.info("Exception talking to zookeeper " + keeper, ex); update.add(new ZooKeeperState(keeper, "Down", -1)); } finally { if (transport != null) { diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java index c167b6c..7196d84 100644 --- a/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java +++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java @@ -128,7 +128,7 @@ public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanRece } sent = true; } catch (Exception ex) { - log.warn("Got error sending to {}, refreshing client", dest, ex); + log.warn("Got error sending to " + dest + ", refreshing client", ex); clients.remove(dest); } } @@ -171,8 +171,8 @@ public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanRece if (sendQueueSize.get() > maxQueueSize) { long now = System.currentTimeMillis(); if (now - lastNotificationOfDroppedSpans > 60 * 1000) { - log.warn("Tracing spans are being dropped because there are already {} spans queued for delivery.\n" + - "This does not affect performance, security or data integrity, but distributed tracing information is being lost.", maxQueueSize); + log.warn("Tracing spans are being dropped because there are already {} spans queued for delivery.\n" + + "This does not affect performance, security or data integrity, but distributed tracing information is being lost.", maxQueueSize); lastNotificationOfDroppedSpans = now; } return; diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java index 18ad748..7f9461f 100644 --- a/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java +++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java @@ -64,7 +64,7 @@ public class SendSpansViaThrift extends AsyncSpanReceiver<String,Client> { log.trace("{}", ex, ex); return null; } catch (Exception ex) { - log.error(ex.getMessage(), ex); + log.error("{}", ex.getMessage(), ex); return null; } } diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java index 6137759..a717563 100644 --- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java +++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java @@ -169,13 +169,13 @@ public class TraceServer implements Watcher { if (timeMutation != null) writer.addMutation(timeMutation); } catch (MutationsRejectedException exception) { - log.warn("Unable to write mutation to table; discarding span. set log level to DEBUG for span information and stacktrace. cause:", exception); + log.warn("Unable to write mutation to table; discarding span. set log level to DEBUG for span information and stacktrace. cause: " + exception); if (log.isDebugEnabled()) { - log.debug("discarded span due to rejection of mutation: {}", spanMutation, exception); + log.debug("discarded span due to rejection of mutation: " + spanMutation, exception); } /* XXX this could be e.g. an IllegalArgumentExceptoion if we're trying to write this mutation to a writer that has been closed since we retrieved it */ } catch (RuntimeException exception) { - log.warn("Unable to write mutation to table; discarding span. set log level to DEBUG for stacktrace. cause:", exception); + log.warn("Unable to write mutation to table; discarding span. set log level to DEBUG for stacktrace. cause: " + exception); log.debug("unable to write mutation to table due to exception.", exception); } } @@ -300,12 +300,12 @@ public class TraceServer implements Watcher { } } } catch (MutationsRejectedException exception) { - log.warn("Problem flushing traces, resetting writer. Set log level to DEBUG to see stacktrace. cause:", exception); + log.warn("Problem flushing traces, resetting writer. Set log level to DEBUG to see stacktrace. cause: " + exception); log.debug("flushing traces failed due to exception", exception); resetWriter(); /* XXX e.g. if the writer was closed between when we grabbed it and when we called flush. */ } catch (RuntimeException exception) { - log.warn("Problem flushing traces, resetting writer. Set log level to DEBUG to see stacktrace. cause:", exception); + log.warn("Problem flushing traces, resetting writer. Set log level to DEBUG to see stacktrace. cause: " + exception); log.debug("flushing traces failed due to exception", exception); resetWriter(); } @@ -316,7 +316,7 @@ public class TraceServer implements Watcher { try { writer = connector.createBatchWriter(tableName, new BatchWriterConfig().setMaxLatency(BATCH_WRITER_MAX_LATENCY, TimeUnit.SECONDS)); } catch (Exception ex) { - log.warn("Unable to create a batch writer, will retry. Set log level to DEBUG to see stacktrace. cause:", ex); + log.warn("Unable to create a batch writer, will retry. Set log level to DEBUG to see stacktrace. cause: " + ex); log.debug("batch writer creation failed with exception.", ex); } finally { /* Trade in the new writer (even if null) for the one we need to close. */ @@ -326,7 +326,7 @@ public class TraceServer implements Watcher { writer.close(); } } catch (Exception ex) { - log.warn("Problem closing batch writer. Set log level to DEBUG to see stacktrace. cause:", ex); + log.warn("Problem closing batch writer. Set log level to DEBUG to see stacktrace. cause: " + ex); log.debug("batch writer close failed with exception", ex); } } @@ -411,7 +411,7 @@ public class TraceServer implements Watcher { if (ZooReaderWriter.getInstance().exists(event.getPath(), this)) return; } catch (Exception ex) { - log.error(ex.getMessage(), ex); + log.error("{}", ex.getMessage(), ex); } log.warn("Trace server unable to reset watch on zookeeper registration"); server.stop(); diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java index 68f2247..2f4c8ac 100644 --- a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java +++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java @@ -105,7 +105,7 @@ public class ZooTraceClient extends SendSpansViaThrift implements Watcher { // Once this passes, we can issue a shutdown of the pool svc.shutdown(); } catch (Exception e) { - log.error("Unabled to get destination tracer hosts in ZooKeeper, will retry in {} milliseconds", retryPause, e); + log.error("Unabled to get destination tracer hosts in ZooKeeper, will retry in " + retryPause + " milliseconds", e); // We failed to connect to ZK, try again in `retryPause` milliseconds svc.schedule(this, retryPause, TimeUnit.MILLISECONDS); } diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java index 2d09732..90e14a4 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java @@ -65,9 +65,9 @@ public class BulkFailedCopyProcessor implements Processor { VolumeManager vm = VolumeManagerImpl.get(SiteConfiguration.getInstance()); FileSystem destFs = vm.getVolumeByPath(dest).getFileSystem(); destFs.create(dest).close(); - log.warn(" marked {} failed", dest, ex); + log.warn(" marked " + dest + " failed", ex); } catch (IOException e) { - log.error("Unable to create failure flag file {}", dest, e); + log.error("Unable to create failure flag file " + dest, e); } } diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java index eb69490..b640d83 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java @@ -330,7 +330,7 @@ public class FileManager { if (!tablet.isMeta()) { filePermits.release(1); } - log.warn("Failed to open file {} {} continuing...", file, e.getMessage()); + log.warn("Failed to open file {} {} continuing...", file, e.getMessage(), e); } else { // close whatever files were opened closeReaders(reservedFiles); @@ -368,7 +368,7 @@ public class FileManager { try { reader.closeDeepCopies(); } catch (IOException e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); sawIOException = true; } } diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java index 63edb03..233c151 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java @@ -702,7 +702,7 @@ public class InMemoryMap { if (mds.reader != null) mds.reader.close(); } catch (IOException e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); } } } diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TLevel.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TLevel.java deleted file mode 100644 index 53cfb3a..0000000 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TLevel.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.accumulo.tserver; - -import org.apache.log4j.Level; -import org.apache.log4j.Priority; -import org.slf4j.Logger; - -public class TLevel extends Level { - - private static final long serialVersionUID = 1L; - public final static Level TABLET_HIST = new TLevel(); - - protected TLevel() { - super(Priority.DEBUG_INT + 100, "TABLET_HIST", Priority.DEBUG_INT + 100); - } - - - static public void logAtLevel(Logger log, Level level, String msg, Object...objects) { - switch(level.toInt()) { - case Priority.DEBUG_INT: - log.debug(msg, objects); - break; - case Priority.ERROR_INT: - case Priority.FATAL_INT: - log.error(msg, objects); - break; - case Priority.INFO_INT: - log.info(msg, objects); - break; - case Level.TRACE_INT: - log.trace(msg, objects); - break; - case Priority.WARN_INT: - log.warn(msg, objects); - break; - } - } -} diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index d176f55..4d847d1 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -830,7 +830,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { updateMetrics.add(TabletServerUpdateMetrics.UNKNOWN_TABLET_ERRORS, 0); return; } catch (ThriftSecurityException e) { - log.error("Denying permission to check user {} for user {}", us.getUser(), e.getUser(), e); + log.error("Denying permission to check user " + us.getUser() + " with user " + e.getUser(), e); long t2 = System.currentTimeMillis(); us.authTimes.addStat(t2 - t1); us.currentTablet = null; @@ -1441,7 +1441,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { throw new NotServingTabletException(tkeyExtent); } } catch (IOException e) { - log.warn("Failed to split {}", keyExtent, e); + log.warn("Failed to split " + keyExtent, e); throw new RuntimeException(e); } } @@ -1569,8 +1569,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { all.remove(extent); if (all.size() > 0) { - log.error("Tablet {} overlaps previously assigned {} {} {}", extent, unopenedOverlapping, openingOverlapping, onlineOverlapping - + " " + all); + log.error("Tablet {} overlaps previously assigned {} {} {}", extent, unopenedOverlapping, openingOverlapping, onlineOverlapping + " " + all); } return; } @@ -2027,7 +2026,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { } } } catch (Throwable t) { - log.error("Unexpected exception in {}", Thread.currentThread().getName(), t); + log.error("Unexpected exception in {}", Thread.currentThread().getName(), t); sleepUninterruptibly(1, TimeUnit.SECONDS); } } @@ -2091,8 +2090,8 @@ public class TabletServer extends AccumuloServerContext implements Runnable { statsKeeper.updateTime(Operation.SPLIT, start, 0, false); long t2 = System.currentTimeMillis(); - log.info("Tablet split: {} size0 {} size1 {} time {}ms", - tablet.getExtent(), newTablets[0].estimateTabletSize(), newTablets[1].estimateTabletSize(), (t2 - t1)); + log.info("Tablet split: {} size0 {} size1 {} time {}ms", tablet.getExtent(), newTablets[0].estimateTabletSize(), newTablets[1].estimateTabletSize(), + (t2 - t1)); return tabletInfo; } @@ -2153,7 +2152,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { } catch (Throwable e) { if ((t.isClosing() || t.isClosed()) && e instanceof IllegalStateException) { - log.debug("Failed to unload tablet {}... it was alread closing or closed : {}", extent, e.getMessage()); + log.debug("Failed to unload tablet {}... it was already closing or closed : {}", extent, e.getMessage()); } else { log.error("Failed to close tablet {}... Aborting migration", extent, e); enqueueMasterMessage(new TabletStatusMessage(TabletLoadState.UNLOAD_ERROR, extent)); @@ -2276,7 +2275,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { openingTablets.remove(extent); openingTablets.notifyAll(); } - log.warn("Failed to verify tablet {}", extent, e); + log.warn("Failed to verify tablet " + extent, e); enqueueMasterMessage(new TabletStatusMessage(TabletLoadState.LOAD_FAILURE, extent)); throw new RuntimeException(e); } @@ -2404,7 +2403,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { return null; return HostAndPort.fromString(locations.get(0)); } catch (Exception e) { - log.warn("Failed to obtain master host", e); + log.warn("Failed to obtain master host " + e); } return null; @@ -2420,7 +2419,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { // log.info("Listener API to master has been opened"); return client; } catch (Exception e) { - log.warn("Issue with masterConnection ({}) ", address, e); + log.warn("Issue with masterConnection (" + address + ") " + e, e); } return null; } @@ -2571,7 +2570,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { } catch (KeeperException | InterruptedException e) { // TODO Does there need to be a better check? What are the error conditions that we'd fall out here? AUTH_FAILURE? // If we get the error, do we just put it on a timer and retry the exists(String, Watcher) call? - log.error("Failed to perform initial check for authentication tokens in ZooKeeper. Delegation token authentication will be unavailable. {}", e); + log.error("Failed to perform initial check for authentication tokens in ZooKeeper. Delegation token authentication will be unavailable.", e); } } @@ -2689,7 +2688,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { // may have lost connection with master // loop back to the beginning and wait for a new one // this way we survive master failures - log.error("{}: TServerInfo: Exception. Master down?", getClientAddressString(), e); + log.error(getClientAddressString() + ": TServerInfo: Exception. Master down?", e); } } @@ -2902,7 +2901,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { try { return new TServerInstance(address, tabletServerLock.getSessionId()); } catch (Exception ex) { - log.warn("Unable to read session from tablet server lock", ex); + log.warn("Unable to read session from tablet server lock" + ex); return null; } } @@ -2939,7 +2938,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { try { AccumuloVFSClassLoader.getContextManager().removeUnusedContexts(configuredContexts); } catch (IOException e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); } } }; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java index 62cee69..59fba4f 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java @@ -75,7 +75,7 @@ public class ConstraintChecker { constrains.clear(); loader = null; constrains.add(new UnsatisfiableConstraint((short) -1, "Failed to load constraints, not accepting mutations.")); - log.error("Failed to load constraints {} {}", conf.getTableId(), e.toString(), e); + log.error("Failed to load constraints " + conf.getTableId() + " " + e.toString(), e); } } diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java index 8aa5486..fc72b98 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java @@ -157,7 +157,7 @@ public class LogSorter { fs.mkdirs(new Path(destPath)); fs.create(SortedLogState.getFailedMarkerPath(destPath)).close(); } catch (IOException e) { - log.error("Error creating failed flag file {}", name, e); + log.error("Error creating failed flag file " + name, e); } log.error("Caught throwable", t); } finally { @@ -165,7 +165,7 @@ public class LogSorter { try { close(); } catch (Exception e) { - log.error("Error during cleanup sort/copy {}", name, e); + log.error("Error during cleanup sort/copy " + name, e); } synchronized (this) { sortStop = System.currentTimeMillis(); diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java index 2b71e50..ff5fb49 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java @@ -335,7 +335,7 @@ public class TabletServerLogger { } catch (DfsLogger.LogClosedException ex) { // ignore } catch (Throwable ex) { - log.error("Unable to cleanly close log {}: {} {}", currentLog.getFileName(), ex, ex); + log.error("Unable to cleanly close log " + currentLog.getFileName() + ": " + ex, ex); } finally { this.tserver.walogClosed(currentLog); } @@ -413,7 +413,7 @@ public class TabletServerLogger { log.debug("Logs closed while writing, retrying {}", attempt); } catch (Exception t) { if (attempt != 1) { - log.error("Unexpected error writing to log, retrying attempt {}", attempt, t); + log.error("Unexpected error writing to log, retrying attempt " + attempt, t); } sleepUninterruptibly(100, TimeUnit.MILLISECONDS); } finally { diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java index 8ad62b4..1bdf428 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java @@ -121,7 +121,7 @@ public class LookupTask extends ScanTask<MultiScanResult> { interruptFlag.set(false); } catch (IOException e) { - log.warn("lookup failed for tablet {}", entry.getKey(), e); + log.warn("lookup failed for tablet " + entry.getKey(), e); throw new RuntimeException(e); } 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 c0c0d8c..110eda3 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 @@ -91,7 +91,7 @@ public class NextBatchTask extends ScanTask<ScanBatch> { Halt.halt("Ran out of memory scanning " + scanSession.extent + " for " + scanSession.client, 1); addResult(ome); } catch (Throwable e) { - log.warn("exception while scanning tablet {}", (scanSession == null ? "(unknown)" : scanSession.extent), e); + log.warn("exception while scanning tablet " + (scanSession == null ? "(unknown)" : scanSession.extent), e); addResult(e); } finally { runState.set(ScanRunState.FINISHED); diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java index 5e7924c..c8869bc 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java @@ -244,10 +244,10 @@ public class Compactor implements Callable<CompactionStats> { majCStats.setFileSize(mfwTmp.getLength()); return majCStats; } catch (IOException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw e; } catch (RuntimeException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw e; } finally { Thread.currentThread().setName(oldThreadName); @@ -268,9 +268,9 @@ public class Compactor implements Callable<CompactionStats> { } } } catch (IOException e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); } catch (RuntimeException exception) { - log.warn(exception.getMessage(), exception); + log.warn("{}", exception.getMessage(), exception); } } } @@ -380,7 +380,7 @@ public class Compactor implements Callable<CompactionStats> { try { mfw.close(); } catch (IOException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } fs.deleteRecursively(outputFile.path()); } catch (Exception e) { diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java index aad2b3f..bbdb4f0 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java @@ -50,11 +50,9 @@ import org.apache.accumulo.server.util.MasterMetadataUtil; import org.apache.accumulo.server.util.MetadataTableUtil; import org.apache.accumulo.server.util.ReplicationTableUtil; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; -import org.apache.accumulo.tserver.TLevel; import org.apache.hadoop.fs.Path; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; - +import org.slf4j.LoggerFactory; class DatafileManager { private final Logger log = LoggerFactory.getLogger(DatafileManager.class); @@ -95,7 +93,7 @@ class DatafileManager { try { tablet.wait(50); } catch (InterruptedException e) { - log.warn("", e); + log.warn("{}", e.getMessage(), e); } } @@ -187,7 +185,7 @@ class DatafileManager { try { tablet.wait(100); } catch (InterruptedException e) { - log.warn("", e); + log.warn("{}", e.getMessage(), e); } } } @@ -275,7 +273,7 @@ class DatafileManager { } for (Entry<FileRef,DataFileValue> entry : paths.entrySet()) { - TLevel.logAtLevel(log, TLevel.TABLET_HIST, "{} import {} {}", tablet.getExtent(), entry.getKey() ,entry.getValue()); + log.debug("TABLET_HIST {} import {} {}", tablet.getExtent(), entry.getKey(), entry.getValue()); } } @@ -364,7 +362,7 @@ class DatafileManager { } break; } catch (IOException ioe) { - log.warn("Tablet {} failed to rename {} after MinC, will retry in 60 secs...", tablet.getExtent(), newDatafile, ioe); + log.warn("Tablet " + tablet.getExtent() + " failed to rename " + newDatafile + " after MinC, will retry in 60 secs...", ioe); sleepUninterruptibly(1, TimeUnit.MINUTES); } } while (true); @@ -437,7 +435,7 @@ class DatafileManager { tablet.getTabletServer().minorCompactionFinished(tablet.getTabletMemory().getCommitSession(), newDatafile.toString(), commitSession.getWALogSeq() + 2); break; } catch (IOException e) { - log.error("Failed to write to write-ahead log {} will retry", e.getMessage(), e); + log.error("Failed to write to write-ahead log " + e.getMessage() + " will retry", e); sleepUninterruptibly(1, TimeUnit.SECONDS); } } while (true); @@ -468,9 +466,9 @@ class DatafileManager { removeFilesAfterScan(filesInUseByScans); if (absMergeFile != null) - TLevel.logAtLevel(log, TLevel.TABLET_HIST, "{} MinC [{},memory] -> {}", tablet.getExtent(), absMergeFile, newDatafile); + log.debug("TABLET_HIST {} MinC [{},memory] -> {}", tablet.getExtent(), absMergeFile, newDatafile); else - TLevel.logAtLevel(log, TLevel.TABLET_HIST, "{} MinC [memory] -> {}", tablet.getExtent(), newDatafile); + log.debug("TABLET_HIST {} MinC [memory] -> {}", tablet.getExtent(), newDatafile); log.debug(String.format("MinC finish lock %.2f secs %s", (t2 - t1) / 1000.0, tablet.getExtent().toString())); long splitSize = tablet.getTableConfiguration().getAsBytes(Property.TABLE_SPLIT_THRESHOLD); if (dfv.getSize() > splitSize) { @@ -499,7 +497,7 @@ class DatafileManager { if (!extent.isRootTablet()) { if (tablet.getTabletServer().getFileSystem().exists(newDatafile.path())) { - log.error("Target map file already exist {} {}", newDatafile, new Exception()); + log.error("Target map file already exist " + newDatafile, new Exception()); throw new IllegalStateException("Target map file already exist " + newDatafile); } @@ -580,7 +578,7 @@ class DatafileManager { } log.debug(String.format("MajC finish lock %.2f secs", (t2 - t1) / 1000.0)); - TLevel.logAtLevel(log, TLevel.TABLET_HIST, "{} MajC --> ", oldDatafiles, newDatafile); + log.debug("TABLET_HIST {} MajC --> {}", oldDatafiles, newDatafile); } public SortedMap<FileRef,DataFileValue> getDatafileSizes() { diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java index 686b46d..1b8347e 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java @@ -96,7 +96,7 @@ class MinorCompactionTask implements Runnable { tablet.initiateMajorCompaction(MajorCompactionReason.NORMAL); } } catch (Throwable t) { - log.error("Unknown error during minor compaction for extent: {}", tablet.getExtent(), t); + log.error("Unknown error during minor compaction for extent: " + tablet.getExtent(), t); throw new RuntimeException(t); } finally { tablet.minorCompactionComplete(); diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java index 2bfdc62..fe7585a 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java @@ -88,7 +88,7 @@ public class MinorCompactor extends Compactor { try { return Tables.getTableState(tabletServer.getInstance(), extent.getTableId()) == TableState.DELETING; } catch (Exception e) { - log.warn("Failed to determine if table {} was deleting", extent.getTableId(), e); + log.warn("Failed to determine if table " + extent.getTableId() + " was deleting ", e); return false; // can not get positive confirmation that its deleting. } } @@ -119,7 +119,7 @@ public class MinorCompactor extends Compactor { return ret; } catch (IOException e) { - log.warn("MinC failed ({}) to create {} retrying ...", e.getMessage(),outputFileName); + log.warn("MinC failed ({}) to create {} retrying ...", e.getMessage(), outputFileName); ProblemReports.getInstance(tabletServer).report(new ProblemReport(getExtent().getTableId(), ProblemType.FILE_WRITE, outputFileName, e)); reportedProblem = true; } catch (RuntimeException e) { @@ -135,7 +135,7 @@ public class MinorCompactor extends Compactor { Random random = new Random(); int sleep = sleepTime + random.nextInt(sleepTime); - log.debug("MinC failed sleeping {}ms before retrying", sleep); + log.debug("MinC failed sleeping {} ms before retrying", sleep); sleepUninterruptibly(sleep, TimeUnit.MILLISECONDS); sleepTime = (int) Math.round(Math.min(maxSleepTime, sleepTime * growthFactor)); diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java index b68e65a..d8961e9 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java @@ -48,7 +48,7 @@ public class RootFiles { public static void renameReplacement(VolumeManager fs, FileRef tmpDatafile, FileRef newDatafile) throws IOException { if (fs.exists(newDatafile.path())) { - log.error("Target map file already exist {}", newDatafile, new Exception()); + log.error("Target map file already exist " + newDatafile, new Exception()); throw new IllegalStateException("Target map file already exist " + newDatafile); } diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java index 074f253..e904cdd 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java @@ -125,7 +125,6 @@ import org.apache.accumulo.tserver.ConditionCheckerContext.ConditionChecker; import org.apache.accumulo.tserver.InMemoryMap; import org.apache.accumulo.tserver.MinorCompactionReason; import org.apache.accumulo.tserver.TConstraintViolationException; -import org.apache.accumulo.tserver.TLevel; import org.apache.accumulo.tserver.TabletServer; import org.apache.accumulo.tserver.TabletServerResourceManager.TabletResourceManager; import org.apache.accumulo.tserver.TabletStatsKeeper; @@ -142,7 +141,7 @@ import org.apache.accumulo.tserver.constraints.ConstraintChecker; import org.apache.accumulo.tserver.log.DfsLogger; import org.apache.accumulo.tserver.log.MutationReceiver; import org.apache.accumulo.tserver.mastermessage.TabletStatusMessage; -import org.apache.accumulo.tserver.metrics.TabletServerMinCMetricsKeys; +import org.apache.accumulo.tserver.metrics.TabletServerMinCMetrics; import org.apache.accumulo.tserver.metrics.TabletServerScanMetrics; import org.apache.accumulo.tserver.tablet.Compactor.CompactionCanceledException; import org.apache.accumulo.tserver.tablet.Compactor.CompactionEnv; @@ -154,8 +153,8 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.KeeperException.NoNodeException; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.annotations.VisibleForTesting; import com.google.common.cache.Cache; @@ -459,7 +458,7 @@ public class Tablet implements TabletCommitter { // the WAL isn't closed (WRT replication Status) and thus we're safe to update its progress. Status status = StatusUtil.openWithUnknownLength(); for (LogEntry logEntry : logEntries) { - log.debug("Writing updated status to metadata table for {} {}",logEntry.filename, ProtobufUtil.toString(status)); + log.debug("Writing updated status to metadata table for {} {}", logEntry.filename, ProtobufUtil.toString(status)); ReplicationTableUtil.updateFiles(tabletServer, extent, logEntry.filename, status); } } @@ -477,7 +476,8 @@ public class Tablet implements TabletCommitter { currentLogs.add(new DfsLogger(tabletServer.getServerConfig(), logEntry.filename, logEntry.getColumnQualifier().toString())); } - log.info("Write-Ahead Log recovery complete for {} ({} mutations applied, {} entries created)", this.extent, entriesUsedOnTablet.get(), getTabletMemory().getNumEntries()); + log.info("Write-Ahead Log recovery complete for {} ({} mutations applied, {} entries created)", this.extent, entriesUsedOnTablet.get(), getTabletMemory() + .getNumEntries()); } String contextName = tableConfiguration.get(Property.TABLE_CLASSPATH); @@ -501,7 +501,7 @@ public class Tablet implements TabletCommitter { removeOldTemporaryFiles(); } - TLevel.logAtLevel(log, TLevel.TABLET_HIST, "{} opened", extent); + log.debug("TABLET_HIST {} opened", extent); } private void removeOldTemporaryFiles() { @@ -512,7 +512,7 @@ public class Tablet implements TabletCommitter { log.debug("Removing old temp file {}", tmp.getPath()); getTabletServer().getFileSystem().delete(tmp.getPath()); } catch (IOException ex) { - log.error("Unable to remove old temp file {}:", tmp.getPath(), ex); + log.error("Unable to remove old temp file " + tmp.getPath() + ": " + ex); } } } catch (IOException ex) { @@ -528,7 +528,7 @@ public class Tablet implements TabletCommitter { ColumnVisibility cv = new ColumnVisibility(tableConfiguration.get(Property.TABLE_DEFAULT_SCANTIME_VISIBILITY)); this.defaultSecurityLabel = cv.getExpression(); } catch (Exception e) { - log.error("", e); + log.error("{}", e.getMessage(), e); this.defaultSecurityLabel = new byte[0]; } } @@ -889,11 +889,11 @@ public class Tablet implements TabletCommitter { } Metrics minCMetrics = getTabletServer().getMinCMetrics(); if (minCMetrics.isEnabled()) - minCMetrics.add(TabletServerMinCMetricsKeys.MINC, (lastMinorCompactionFinishTime - start)); + minCMetrics.add(TabletServerMinCMetrics.MINC, (lastMinorCompactionFinishTime - start)); if (hasQueueTime) { timer.updateTime(Operation.MINOR, queued, start, count, failed); if (minCMetrics.isEnabled()) - minCMetrics.add(TabletServerMinCMetricsKeys.QUEUE, (start - queued)); + minCMetrics.add(TabletServerMinCMetrics.QUEUE, (start - queued)); } else timer.updateTime(Operation.MINOR, start, count, failed); } @@ -1380,7 +1380,7 @@ public class Tablet implements TabletCommitter { try { getTabletMemory().getMemTable().delete(0); } catch (Throwable t) { - log.error("Failed to delete mem table : {}", t.getMessage(), t); + log.error("Failed to delete mem table : " + t.getMessage(), t); } getTabletMemory().close(); @@ -1388,7 +1388,7 @@ public class Tablet implements TabletCommitter { // close map files getTabletResources().close(); - TLevel.logAtLevel(log, TLevel.TABLET_HIST, "{} closed", extent); + log.debug("TABLET_HIST {} closed", extent); tableConfiguration.getNamespaceConfiguration().removeObserver(configObserver); tableConfiguration.removeObserver(configObserver); @@ -2024,9 +2024,9 @@ public class Tablet implements TabletCommitter { } catch (CompactionCanceledException cce) { log.debug("Major compaction canceled, extent = {}", getExtent()); } catch (IOException ioe) { - log.error("MajC Failed, extent = {}", getExtent(), ioe); + log.error("MajC Failed, extent = " + getExtent(), ioe); } catch (RuntimeException e) { - log.error("MajC Unexpected exception, extent = {}", getExtent(), e); + log.error("MajC Unexpected exception, extent = " + getExtent(), e); } finally { // ensure we always reset boolean, even // when an exception is thrown @@ -2191,7 +2191,7 @@ public class Tablet implements TabletCommitter { time, lastFlushID, lastCompactID, getTabletServer().getLock()); MetadataTableUtil.finishSplit(high, highDatafileSizes, highDatafilesToRemove, getTabletServer(), getTabletServer().getLock()); - TLevel.logAtLevel(log, TLevel.TABLET_HIST, "{} split {} {}", extent, low, high); + log.debug("TABLET_HIST {} split {} {}", extent, low, high); newTablets.put(high, new TabletData(tabletDirectory, highDatafileSizes, time, lastFlushID, lastCompactID, lastLocation, getBulkIngestedFiles())); newTablets.put(low, new TabletData(lowDirectory, lowDatafileSizes, time, lastFlushID, lastCompactID, lastLocation, getBulkIngestedFiles())); @@ -2692,7 +2692,7 @@ public class Tablet implements TabletCommitter { } } } catch (IOException e) { - log.warn("", e); + log.warn("{}", e.getMessage(), e); } log.warn("Failed to create dir for tablet in table {} in volume {} will retry ...", tableId, volume); diff --git a/start/src/main/java/org/apache/accumulo/start/Main.java b/start/src/main/java/org/apache/accumulo/start/Main.java index 85c6e28..0f6dfae 100644 --- a/start/src/main/java/org/apache/accumulo/start/Main.java +++ b/start/src/main/java/org/apache/accumulo/start/Main.java @@ -144,7 +144,7 @@ public class Main { try { main = classWithMain.getMethod("main", args.getClass()); } catch (Throwable t) { - log.error("Could not run main method on '{}'. {}", classWithMain.getName(), t); + log.error("Could not run main method on '" + classWithMain.getName() + "'.", t); } if (main == null || !Modifier.isPublic(main.getModifiers()) || !Modifier.isStatic(main.getModifiers())) { System.out.println(classWithMain.getName() + " must implement a public static void main(String args[]) method"); @@ -189,7 +189,7 @@ public class Main { * The {@link Throwable} containing a stack trace to print. */ private static void die(final Throwable t) { - log.error("Thread '{}' died. {}", Thread.currentThread().getName(), t); + log.error("Thread '" + Thread.currentThread().getName() + "' died.", t); System.exit(1); } diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java index 41daf81..1e2e9dc 100644 --- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java +++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java @@ -88,11 +88,11 @@ public class AccumuloReloadingVFSClassLoader implements FileListener, ReloadingC updateClassloader(files, cl); return; } catch (Exception e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); try { Thread.sleep(DEFAULT_TIMEOUT); } catch (InterruptedException ie) { - log.error(e.getMessage(), ie); + log.error("{}", ie.getMessage(), ie); } } } @@ -203,7 +203,7 @@ public class AccumuloReloadingVFSClassLoader implements FileListener, ReloadingC try { buf.append("\t").append(f.getURL().toString()).append("\n"); } catch (FileSystemException e) { - log.error("Error getting URL for file {}", e); + log.error("Error getting URL for file", e); } } diff --git a/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java b/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java index 663c0c8..0812328 100644 --- a/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java +++ b/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java @@ -72,7 +72,7 @@ public class CreateRFiles { try { TestIngest.main(tia.split(" ")); } catch (Exception e) { - log.error("Could not run {}.main using the input '{}'", TestIngest.class.getName(), tia, e); + log.error("Could not run " + TestIngest.class.getName() + ".main using the input '" + tia + "'", e); } } diff --git a/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java b/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java index a8ce127..616121d 100644 --- a/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java +++ b/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java @@ -182,7 +182,7 @@ public class NativeMapConcurrencyTest { try { thread.join(); } catch (InterruptedException e) { - log.error("Could not join thread '{}'", thread.getName(), e); + log.error("Could not join thread '" + thread.getName() + "'", e); } } diff --git a/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java b/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java index 1283052..b268fb4 100644 --- a/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java +++ b/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java @@ -78,7 +78,7 @@ public class QueryMetadataTable { } } catch (TableNotFoundException e) { - log.error("Table '{}' not found.", MetadataTable.NAME, e); + log.error("Table '" + MetadataTable.NAME + "' not found.", e); throw new RuntimeException(e); } catch (AccumuloException e) { log.error("AccumuloException encountered.", e); diff --git a/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java b/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java index a6198f1..4425e46 100644 --- a/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java @@ -85,8 +85,8 @@ public class TableConfigurationUpdateIT extends AccumuloClusterHarness { } long end = System.currentTimeMillis(); - log.debug("{} with {} iterations and {} threads and cache invalidates {}% took {} second(s)", - tableConf, iterations, numThreads, ((1. / randomMax) * 100.), (end - start) / 1000); + log.debug("{} with {} iterations and {} threads and cache invalidates {}% took {} second(s)", tableConf, iterations, numThreads, ((1. / randomMax) * 100.), + (end - start) / 1000); } public static class TableConfRunner implements Callable<Exception> { diff --git a/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java b/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java index a914444..254801f 100644 --- a/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java +++ b/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java @@ -134,7 +134,7 @@ public class VerifyIngest { bytesRead += val.length; Value value = new Value(val); if (value.compareTo(ev) != 0) { - log.error("unexpected value ({} {} {} : saw {} expected {}",rowKey, colf, colq, value, new Value(ev)); + log.error("unexpected value ({} {} {} : saw {} expected {}", rowKey, colf, colq, value, new Value(ev)); errors++; } } @@ -180,7 +180,8 @@ public class VerifyIngest { } if (expectedRow >= (opts.rows + opts.startRow)) { - log.error("expectedRow ({}) >= (ingestArgs.rows + ingestArgs.startRow) ({}), get batch returned data passed end key", expectedRow, (opts.rows + opts.startRow)); + log.error("expectedRow ({}) >= (ingestArgs.rows + ingestArgs.startRow) ({}), get batch returned data passed end key", expectedRow, + (opts.rows + opts.startRow)); errors++; break; } diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CleanUpIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CleanUpIT.java index 5c6a6ac..2ff55e8 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CleanUpIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CleanUpIT.java @@ -138,7 +138,7 @@ public class CleanUpIT extends SharedMiniClusterBase { Exception e = new Exception(); for (Thread thread : threads) { e.setStackTrace(thread.getStackTrace()); - log.info("thread name: {}", thread.getName(), e); + log.info("thread name: " + thread.getName(), e); } } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
