This is an automated email from the ASF dual-hosted git repository.
maoling pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 9aeaae5 ZOOKEEPER-3942: move traceMask calculation logic into the
trace log guard
9aeaae5 is described below
commit 9aeaae5bb422c5a4262de84cf8704b02883e5006
Author: coder-chenzhi <[email protected]>
AuthorDate: Sun Jan 24 01:41:25 2021 +0800
ZOOKEEPER-3942: move traceMask calculation logic into the trace log guard
Similar to ZOOKEEPER-3708 and ZOOKEEPER-3728 in `Learner`, I found four
cases where `traceMask` calculation logic are out of trace log guard in
`LearnerHandler`, `PrepRequestProcessor`, and `ReadOnlyRequestProcessor`. The
`traceMask` only matters if trace is enabled, so move the associated code into
the logging guard.
Author: coder-chenzhi <[email protected]>
Reviewers: maoling <[email protected]>
Closes #1464 from coder-chenzhi/master
---
.../apache/zookeeper/server/PrepRequestProcessor.java | 8 ++++----
.../apache/zookeeper/server/quorum/LearnerHandler.java | 17 +++++++++--------
.../server/quorum/ReadOnlyRequestProcessor.java | 8 ++++----
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/PrepRequestProcessor.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/PrepRequestProcessor.java
index 3e6d479..55b070a 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/PrepRequestProcessor.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/PrepRequestProcessor.java
@@ -141,11 +141,11 @@ public class PrepRequestProcessor extends
ZooKeeperCriticalThread implements Req
Request request = submittedRequests.take();
ServerMetrics.getMetrics().PREP_PROCESSOR_QUEUE_TIME
.add(Time.currentElapsedTime() -
request.prepQueueStartTime);
- long traceMask = ZooTrace.CLIENT_REQUEST_TRACE_MASK;
- if (request.type == OpCode.ping) {
- traceMask = ZooTrace.CLIENT_PING_TRACE_MASK;
- }
if (LOG.isTraceEnabled()) {
+ long traceMask = ZooTrace.CLIENT_REQUEST_TRACE_MASK;
+ if (request.type == OpCode.ping) {
+ traceMask = ZooTrace.CLIENT_PING_TRACE_MASK;
+ }
ZooTrace.logRequest(LOG, traceMask, 'P', request, "");
}
if (Request.requestOfDeath == request) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerHandler.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerHandler.java
index f71a4bf..f7f12dc 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerHandler.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerHandler.java
@@ -323,7 +323,6 @@ public class LearnerHandler extends ZooKeeperThread {
* @throws InterruptedException
*/
private void sendPackets() throws InterruptedException {
- long traceMask = ZooTrace.SERVER_PACKET_TRACE_MASK;
while (true) {
try {
QuorumPacket p;
@@ -347,13 +346,15 @@ public class LearnerHandler extends ZooKeeperThread {
// Packet of death!
break;
}
- if (p.getType() == Leader.PING) {
- traceMask = ZooTrace.SERVER_PING_TRACE_MASK;
- }
+
if (p.getType() == Leader.PROPOSAL) {
syncLimitCheck.updateProposal(p.getZxid(),
System.nanoTime());
}
if (LOG.isTraceEnabled()) {
+ long traceMask = ZooTrace.SERVER_PACKET_TRACE_MASK;
+ if (p.getType() == Leader.PING) {
+ traceMask = ZooTrace.SERVER_PING_TRACE_MASK;
+ }
ZooTrace.logQuorumPacket(LOG, traceMask, 'o', p);
}
@@ -652,11 +653,11 @@ public class LearnerHandler extends ZooKeeperThread {
ia.readRecord(qp, "packet");
messageTracker.trackReceived(qp.getType());
- long traceMask = ZooTrace.SERVER_PACKET_TRACE_MASK;
- if (qp.getType() == Leader.PING) {
- traceMask = ZooTrace.SERVER_PING_TRACE_MASK;
- }
if (LOG.isTraceEnabled()) {
+ long traceMask = ZooTrace.SERVER_PACKET_TRACE_MASK;
+ if (qp.getType() == Leader.PING) {
+ traceMask = ZooTrace.SERVER_PING_TRACE_MASK;
+ }
ZooTrace.logQuorumPacket(LOG, traceMask, 'i', qp);
}
tickOfNextAckDeadline =
learnerMaster.getTickOfNextAckDeadline();
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ReadOnlyRequestProcessor.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ReadOnlyRequestProcessor.java
index 3aec97f..e9728e9 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ReadOnlyRequestProcessor.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ReadOnlyRequestProcessor.java
@@ -61,11 +61,11 @@ public class ReadOnlyRequestProcessor extends
ZooKeeperCriticalThread implements
Request request = queuedRequests.take();
// log request
- long traceMask = ZooTrace.CLIENT_REQUEST_TRACE_MASK;
- if (request.type == OpCode.ping) {
- traceMask = ZooTrace.CLIENT_PING_TRACE_MASK;
- }
if (LOG.isTraceEnabled()) {
+ long traceMask = ZooTrace.CLIENT_REQUEST_TRACE_MASK;
+ if (request.type == OpCode.ping) {
+ traceMask = ZooTrace.CLIENT_PING_TRACE_MASK;
+ }
ZooTrace.logRequest(LOG, traceMask, 'R', request, "");
}
if (Request.requestOfDeath == request) {
