You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ha...@apache.org on 2018/07/19 03:59:18 UTC
zookeeper git commit: ZOOKEEPER-3083: Remove some redundant and noisy
log lines
Repository: zookeeper
Updated Branches:
refs/heads/master 81b515549 -> f6bba0948
ZOOKEEPER-3083: Remove some redundant and noisy log lines
Author: Brian Nixon <ni...@fb.com>
Reviewers: Benjamin Reed <br...@apache.org>, Michael Han <ha...@apache.org>, Andor Molnar <an...@cloudera.com>, 毛蛤丝 <ma...@sina.com>
Closes #561 from enixon/ZOOKEEPER-3083
Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/f6bba094
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/f6bba094
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/f6bba094
Branch: refs/heads/master
Commit: f6bba09481dffc7db1d47be732d3cc8067603767
Parents: 81b5155
Author: Brian Nixon <ni...@fb.com>
Authored: Wed Jul 18 20:59:14 2018 -0700
Committer: Michael Han <ha...@apache.org>
Committed: Wed Jul 18 20:59:14 2018 -0700
----------------------------------------------------------------------
.../org/apache/zookeeper/jmx/MBeanRegistry.java | 4 +---
.../apache/zookeeper/server/NIOServerCnxn.java | 2 +-
.../zookeeper/server/NIOServerCnxnFactory.java | 2 +-
.../zookeeper/server/PrepRequestProcessor.java | 18 +++++++++--------
.../zookeeper/server/ZooKeeperServer.java | 21 +++++++++++++-------
5 files changed, 27 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/f6bba094/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java b/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java
index 79b34e9..817afc0 100644
--- a/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java
+++ b/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java
@@ -124,9 +124,7 @@ public class MBeanRegistry {
return;
if (!bean.isHidden()) {
final ObjectName objName = makeObjectName(path, bean);
- if (LOG.isInfoEnabled()) {
- LOG.info("Unregister MBean [{}]", objName);
- }
+ LOG.debug("Unregister MBean [{}]", objName);
synchronized (LOCK) {
mBeanServer.unregisterMBean(objName);
}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/f6bba094/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java b/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java
index 14476e8..5e300b9 100644
--- a/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java
+++ b/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java
@@ -624,7 +624,7 @@ public class NIOServerCnxn extends ServerCnxn {
return;
}
- LOG.info("Closed socket connection for client "
+ LOG.debug("Closed socket connection for client "
+ sock.socket().getRemoteSocketAddress()
+ (sessionId != 0 ?
" which had sessionid 0x" + Long.toHexString(sessionId) :
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/f6bba094/src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java b/src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java
index e343bc0..d1c4137 100644
--- a/src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java
+++ b/src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java
@@ -293,7 +293,7 @@ public class NIOServerCnxnFactory extends ServerCnxnFactory {
+ " - max is " + maxClientCnxns );
}
- LOG.info("Accepted socket connection from "
+ LOG.debug("Accepted socket connection from "
+ sc.socket().getRemoteSocketAddress());
sc.configureBlocking(false);
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/f6bba094/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java b/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java
index 6a07320..b70ad18 100644
--- a/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java
+++ b/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java
@@ -817,10 +817,11 @@ public class PrepRequestProcessor extends ZooKeeperCriticalThread implements
type = OpCode.error;
txn = new ErrorTxn(e.code().intValue());
- LOG.info("Got user-level KeeperException when processing "
- + request.toString() + " aborting remaining multi ops."
- + " Error Path:" + e.getPath()
- + " Error:" + e.getMessage());
+ if (e.code().intValue() > Code.APIERROR.intValue()) {
+ LOG.info("Got user-level KeeperException when processing {} aborting" +
+ " remaining multi ops. Error Path:{} Error:{}",
+ request.toString(), e.getPath(), e.getMessage());
+ }
request.setException(e);
@@ -878,10 +879,11 @@ public class PrepRequestProcessor extends ZooKeeperCriticalThread implements
request.getHdr().setType(OpCode.error);
request.setTxn(new ErrorTxn(e.code().intValue()));
}
- LOG.info("Got user-level KeeperException when processing "
- + request.toString()
- + " Error Path:" + e.getPath()
- + " Error:" + e.getMessage());
+
+ if (e.code().intValue() > Code.APIERROR.intValue()) {
+ LOG.info("Got user-level KeeperException when processing {} Error Path:{} Error:{}",
+ request.toString(), e.getPath(), e.getMessage());
+ }
request.setException(e);
} catch (Exception e) {
// log at error level as we are returning a marshalling
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/f6bba094/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java b/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
index ff5b3b6..b0e2d64 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
+++ b/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
@@ -754,7 +754,7 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
cnxn.sendBuffer(bb);
if (valid) {
- LOG.info("Established session 0x"
+ LOG.debug("Established session 0x"
+ Long.toHexString(cnxn.getSessionId())
+ " with negotiated timeout " + cnxn.getSessionTimeout()
+ " for client "
@@ -1047,14 +1047,21 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
cnxn.disableRecv();
long sessionId = connReq.getSessionId();
if (sessionId == 0) {
- LOG.info("Client attempting to establish new session at "
- + cnxn.getRemoteSocketAddress());
- createSession(cnxn, passwd, sessionTimeout);
+ long id = createSession(cnxn, passwd, sessionTimeout);
+ LOG.debug("Client attempting to establish new session:" +
+ " session = 0x{}, zxid = 0x{}, timeout = {}, address = {}",
+ Long.toHexString(id),
+ Long.toHexString(connReq.getLastZxidSeen()),
+ connReq.getTimeOut(),
+ cnxn.getRemoteSocketAddress());
} else {
long clientSessionId = connReq.getSessionId();
- LOG.info("Client attempting to renew session 0x"
- + Long.toHexString(clientSessionId)
- + " at " + cnxn.getRemoteSocketAddress());
+ LOG.debug("Client attempting to renew session:" +
+ " session = 0x{}, zxid = 0x{}, timeout = {}, address = {}",
+ Long.toHexString(clientSessionId),
+ Long.toHexString(connReq.getLastZxidSeen()),
+ connReq.getTimeOut(),
+ cnxn.getRemoteSocketAddress());
if (serverCnxnFactory != null) {
serverCnxnFactory.closeSession(sessionId);
}