This is an automated email from the ASF dual-hosted git repository.
xyuanlu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
The following commit(s) were added to refs/heads/master by this push:
new 1f5c5c82f Cleanup - Part 2 - isDebugEnabled() related (#2483)
1f5c5c82f is described below
commit 1f5c5c82fb5bc8273f3d6e04b4cc245e77ece2c8
Author: Komal Desai <[email protected]>
AuthorDate: Mon May 15 16:45:50 2023 -0700
Cleanup - Part 2 - isDebugEnabled() related (#2483)
Code cleanup
Co-authored-by: Komal Desai <[email protected]>
---
.../apache/helix/filestore/ExternalCommand.java | 4 +--
.../apache/helix/zookeeper/zkclient/ZkClient.java | 37 +++++++---------------
.../helix/zookeeper/zkclient/ZkEventThread.java | 8 ++---
3 files changed, 16 insertions(+), 33 deletions(-)
diff --git
a/recipes/rsync-replicated-file-system/src/main/java/org/apache/helix/filestore/ExternalCommand.java
b/recipes/rsync-replicated-file-system/src/main/java/org/apache/helix/filestore/ExternalCommand.java
index 874df9c8f..a79513ea8 100644
---
a/recipes/rsync-replicated-file-system/src/main/java/org/apache/helix/filestore/ExternalCommand.java
+++
b/recipes/rsync-replicated-file-system/src/main/java/org/apache/helix/filestore/ExternalCommand.java
@@ -343,9 +343,7 @@ public class ExternalCommand {
else
cmd.waitFor(timeout);
- if (LOG.isDebugEnabled())
- LOG.debug(cmd.getStringOutput());
-
+ LOG.debug(cmd.getStringOutput());
return cmd;
}
}
diff --git
a/zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/ZkClient.java
b/zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/ZkClient.java
index cf55d8889..da9a54303 100644
---
a/zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/ZkClient.java
+++
b/zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/ZkClient.java
@@ -301,10 +301,8 @@ public class ZkClient implements Watcher {
IZkDataListenerEntry listenerEntry = new IZkDataListenerEntry(listener,
prefetchEnabled);
listenerEntries.add(listenerEntry);
if (prefetchEnabled) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("zkclient {} subscribed data changes for {}, listener {},
prefetch data {}",
- _uid, path, listener, prefetchEnabled);
- }
+ LOG.debug("zkclient {} subscribed data changes for {}, listener {},
prefetch data {}",
+ _uid, path, listener, prefetchEnabled);
}
}
@@ -317,9 +315,7 @@ public class ZkClient implements Watcher {
return false;
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("zkclient {}, Subscribed data changes for {}", _uid, path);
- }
+ LOG.debug("zkclient {}, Subscribed data changes for {}", _uid, path);
return true;
}
@@ -1252,9 +1248,8 @@ public class ZkClient implements Watcher {
@Override
public void process(WatchedEvent event) {
long notificationTime = System.currentTimeMillis();
- if (LOG.isDebugEnabled()) {
- LOG.debug("zkclient {}, Received event: {} ", _uid, event);
- }
+ LOG.debug("zkclient {}, Received event: {} ", _uid, event);
+
_zookeeperEventThread = Thread.currentThread();
boolean stateChanged = event.getPath() == null;
@@ -1272,10 +1267,8 @@ public class ZkClient implements Watcher {
try {
// We might have to install child change event listener if a new node
was created
if (getShutdownTrigger()) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("zkclient {} ignoring event {}|{} since shutdown
triggered",
- _uid, event.getType(), event.getPath());
- }
+ LOG.debug("zkclient {} ignoring event {}|{} since shutdown triggered",
+ _uid, event.getType(), event.getPath());
return;
}
if (stateChanged) {
@@ -1309,9 +1302,7 @@ public class ZkClient implements Watcher {
// update state change counter.
recordStateChange(stateChanged, dataChanged, sessionExpired);
- if (LOG.isDebugEnabled()) {
- LOG.debug("zkclient {} Leaving process event", _uid);
- }
+ LOG.debug("zkclient {} Leaving process event", _uid);
}
}
@@ -1806,9 +1797,7 @@ public class ZkClient implements Watcher {
} else {
Object data = null;
if (listener.isPrefetchData()) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("zkclient {} Prefetch data for path: {}", _uid,
path);
- }
+ LOG.debug("zkclient {} Prefetch data for path: {}", _uid,
path);
try {
// TODO: the data is redundantly read multiple times when
multiple listeners exist
data = readData(path, null, true);
@@ -1867,9 +1856,7 @@ public class ZkClient implements Watcher {
public boolean waitUntilExists(String path, TimeUnit timeUnit, long time)
throws ZkInterruptedException {
Date timeout = new Date(System.currentTimeMillis() +
timeUnit.toMillis(time));
- if (LOG.isDebugEnabled()) {
- LOG.debug("Waiting until znode {} becomes available.", _uid, path);
- }
+ LOG.debug("Waiting until znode {} {} becomes available.", _uid, path);
if (exists(path)) {
return true;
}
@@ -2027,8 +2014,8 @@ public class ZkClient implements Watcher {
}
/**
- * ZkClient may have lost the connection to the ZK but can be in cleanup
- * stage. Let us make sure that we wait even if the connection appears to
+ * ZkClient may have lost the connection to the ZK but can be in cleanup
+ * stage. Let us make sure that we wait even if the connection appears to
* be connected.
*/
private void waitForRetry(long maxSleep) {
diff --git
a/zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/ZkEventThread.java
b/zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/ZkEventThread.java
index 56eda657c..a3a9b7a44 100644
---
a/zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/ZkEventThread.java
+++
b/zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/ZkEventThread.java
@@ -92,7 +92,7 @@ public class ZkEventThread extends Thread {
while (!isInterrupted()) {
ZkEvent zkEvent = _events.take();
int eventId = _eventId.incrementAndGet();
- LOG.debug("Delivering event # {} {}", eventId, zkEvent);
+ LOG.debug("Delivering event id:{} event: {}", eventId, zkEvent);
try {
zkEvent.run();
_totalEventCountHandled ++;
@@ -103,7 +103,7 @@ public class ZkEventThread extends Thread {
} catch (Throwable e) {
LOG.error("Error handling event " + zkEvent, e);
}
- LOG.debug("Delivering event # {} done", eventId);
+ LOG.debug("Delivering event id: {} done", eventId);
}
} catch (InterruptedException e) {
LOG.info("Terminate ZkClient event thread.");
@@ -114,9 +114,7 @@ public class ZkEventThread extends Thread {
public void send(ZkEvent event) {
if (!isInterrupted()) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("New event: " + event);
- }
+ LOG.debug("New event: " + event);
_events.add(event);
_totalEventCount ++;
}
