ACCUMULO-3128 Reduce zookeeper log spam

Also reduce SslConnectionParams because that was just as spammy


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4556ec4b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4556ec4b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4556ec4b

Branch: refs/heads/master
Commit: 4556ec4bd1d7057fa485e2531348ae4e57b4cc88
Parents: bc53d3a
Author: Josh Elser <els...@apache.org>
Authored: Mon Sep 15 17:05:34 2014 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Mon Sep 15 17:31:04 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/util/SslConnectionParams.java  | 4 ++--
 test/src/test/resources/log4j.properties                         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4556ec4b/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java 
b/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java
index dad6792..640f66e 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java
@@ -79,8 +79,8 @@ public class SslConnectionParams  {
 
   private static String passwordFromConf(AccumuloConfiguration conf, String 
defaultPassword, Property passwordOverrideProperty) {
     String keystorePassword = conf.get(passwordOverrideProperty);
-    if (!keystorePassword.isEmpty()) {
-      log.debug("Using explicit SSL private key password from " + 
passwordOverrideProperty.getKey());
+    if (log.isTraceEnabled() && !keystorePassword.isEmpty()) {
+      log.trace("Using explicit SSL private key password from " + 
passwordOverrideProperty.getKey());
     } else {
       keystorePassword = defaultPassword;
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4556ec4b/test/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/test/src/test/resources/log4j.properties 
b/test/src/test/resources/log4j.properties
index 67deacd..6d0a56c 100644
--- a/test/src/test/resources/log4j.properties
+++ b/test/src/test/resources/log4j.properties
@@ -29,6 +29,7 @@ log4j.logger.org.apache.hadoop.tools.DistCp=WARN
 log4j.logger.org.apache.hadoop.util.NativeCodeLoader=ERROR
 log4j.logger.org.apache.hadoop.util.ProcessTree=WARN
 log4j.logger.org.apache.zookeeper.ClientCnxn=ERROR
+log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=INFO
 #log4j.logger.org.apache.zookeeper.ZooKeeper=WARN
 log4j.logger.org.apache.accumulo.core.file.rfile.bcfile=INFO
-log4j.logger.org.apache.accumulo.core.client.impl.ThriftScanner=INFO
\ No newline at end of file
+log4j.logger.org.apache.accumulo.core.client.impl.ThriftScanner=INFO

Reply via email to