You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by an...@apache.org on 2020/02/03 03:31:07 UTC
[zookeeper] branch branch-3.6 updated: ZOOKEEPER-3708: Move Logging
Code into Logging Guard in Learner
This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.6
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.6 by this push:
new fc43a29 ZOOKEEPER-3708: Move Logging Code into Logging Guard in Learner
fc43a29 is described below
commit fc43a29e8737c50201aa34157c4f93c31b224c39
Author: David Mollitor <dm...@apache.org>
AuthorDate: Mon Feb 3 04:30:41 2020 +0100
ZOOKEEPER-3708: Move Logging Code into Logging Guard in Learner
Author: David Mollitor <dm...@apache.org>
Reviewers: eolivelli@apache.org, andor@apache.org
Closes #1240 from belugabehr/ZOOKEEPER-3708
(cherry picked from commit 68e1f7d4c54429caa74441c7444ef1fe0f75867c)
Signed-off-by: Andor Molnar <an...@apache.org>
---
.../src/main/java/org/apache/zookeeper/server/quorum/Learner.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java
index 2fd2db4..1ee9e07 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java
@@ -182,11 +182,11 @@ public class Learner {
leaderIs.readRecord(pp, "packet");
messageTracker.trackReceived(pp.getType());
}
- long traceMask = ZooTrace.SERVER_PACKET_TRACE_MASK;
- if (pp.getType() == Leader.PING) {
- traceMask = ZooTrace.SERVER_PING_TRACE_MASK;
- }
if (LOG.isTraceEnabled()) {
+ final long traceMask =
+ (pp.getType() == Leader.PING) ? ZooTrace.SERVER_PING_TRACE_MASK
+ : ZooTrace.SERVER_PACKET_TRACE_MASK;
+
ZooTrace.logQuorumPacket(LOG, traceMask, 'i', pp);
}
}