You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/09/15 23:32:28 UTC
[1/3] git commit: ACCUMULO-3128 Reduce zookeeper log spam
Repository: accumulo
Updated Branches:
refs/heads/1.6.1-SNAPSHOT bc53d3a4b -> 4556ec4bd
refs/heads/master bc2862da3 -> 0c45fae3a
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/1.6.1-SNAPSHOT
Commit: 4556ec4bd1d7057fa485e2531348ae4e57b4cc88
Parents: bc53d3a
Author: Josh Elser <el...@apache.org>
Authored: Mon Sep 15 17:05:34 2014 -0400
Committer: Josh Elser <el...@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
[2/3] git commit: ACCUMULO-3128 Reduce zookeeper log spam
Posted by el...@apache.org.
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 <el...@apache.org>
Authored: Mon Sep 15 17:05:34 2014 -0400
Committer: Josh Elser <el...@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
[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.1-SNAPSHOT'
Conflicts:
test/src/test/resources/log4j.properties
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0c45fae3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c45fae3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c45fae3
Branch: refs/heads/master
Commit: 0c45fae3a99cb645594f40dba24e59241a553d1a
Parents: bc2862d 4556ec4
Author: Josh Elser <el...@apache.org>
Authored: Mon Sep 15 17:31:57 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Sep 15 17:31:57 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/util/SslConnectionParams.java | 4 ++--
test/src/test/resources/log4j.properties | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c45fae3/test/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --cc test/src/test/resources/log4j.properties
index 10e2320,6d0a56c..cb35840
--- a/test/src/test/resources/log4j.properties
+++ b/test/src/test/resources/log4j.properties
@@@ -29,16 -28,8 +29,17 @@@ log4j.logger.org.apache.hadoop.mapred=E
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.ClientCnxn=FATAL
+ log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=INFO
-#log4j.logger.org.apache.zookeeper.ZooKeeper=WARN
+log4j.logger.org.apache.zookeeper.ZooKeeper=WARN
log4j.logger.org.apache.accumulo.core.file.rfile.bcfile=INFO
+log4j.logger.org.apache.accumulo.server.util.ReplicationTableUtil=TRACE
log4j.logger.org.apache.accumulo.core.client.impl.ThriftScanner=INFO
+log4j.logger.org.apache.accumulo.fate.zookeeper.DistributedReadWriteLock=WARN
+log4j.logger.org.mortbay.log=WARN
+log4j.logger.org.apache.hadoop=WARN
+log4j.logger.org.apache.jasper=INFO
+log4j.logger.org.apache.hadoop.hdfs.server.namenode.FSNamesystem.audit=WARN
+log4j.logger.org.apache.hadoop.hdfs.server.datanode.DataNode.clienttrace=WARN
+log4j.logger.BlockStateChange=WARN
+log4j.logger.org.apache.accumulo.core.client.impl.TabletServerBatchReaderIterator=INFO