Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 248A01749F for ; Tue, 7 Apr 2015 20:32:50 +0000 (UTC) Received: (qmail 32633 invoked by uid 500); 7 Apr 2015 20:32:40 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 32603 invoked by uid 500); 7 Apr 2015 20:32:40 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 32517 invoked by uid 99); 7 Apr 2015 20:32:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Apr 2015 20:32:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 58401E1844; Tue, 7 Apr 2015 20:32:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Tue, 07 Apr 2015 20:32:41 -0000 Message-Id: <30ca44c2991f488e816a1de0ac1ecc2d@git.apache.org> In-Reply-To: <293359714df046cb9ed37bf0f2c8d07b@git.apache.org> References: <293359714df046cb9ed37bf0f2c8d07b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] accumulo git commit: ACCUMULO-3681 modified log statements that take format string (slf4j) from using arbitrary strings as first argument. ACCUMULO-3681 modified log statements that take format string (slf4j) from using arbitrary strings as first argument. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/26c0cae8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/26c0cae8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/26c0cae8 Branch: refs/heads/master Commit: 26c0cae8c93fde7c7c267bfad41907df0192c6c5 Parents: 4ca3143 Author: Ed Coleman Authored: Sat Mar 21 19:29:24 2015 -0400 Committer: Ed Coleman Committed: Sat Mar 21 19:29:24 2015 -0400 ---------------------------------------------------------------------- .../core/client/impl/ScannerIterator.java | 6 +-- .../client/impl/TabletServerBatchWriter.java | 6 +-- .../accumulo/core/conf/ConfigurationDocGen.java | 2 +- .../org/apache/accumulo/core/conf/Property.java | 4 +- .../accumulo/core/file/BloomFilterLayer.java | 2 +- .../CachingHDFSSecretKeyEncryptionStrategy.java | 14 +++---- .../NonCachingSecretKeyEncryptionStrategy.java | 14 +++---- .../accumulo/core/trace/DistributedTrace.java | 2 +- .../org/apache/accumulo/core/util/CleanUp.java | 2 +- .../accumulo/core/util/UtilWaitThread.java | 2 +- .../iterators/aggregation/NumSummationTest.java | 2 +- .../iterators/user/VersioningIteratorTest.java | 8 ++-- .../simple/filedata/ChunkInputStreamTest.java | 4 +- .../org/apache/accumulo/fate/AdminUtil.java | 2 +- .../accumulo/fate/util/LoggingRunnable.java | 2 +- .../accumulo/fate/util/UtilWaitThread.java | 2 +- .../accumulo/server/client/BulkImporter.java | 6 +-- .../server/constraints/MetadataConstraints.java | 8 ++-- .../iterators/MetadataBulkLoadFilter.java | 2 +- .../accumulo/server/master/LiveTServerSet.java | 2 +- .../server/master/state/DeadServerList.java | 2 +- .../accumulo/server/monitor/LogService.java | 2 +- .../server/problems/ProblemReports.java | 6 +-- .../apache/accumulo/server/rpc/RpcWrapper.java | 4 +- .../server/rpc/TNonblockingServerSocket.java | 2 +- .../security/handler/ZKAuthenticator.java | 20 ++++----- .../server/security/handler/ZKAuthorizor.java | 16 +++---- .../server/security/handler/ZKPermHandler.java | 44 ++++++++++---------- .../server/security/handler/ZKSecurityTool.java | 6 +-- .../org/apache/accumulo/server/util/Admin.java | 8 ++-- .../apache/accumulo/server/util/FileUtil.java | 14 +++---- .../accumulo/server/util/ListInstances.java | 2 +- .../server/util/MasterMetadataUtil.java | 8 ++-- .../accumulo/server/util/MetadataTableUtil.java | 16 +++---- .../accumulo/server/util/RandomWriter.java | 2 +- .../accumulo/server/util/RandomizeVolumes.java | 2 +- .../org/apache/accumulo/server/util/ZooZap.java | 2 +- .../security/handler/ZKAuthenticatorTest.java | 2 +- .../accumulo/gc/SimpleGarbageCollector.java | 16 +++---- .../java/org/apache/accumulo/master/Master.java | 2 +- .../master/MasterClientServiceHandler.java | 6 +-- .../master/recovery/RecoveryManager.java | 2 +- .../accumulo/master/state/MergeStats.java | 2 +- .../accumulo/master/tableOps/BulkImport.java | 2 +- .../accumulo/master/tableOps/CloneTable.java | 2 +- .../master/tableOps/CreateNamespace.java | 2 +- .../accumulo/master/tableOps/CreateTable.java | 2 +- .../master/tableOps/DeleteNamespace.java | 2 +- .../accumulo/master/tableOps/DeleteTable.java | 2 +- .../accumulo/master/tableOps/ImportTable.java | 10 ++--- .../org/apache/accumulo/monitor/Monitor.java | 4 +- .../accumulo/tracer/SendSpansViaThrift.java | 2 +- .../org/apache/accumulo/tracer/TraceServer.java | 2 +- .../apache/accumulo/tserver/FileManager.java | 8 ++-- .../apache/accumulo/tserver/InMemoryMap.java | 2 +- .../apache/accumulo/tserver/TabletServer.java | 29 +++++++------ .../tserver/TabletServerResourceManager.java | 2 +- .../apache/accumulo/tserver/WriteTracker.java | 2 +- .../tserver/constraints/ConstraintChecker.java | 4 +- .../accumulo/tserver/tablet/Compactor.java | 12 +++--- .../tserver/tablet/MinorCompactionTask.java | 2 +- .../accumulo/tserver/tablet/MinorCompactor.java | 6 +-- .../accumulo/tserver/tablet/TabletMemory.java | 2 +- .../ShellPluginConfigurationCommand.java | 8 ++-- .../vfs/AccumuloReloadingVFSClassLoader.java | 4 +- .../accumulo/test/ConditionalWriterIT.java | 2 +- .../apache/accumulo/test/MetaGetsReadersIT.java | 2 +- .../accumulo/test/MultiTableRecoveryIT.java | 2 +- 68 files changed, 199 insertions(+), 196 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java index c98e64c..123f532 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java @@ -92,13 +92,13 @@ public class ScannerIterator implements Iterator> { return; } } catch (IsolationException | ScanTimedOutException | AccumuloException | AccumuloSecurityException | TableDeletedException | TableOfflineException e) { - log.trace(e.getMessage(), e); + log.trace("{}", e.getMessage(), e); synchQ.add(e); } catch (TableNotFoundException e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); synchQ.add(e); } catch (Exception e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); synchQ.add(e); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java ---------------------------------------------------------------------- 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 9d38433..469495a 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 @@ -526,9 +526,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 { @@ -837,7 +837,7 @@ public class TabletServerBatchWriter { } } catch (IOException e) { if (log.isTraceEnabled()) - log.trace("failed to send mutations to " + location + " : " + e.getMessage()); + log.trace("failed to send mutations to {} : {}", location, e.getMessage()); HashSet tables = new HashSet(); for (KeyExtent ke : mutationBatch.keySet()) http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java index d39f199..ca7d81f 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java @@ -334,7 +334,7 @@ class ConfigurationDocGen { try { data.close(); } catch (IOException ex) { - log.error(ex.getMessage(), ex); + log.error("{}", ex.getMessage(), ex); } } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/core/src/main/java/org/apache/accumulo/core/conf/Property.java ---------------------------------------------------------------------- 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 2403915..b2c0ef6 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 @@ -683,9 +683,9 @@ public enum Property { if (annotationType.isInstance(a)) return true; } catch (SecurityException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } catch (NoSuchFieldException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } return false; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java ---------------------------------------------------------------------- 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 61e6b5c..b828890 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 @@ -240,7 +240,7 @@ public class BloomFilterLayer { if (!closed) 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) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java index 1bddaa6..c685a2d 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java +++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java @@ -50,7 +50,7 @@ public class CachingHDFSSecretKeyEncryptionStrategy implements SecretKeyEncrypti secretKeyCache.ensureSecretKeyCacheInitialized(context); doKeyEncryptionOperation(Cipher.WRAP_MODE, context); } catch (IOException e) { - log.error(e.getMessage(),e); + log.error("{}", e.getMessage(),e); throw new RuntimeException(e); } return context; @@ -62,7 +62,7 @@ public class CachingHDFSSecretKeyEncryptionStrategy implements SecretKeyEncrypti secretKeyCache.ensureSecretKeyCacheInitialized(context); doKeyEncryptionOperation(Cipher.UNWRAP_MODE, context); } catch (IOException e) { - log.error(e.getMessage(),e); + log.error("{}", e.getMessage(),e); throw new RuntimeException(e); } return context; @@ -74,7 +74,7 @@ public class CachingHDFSSecretKeyEncryptionStrategy implements SecretKeyEncrypti try { cipher.init(encryptionMode, new SecretKeySpec(secretKeyCache.getKeyEncryptionKey(), params.getAlgorithmName())); } catch (InvalidKeyException e) { - log.error(e.getMessage(),e); + log.error("{}", e.getMessage(),e); throw new RuntimeException(e); } @@ -83,10 +83,10 @@ public class CachingHDFSSecretKeyEncryptionStrategy implements SecretKeyEncrypti Key plaintextKey = cipher.unwrap(params.getEncryptedKey(), params.getAlgorithmName(), Cipher.SECRET_KEY); params.setPlaintextKey(plaintextKey.getEncoded()); } catch (InvalidKeyException e) { - log.error(e.getMessage(),e); + log.error("{}", e.getMessage(),e); throw new RuntimeException(e); } catch (NoSuchAlgorithmException e) { - log.error(e.getMessage(),e); + log.error("{}", e.getMessage(),e); throw new RuntimeException(e); } } else { @@ -96,10 +96,10 @@ public class CachingHDFSSecretKeyEncryptionStrategy implements SecretKeyEncrypti params.setEncryptedKey(encryptedSecretKey); params.setOpaqueKeyEncryptionKeyID(secretKeyCache.getPathToKeyName()); } catch (InvalidKeyException e) { - log.error(e.getMessage(),e); + log.error("{}", e.getMessage(),e); throw new RuntimeException(e); } catch (IllegalBlockSizeException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/core/src/main/java/org/apache/accumulo/core/security/crypto/NonCachingSecretKeyEncryptionStrategy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/NonCachingSecretKeyEncryptionStrategy.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/NonCachingSecretKeyEncryptionStrategy.java index bfc6841..ce9da77 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/crypto/NonCachingSecretKeyEncryptionStrategy.java +++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/NonCachingSecretKeyEncryptionStrategy.java @@ -83,7 +83,7 @@ public class NonCachingSecretKeyEncryptionStrategy implements SecretKeyEncryptio try { cipher.init(encryptionMode, new SecretKeySpec(keyEncryptionKey, params.getAlgorithmName())); } catch (InvalidKeyException e) { - log.error(e.getMessage(),e); + log.error("{}", e.getMessage(),e); throw new RuntimeException(e); } @@ -92,10 +92,10 @@ public class NonCachingSecretKeyEncryptionStrategy implements SecretKeyEncryptio Key plaintextKey = cipher.unwrap(params.getEncryptedKey(), params.getAlgorithmName(), Cipher.SECRET_KEY); params.setPlaintextKey(plaintextKey.getEncoded()); } catch (InvalidKeyException e) { - log.error(e.getMessage(),e); + log.error("{}", e.getMessage(),e); throw new RuntimeException(e); } catch (NoSuchAlgorithmException e) { - log.error(e.getMessage(),e); + log.error("{}", e.getMessage(),e); throw new RuntimeException(e); } } else { @@ -105,10 +105,10 @@ public class NonCachingSecretKeyEncryptionStrategy implements SecretKeyEncryptio params.setEncryptedKey(encryptedSecretKey); params.setOpaqueKeyEncryptionKeyID(pathToKeyName); } catch (InvalidKeyException e) { - log.error(e.getMessage(),e); + log.error("{}", e.getMessage(),e); throw new RuntimeException(e); } catch (IllegalBlockSizeException e) { - log.error(e.getMessage(),e); + log.error("{}", e.getMessage(),e); throw new RuntimeException(e); } @@ -159,7 +159,7 @@ public class NonCachingSecretKeyEncryptionStrategy implements SecretKeyEncryptio doKeyEncryptionOperation(Cipher.WRAP_MODE, params, fullPath, pathToKey, fs); } catch (IOException e) { - log.error(e.getMessage(),e); + log.error("{}", e.getMessage(),e); throw new RuntimeException(e); } @@ -183,7 +183,7 @@ public class NonCachingSecretKeyEncryptionStrategy implements SecretKeyEncryptio doKeyEncryptionOperation(Cipher.UNWRAP_MODE, params, pathToKeyName, pathToKey, fs); } catch (IOException e) { - log.error(e.getMessage(),e); + log.error("{}", e.getMessage(),e); throw new RuntimeException(e); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java ---------------------------------------------------------------------- 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 484f93d..14886f1 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 @@ -198,7 +198,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(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/core/src/main/java/org/apache/accumulo/core/util/CleanUp.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/CleanUp.java b/core/src/main/java/org/apache/accumulo/core/util/CleanUp.java index 2ab5d0e..ed83c5a 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/CleanUp.java +++ b/core/src/main/java/org/apache/accumulo/core/util/CleanUp.java @@ -55,7 +55,7 @@ public class CleanUp { try { Thread.sleep(100); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/core/src/main/java/org/apache/accumulo/core/util/UtilWaitThread.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/UtilWaitThread.java b/core/src/main/java/org/apache/accumulo/core/util/UtilWaitThread.java index 3f4cbde..d7005a4 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/UtilWaitThread.java +++ b/core/src/main/java/org/apache/accumulo/core/util/UtilWaitThread.java @@ -27,7 +27,7 @@ public class UtilWaitThread { try { Thread.sleep(millis); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java index 05a8b04..796311e 100644 --- a/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java +++ b/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java @@ -74,7 +74,7 @@ public class NumSummationTest { la = NumArraySummation.bytesToLongArray(nas.aggregate().get()); assertTrue(la.length == 0); } catch (Exception e) { - log.error(e.getMessage(),e); + log.error("{}", e.getMessage(),e); assertTrue(false); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java index 2867f71..fa42998 100644 --- a/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java +++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java @@ -91,7 +91,7 @@ public class VersioningIteratorTest { } catch (IOException e) { assertFalse(true); } catch (Exception e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); assertFalse(true); } } @@ -127,7 +127,7 @@ public class VersioningIteratorTest { } catch (IOException e) { assertFalse(true); } catch (Exception e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); assertFalse(true); } } @@ -176,7 +176,7 @@ public class VersioningIteratorTest { } catch (IOException e) { assertFalse(true); } catch (Exception e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); assertFalse(true); } } @@ -204,7 +204,7 @@ public class VersioningIteratorTest { } catch (IOException e) { assertFalse(true); } catch (Exception e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); assertFalse(true); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java index a9b5032..1976b21 100644 --- a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java +++ b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java @@ -285,7 +285,7 @@ public class ChunkInputStreamTest extends TestCase { assertEquals(0, cis.read(b)); fail(); } catch (IOException e) { - log.debug("EXCEPTION " + e.getMessage()); + log.debug("EXCEPTION {}", e.getMessage()); // expected, ignore } } @@ -295,7 +295,7 @@ public class ChunkInputStreamTest extends TestCase { cis.close(); fail(); } catch (IOException e) { - log.debug("EXCEPTION " + e.getMessage()); + log.debug("EXCEPTION {}", e.getMessage()); // expected, ignore } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java ---------------------------------------------------------------------- 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 dca35ed..d93bf8c 100644 --- a/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java +++ b/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java @@ -111,7 +111,7 @@ public class AdminUtil { tables.add(lda[0].charAt(0) + ":" + id); } catch (Exception e) { - log.error(e.getMessage(),e); + log.error("{}", e.getMessage(),e); } pos++; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java ---------------------------------------------------------------------- diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java b/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java index 6f1b20e..82cacea 100644 --- a/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java +++ b/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java @@ -35,7 +35,7 @@ public class LoggingRunnable implements Runnable { runnable.run(); } catch (Throwable t) { try { - log.error("Thread \"" + Thread.currentThread().getName() + "\" died " + t.getMessage(), t); + log.error("Thread \"{}\" died {}", Thread.currentThread().getName(), t.getMessage(), t); } catch (Throwable t2) { // maybe the logging system is screwed up OR there is a bug in the exception, like t.getMessage() throws a NPE System.err.println("ERROR " + new Date() + " Failed to log message about thread death " + t2.getMessage()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java ---------------------------------------------------------------------- diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java b/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java index da9cc5d..e109e06 100644 --- a/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java +++ b/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java @@ -27,7 +27,7 @@ public class UtilWaitThread { try { Thread.sleep(millis); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java ---------------------------------------------------------------------- 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 d7284eb..8e70d9b 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 @@ -343,7 +343,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); } @@ -370,7 +370,7 @@ public class BulkImporter { try { estimatedSizes = FileUtil.estimateSizes(acuConf, entry.getKey(), mapFileSizes.get(entry.getKey()), extentsOf(entry.getValue()), conf, vm); } catch (IOException e) { - log.warn("Failed to estimate map file sizes " + e.getMessage()); + log.warn("Failed to estimate map file sizes {}", e.getMessage()); } if (estimatedSizes == null) { @@ -462,7 +462,7 @@ public class BulkImporter { } } - log.info("Could not assign " + mapFiles.size() + " map files to tablet " + ke + " because : " + message + ". Will retry ..."); + log.info("Could not assign {} map files to tablet {} because : {} . Will retry ...", mapFiles.size(), ke, message); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java index 1aad06b..c95fad9 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java +++ b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java @@ -259,7 +259,7 @@ public class MetadataConstraints implements Constraint { try { lockHeld = ZooLock.isLockHeld(zooCache, new ZooUtil.LockID(zooRoot, lockId)); } catch (Exception e) { - log.debug("Failed to verify lock was held " + lockId + " " + e.getMessage()); + log.debug("Failed to verify lock was held {} {}", lockId, e.getMessage()); } if (!lockHeld) { @@ -271,10 +271,10 @@ public class MetadataConstraints implements Constraint { } if (violations != null) { - log.debug("violating metadata mutation : " + new String(mutation.getRow(), UTF_8)); + log.debug("violating metadata mutation : {}", new String(mutation.getRow(), UTF_8)); for (ColumnUpdate update : mutation.getUpdates()) { - log.debug(" update: " + new String(update.getColumnFamily(), UTF_8) + ":" + new String(update.getColumnQualifier(), UTF_8) + " value " - + (update.isDeleted() ? "[delete]" : new String(update.getValue(), UTF_8))); + log.debug(" update: {}:{} value {}", new String(update.getColumnFamily(), UTF_8), new String(update.getColumnQualifier(), UTF_8), + (update.isDeleted() ? "[delete]" : new String(update.getValue(), UTF_8))); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java b/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java index 57ebc5e..772be32 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java +++ b/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java @@ -62,7 +62,7 @@ public class MetadataBulkLoadFilter extends Filter { } } catch (Exception e) { status = Status.ACTIVE; - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } bulkTxStatusCache.put(txid, status); http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java index 47e54fa..13cd0a1 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java @@ -265,7 +265,7 @@ public class LiveTServerSet implements Watcher { if (!doomed.isEmpty() || !updates.isEmpty()) this.cback.update(this, doomed, updates); } catch (Exception ex) { - log.error(ex.getMessage(), ex); + log.error("{}", ex.getMessage(), ex); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java ---------------------------------------------------------------------- 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 3ea7238..3cd2517 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 @@ -67,7 +67,7 @@ public class DeadServerList { } } } catch (Exception ex) { - log.error(ex.getMessage(), ex); + log.error("{}", ex.getMessage(), ex); } return result; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java b/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java index ca5a7b8..8acc764 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java +++ b/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java @@ -77,7 +77,7 @@ public class LogService extends org.apache.log4j.AppenderSkeleton { t.start(); } } catch (IOException io) { - log.error(io.getMessage(), io); + log.error("{}", io.getMessage(), io); } } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java ---------------------------------------------------------------------- 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 440ee81..9c877a1 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 @@ -112,7 +112,7 @@ public class ProblemReports implements Iterable { try { reportExecutor.execute(new LoggingRunnable(log, r)); } catch (RejectedExecutionException ree) { - log.error("Failed to report problem " + pr.getTableName() + " " + pr.getProblemType() + " " + pr.getResource() + " " + ree.getMessage()); + log.error("Failed to report problem {} {} {} {}", pr.getTableName(), pr.getProblemType(), pr.getResource(), ree.getMessage()); } } @@ -139,7 +139,7 @@ public class ProblemReports implements Iterable { pr.removeFromMetadataTable(context); } } catch (Exception e) { - log.error("Failed to delete problem report " + pr.getTableName() + " " + pr.getProblemType() + " " + pr.getResource(), e); + log.error("Failed to delete problem report {} {} {}", pr.getTableName(), pr.getProblemType(), pr.getResource(), e); } } }; @@ -147,7 +147,7 @@ public class ProblemReports implements Iterable { try { reportExecutor.execute(new LoggingRunnable(log, r)); } catch (RejectedExecutionException ree) { - log.error("Failed to delete problem report " + pr.getTableName() + " " + pr.getProblemType() + " " + pr.getResource() + " " + ree.getMessage()); + log.error("Failed to delete problem report {} {} {} {}", pr.getTableName(), pr.getProblemType(), pr.getResource(), ree.getMessage()); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java index b28ecb7..62d39d2 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java +++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java @@ -47,11 +47,11 @@ public class RpcWrapper { return super.invoke(obj, method, args); } catch (RuntimeException e) { String msg = e.getMessage(); - log.error(msg, e); + log.error("{}", msg, e); throw new TException(msg); } catch (Error e) { String msg = e.getMessage(); - log.error(msg, e); + log.error("{}", msg, e); throw new TException(msg); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java index 2dbb8e7..fc6cd71 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java +++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java @@ -140,7 +140,7 @@ public class TNonblockingServerSocket extends TNonblockingServerTransport { try { serverSocket_.close(); } catch (IOException iox) { - log.warn("WARNING: Could not close server socket: " + iox.getMessage()); + log.warn("WARNING: Could not close server socket: {}", iox.getMessage()); } serverSocket_ = null; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java index 67f25a9..64fa27d 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java @@ -79,13 +79,13 @@ public final class ZKAuthenticator implements Authenticator { constructUser(principal, ZKSecurityTool.createPass(token)); } } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } catch (AccumuloException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } } @@ -121,10 +121,10 @@ public final class ZKAuthenticator implements Authenticator { throw new AccumuloSecurityException(principal, SecurityErrorCode.USER_EXISTS, e); throw new AccumuloSecurityException(principal, SecurityErrorCode.CONNECTION_ERROR, e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } catch (AccumuloException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new AccumuloSecurityException(principal, SecurityErrorCode.DEFAULT_SECURITY_ERROR, e); } } @@ -137,13 +137,13 @@ public final class ZKAuthenticator implements Authenticator { ZooReaderWriter.getInstance().recursiveDelete(ZKUserPath + "/" + user, NodeMissingPolicy.FAIL); } } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } catch (KeeperException e) { if (e.code().equals(KeeperException.Code.NONODE)) { throw new AccumuloSecurityException(user, SecurityErrorCode.USER_DOESNT_EXIST, e); } - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new AccumuloSecurityException(user, SecurityErrorCode.CONNECTION_ERROR, e); } } @@ -161,13 +161,13 @@ public final class ZKAuthenticator implements Authenticator { NodeExistsPolicy.OVERWRITE); } } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new AccumuloSecurityException(principal, SecurityErrorCode.CONNECTION_ERROR, e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } catch (AccumuloException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new AccumuloSecurityException(principal, SecurityErrorCode.DEFAULT_SECURITY_ERROR, e); } } else http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java index 99b3fe5..2d7f7bb 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java @@ -102,10 +102,10 @@ public class ZKAuthorizor implements Authorizor { initUser(rootuser); zoo.putPersistentData(ZKUserPath + "/" + rootuser + ZKUserAuths, ZKSecurityTool.convertAuthorizations(Authorizations.EMPTY), NodeExistsPolicy.FAIL); } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } } @@ -116,10 +116,10 @@ public class ZKAuthorizor implements Authorizor { try { zoo.putPersistentData(ZKUserPath + "/" + user, new byte[0], NodeExistsPolicy.SKIP); } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new AccumuloSecurityException(user, SecurityErrorCode.CONNECTION_ERROR, e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } } @@ -133,10 +133,10 @@ public class ZKAuthorizor implements Authorizor { zooCache.clear(ZKUserPath + "/" + user); } } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); if (e.code().equals(KeeperException.Code.NONODE)) throw new AccumuloSecurityException(user, SecurityErrorCode.USER_DOESNT_EXIST, e); throw new AccumuloSecurityException(user, SecurityErrorCode.CONNECTION_ERROR, e); @@ -153,10 +153,10 @@ public class ZKAuthorizor implements Authorizor { NodeExistsPolicy.OVERWRITE); } } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new AccumuloSecurityException(user, SecurityErrorCode.CONNECTION_ERROR, e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java index b65e605..b8abb20 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java @@ -196,10 +196,10 @@ public class ZKPermHandler implements PermissionHandler { } } } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new AccumuloSecurityException(user, SecurityErrorCode.CONNECTION_ERROR, e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } } @@ -222,10 +222,10 @@ public class ZKPermHandler implements PermissionHandler { } } } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new AccumuloSecurityException(user, SecurityErrorCode.CONNECTION_ERROR, e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } } @@ -248,10 +248,10 @@ public class ZKPermHandler implements PermissionHandler { } } } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new AccumuloSecurityException(user, SecurityErrorCode.CONNECTION_ERROR, e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } } @@ -275,10 +275,10 @@ public class ZKPermHandler implements PermissionHandler { } } } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new AccumuloSecurityException(user, SecurityErrorCode.CONNECTION_ERROR, e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } } @@ -303,10 +303,10 @@ public class ZKPermHandler implements PermissionHandler { NodeExistsPolicy.OVERWRITE); } } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new AccumuloSecurityException(user, SecurityErrorCode.CONNECTION_ERROR, e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } } @@ -331,10 +331,10 @@ public class ZKPermHandler implements PermissionHandler { NodeExistsPolicy.OVERWRITE); } } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new AccumuloSecurityException(user, SecurityErrorCode.CONNECTION_ERROR, e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } } @@ -349,10 +349,10 @@ public class ZKPermHandler implements PermissionHandler { zoo.recursiveDelete(ZKUserPath + "/" + user + ZKUserTablePerms + "/" + table, NodeMissingPolicy.SKIP); } } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new AccumuloSecurityException("unknownUser", SecurityErrorCode.CONNECTION_ERROR, e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } } @@ -367,10 +367,10 @@ public class ZKPermHandler implements PermissionHandler { zoo.recursiveDelete(ZKUserPath + "/" + user + ZKUserNamespacePerms + "/" + namespace, NodeMissingPolicy.SKIP); } } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new AccumuloSecurityException("unknownUser", SecurityErrorCode.CONNECTION_ERROR, e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } } @@ -404,10 +404,10 @@ public class ZKPermHandler implements PermissionHandler { for (Entry> entry : namespacePerms.entrySet()) createNamespacePerm(rootuser, entry.getKey(), entry.getValue()); } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } } @@ -420,10 +420,10 @@ public class ZKPermHandler implements PermissionHandler { zoo.putPersistentData(ZKUserPath + "/" + user + ZKUserTablePerms, new byte[0], NodeExistsPolicy.SKIP); zoo.putPersistentData(ZKUserPath + "/" + user + ZKUserNamespacePerms, new byte[0], NodeExistsPolicy.SKIP); } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new AccumuloSecurityException(user, SecurityErrorCode.CONNECTION_ERROR, e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } } @@ -461,10 +461,10 @@ public class ZKPermHandler implements PermissionHandler { zooCache.clear(ZKUserPath + "/" + user); } } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); if (e.code().equals(KeeperException.Code.NONODE)) throw new AccumuloSecurityException(user, SecurityErrorCode.USER_DOESNT_EXIST, e); throw new AccumuloSecurityException(user, SecurityErrorCode.CONNECTION_ERROR, e); http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java index 17c2ec0..6401190 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java @@ -111,7 +111,7 @@ class ZKSecurityTool { for (SystemPermission sp : systempermissions) out.writeByte(sp.getId()); } catch (IOException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); // this is impossible with ByteArrayOutputStream; crash hard if this happens } return bytes.toByteArray(); @@ -138,7 +138,7 @@ class ZKSecurityTool { for (TablePermission tp : tablepermissions) out.writeByte(tp.getId()); } catch (IOException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); // this is impossible with ByteArrayOutputStream; crash hard if this happens } return bytes.toByteArray(); @@ -158,7 +158,7 @@ class ZKSecurityTool { for (NamespacePermission tnp : namespacepermissions) out.writeByte(tnp.getId()); } catch (IOException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw new RuntimeException(e); // this is impossible with ByteArrayOutputStream; crash hard if this happens } return bytes.toByteArray(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java index f837ad6..8ad8eeb 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java @@ -254,13 +254,13 @@ public class Admin implements KeywordExecutable { if (rc != 0) System.exit(rc); } catch (AccumuloException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); System.exit(1); } catch (AccumuloSecurityException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); System.exit(2); } catch (Exception e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); System.exit(3); } } @@ -316,7 +316,7 @@ public class Admin implements KeywordExecutable { } } } catch (Exception e) { - log.warn("Failed to intiate flush " + e.getMessage()); + log.warn("Failed to intiate flush {}", e.getMessage()); } } }; http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java ---------------------------------------------------------------------- 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 94c2e6c..29700c7 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 @@ -165,7 +165,7 @@ public class FileUtil { if (reader != null) reader.close(); } catch (IOException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } for (SortedKeyValueIterator r : iters) @@ -174,13 +174,13 @@ public class FileUtil { ((FileSKVIterator) r).close(); } catch (IOException e) { // continue closing - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } try { writer.close(); } catch (IOException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw e; } } @@ -374,7 +374,7 @@ public class FileUtil { r.close(); } catch (IOException e) { // okay, try to close the rest anyway - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } } @@ -420,7 +420,7 @@ public class FileUtil { if (reader != null) reader.close(); } catch (IOException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } } @@ -495,7 +495,7 @@ public class FileUtil { if (reader != null) reader.close(); } catch (IOException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } } } @@ -542,7 +542,7 @@ public class FileUtil { index.close(); } catch (IOException e) { // continue with next file - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java b/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java index 2f575d4..9dc1251 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java @@ -221,7 +221,7 @@ public class ListInstances { private static void handleException(Exception e, boolean printErrors) { if (printErrors) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } errors++; http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java index 4ca2d64..d5a4223 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java @@ -189,9 +189,9 @@ public class MasterMetadataUtil { try { return new TServerInstance(address, zooLock.getSessionId()); } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } UtilWaitThread.sleep(1000); } @@ -280,9 +280,9 @@ public class MasterMetadataUtil { } break; } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } UtilWaitThread.sleep(1000); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java index 10cd749..0c0ecc0 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java @@ -153,15 +153,15 @@ public class MetadataTableUtil { t.update(m); return; } catch (AccumuloException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } catch (AccumuloSecurityException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } catch (ConstraintViolationException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); // retrying when a CVE occurs is probably futile and can cause problems, see ACCUMULO-3096 throw new RuntimeException(e); } catch (TableNotFoundException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } UtilWaitThread.sleep(1000); } @@ -465,11 +465,11 @@ public class MetadataTableUtil { } break; } catch (KeeperException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } catch (InterruptedException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } catch (IOException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } UtilWaitThread.sleep(1000); } @@ -680,7 +680,7 @@ public class MetadataTableUtil { } break; } catch (Exception e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } UtilWaitThread.sleep(1000); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/util/RandomWriter.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RandomWriter.java b/server/base/src/main/java/org/apache/accumulo/server/util/RandomWriter.java index 0c30598..8d4b67e 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/RandomWriter.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/RandomWriter.java @@ -104,7 +104,7 @@ public class RandomWriter { bw.addMutations(new RandomMutationGenerator(opts.count)); bw.close(); } catch (Exception e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); throw e; } long stop = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java b/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java index dedf4ad..907dadd 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java @@ -67,7 +67,7 @@ public class RandomizeVolumes { int status = randomize(c, opts.getTableName()); System.exit(status); } catch (Exception ex) { - log.error(ex.getMessage(), ex); + log.error("{}", ex.getMessage(), ex); System.exit(4); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java index 42f4bf0..f3a9bdc 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java @@ -101,7 +101,7 @@ public class ZooZap { } } } catch (Exception e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java index bc71ac6..1db7009 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java @@ -83,7 +83,7 @@ public class ZKAuthenticatorTest extends TestCase { storedBytes = ZKSecurityTool.createPass(rawPass); assertTrue(ZKSecurityTool.checkPass(rawPass, storedBytes)); } catch (AccumuloException e) { - log.error(e.getMessage(),e); + log.error("{}", e.getMessage(),e); assertTrue(false); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java ---------------------------------------------------------------------- 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 c8d5cd6..04f21a1 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 @@ -415,7 +415,7 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa putMarkerDeleteMutation(delete, finalWriter); } } catch (Exception e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } } @@ -430,7 +430,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) { @@ -513,7 +513,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); } @@ -522,7 +522,7 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa log.debug("Sleeping for " + delay + " milliseconds before beginning garbage collection cycles"); Thread.sleep(delay); } catch (InterruptedException e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); return; } @@ -551,7 +551,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(); @@ -576,7 +576,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(); } @@ -588,7 +588,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(); @@ -597,7 +597,7 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa log.debug("Sleeping for " + gcDelay + " milliseconds"); Thread.sleep(gcDelay); } catch (InterruptedException e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); return; } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/master/src/main/java/org/apache/accumulo/master/Master.java ---------------------------------------------------------------------- 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 3762f32..a7e8db1 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 @@ -1003,7 +1003,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); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java ---------------------------------------------------------------------- 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 f73c236..06f91a0 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 @@ -129,7 +129,7 @@ class MasterClientServiceHandler extends FateServiceHandler implements MasterCli } catch (NoNodeException nne) { throw new ThriftTableOperationException(tableId, 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, null, TableOperation.FLUSH, TableOperationExceptionType.OTHER, null); } return Long.parseLong(new String(fid)); @@ -241,10 +241,10 @@ class MasterClientServiceHandler extends FateServiceHandler implements MasterCli } catch (TabletDeletedException tde) { Master.log.debug("Failed to scan " + MetadataTable.NAME + " table to wait for flush " + 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(); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java ---------------------------------------------------------------------- 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 ea21fd3..b872d65 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 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); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java ---------------------------------------------------------------------- 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 44f229e..5815a46 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 @@ -196,7 +196,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: " + tls + " walogs " + tls.walogs.size()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java ---------------------------------------------------------------------- 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 1ba01c9..6f77a82 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 @@ -273,7 +273,7 @@ public class BulkImport extends MasterRepo { fs.rename(fileStatus.getPath(), newPath); log.debug("Moved " + fileStatus.getPath() + " to " + newPath); } catch (IOException E1) { - log.error("Could not move: " + fileStatus.getPath().toString() + " " + E1.getMessage()); + log.error("Could not move: {} {}", fileStatus.getPath().toString(), E1.getMessage()); } } catch (Exception ex) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneTable.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneTable.java index 715ad75..192d182 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneTable.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneTable.java @@ -198,7 +198,7 @@ class ClonePermissions extends MasterRepo { AuditedSecurityOperation.getInstance(environment).grantTablePermission(environment.rpcCreds(), cloneInfo.user, cloneInfo.tableId, permission, cloneInfo.namespaceId); } catch (ThriftSecurityException e) { - LoggerFactory.getLogger(FinishCloneTable.class).error(e.getMessage(), e); + LoggerFactory.getLogger(FinishCloneTable.class).error("{}", e.getMessage(), e); throw e; } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateNamespace.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateNamespace.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateNamespace.java index 4924e01..9264031 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateNamespace.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateNamespace.java @@ -146,7 +146,7 @@ class SetupNamespacePermissions extends MasterRepo { try { security.grantNamespacePermission(env.rpcCreds(), namespaceInfo.user, namespaceInfo.namespaceId, permission); } catch (ThriftSecurityException e) { - LoggerFactory.getLogger(FinishCreateNamespace.class).error(e.getMessage(), e); + LoggerFactory.getLogger(FinishCreateNamespace.class).error("{}", e.getMessage(), e); throw e; } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateTable.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateTable.java index ef43a70..2132ce4 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateTable.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateTable.java @@ -256,7 +256,7 @@ class SetupPermissions extends MasterRepo { try { security.grantTablePermission(env.rpcCreds(), tableInfo.user, tableInfo.tableId, permission, tableInfo.namespaceId); } catch (ThriftSecurityException e) { - LoggerFactory.getLogger(FinishCreateTable.class).error(e.getMessage(), e); + LoggerFactory.getLogger(FinishCreateTable.class).error("{}", e.getMessage(), e); throw e; } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteNamespace.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteNamespace.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteNamespace.java index 5729d38..3aa3719 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteNamespace.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteNamespace.java @@ -58,7 +58,7 @@ class NamespaceCleanUp extends MasterRepo { try { AuditedSecurityOperation.getInstance(master).deleteNamespace(master.rpcCreds(), namespaceId); } catch (ThriftSecurityException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } Utils.unreserveNamespace(namespaceId, id, true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java index 388911b..ab1227f 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java @@ -207,7 +207,7 @@ class CleanUp extends MasterRepo { try { AuditedSecurityOperation.getInstance(master).deleteTable(master.rpcCreds(), tableId, namespaceId); } catch (ThriftSecurityException e) { - log.error(e.getMessage(), e); + log.error("{}", e.getMessage(), e); } Utils.unreserveTable(tableId, tid, true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java index 1584fb0..961e899 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java @@ -169,7 +169,7 @@ class MoveExportedFiles extends MasterRepo { return new FinishImportTable(tableInfo); } catch (IOException ioe) { - log.warn(ioe.getMessage(), ioe); + log.warn("{}", ioe.getMessage(), ioe); throw new ThriftTableOperationException(tableInfo.tableId, tableInfo.tableName, TableOperation.IMPORT, TableOperationExceptionType.OTHER, "Error renaming files " + ioe.getMessage()); } @@ -303,7 +303,7 @@ class PopulateMetadataTable extends MasterRepo { return new MoveExportedFiles(tableInfo); } catch (IOException ioe) { - log.warn(ioe.getMessage(), ioe); + log.warn("{}", ioe.getMessage(), ioe); throw new ThriftTableOperationException(tableInfo.tableId, tableInfo.tableName, TableOperation.IMPORT, TableOperationExceptionType.OTHER, "Error reading " + path + " " + ioe.getMessage()); } finally { @@ -397,7 +397,7 @@ class MapImportFileNames extends MasterRepo { return new PopulateMetadataTable(tableInfo); } catch (IOException ioe) { - log.warn(ioe.getMessage(), ioe); + log.warn("{}", ioe.getMessage(), ioe); throw new ThriftTableOperationException(tableInfo.tableId, tableInfo.tableName, TableOperation.IMPORT, TableOperationExceptionType.OTHER, "Error writing mapping file " + path + " " + ioe.getMessage()); } finally { @@ -538,7 +538,7 @@ class ImportSetupPermissions extends MasterRepo { try { security.grantTablePermission(env.rpcCreds(), tableInfo.user, tableInfo.tableId, permission, tableInfo.namespaceId); } catch (ThriftSecurityException e) { - LoggerFactory.getLogger(ImportSetupPermissions.class).error(e.getMessage(), e); + LoggerFactory.getLogger(ImportSetupPermissions.class).error("{}", e.getMessage(), e); throw e; } } @@ -617,7 +617,7 @@ public class ImportTable extends MasterRepo { } } } catch (IOException ioe) { - log.warn(ioe.getMessage(), ioe); + log.warn("{}", ioe.getMessage(), ioe); throw new ThriftTableOperationException(null, tableInfo.tableName, TableOperation.IMPORT, TableOperationExceptionType.OTHER, "Failed to read export metadata " + ioe.getMessage()); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java ---------------------------------------------------------------------- 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 1a2904c..a0b6f42 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 @@ -495,7 +495,7 @@ public class Monitor { try { Monitor.fetchData(); } catch (Exception e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); } UtilWaitThread.sleep(333); @@ -511,7 +511,7 @@ public class Monitor { try { Monitor.fetchScans(); } catch (Exception e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); } UtilWaitThread.sleep(5000); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java ---------------------------------------------------------------------- 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 f24c7b9..695488a 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 @@ -63,7 +63,7 @@ public class SendSpansViaThrift extends AsyncSpanReceiver { TProtocol prot = new TBinaryProtocol(transport); return new Client(prot); } catch (Exception ex) { - log.error(ex.getMessage(), ex); + log.error("{}", ex.getMessage(), ex); return null; } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java ---------------------------------------------------------------------- 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 7f41067..e3265b4 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 @@ -360,7 +360,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(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java ---------------------------------------------------------------------- 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 f01313f..02dacd7 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 @@ -237,7 +237,7 @@ public class FileManager { try { reader.close(); } catch (Exception e) { - log.error("Failed to close file " + e.getMessage(), e); + log.error("Failed to close file {}", e.getMessage(), e); } } } @@ -327,7 +327,7 @@ public class FileManager { if (!tablet.isMeta()) { filePermits.release(1); } - log.warn("Failed to open file " + file + " " + e.getMessage() + " continuing..."); + log.warn("Failed to open file {} {} continuing...", file, e.getMessage()); } else { // close whatever files were opened closeReaders(reservedFiles); @@ -336,7 +336,7 @@ public class FileManager { filePermits.release(files.size()); } - log.error("Failed to open file " + file + " " + e.getMessage()); + log.error("Failed to open file {} {}", file, e.getMessage()); throw new IOException("Failed to open " + file, e); } } @@ -365,7 +365,7 @@ public class FileManager { try { reader.closeDeepCopies(); } catch (IOException e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); sawIOException = true; } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/26c0cae8/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java ---------------------------------------------------------------------- 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 652aa72..cd96717 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 @@ -647,7 +647,7 @@ public class InMemoryMap { if (mds.reader != null) mds.reader.close(); } catch (IOException e) { - log.warn(e.getMessage(), e); + log.warn("{}", e.getMessage(), e); } } }