helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject helix git commit: [HELIX-689] remove redundant logs from zkclient
Date Mon, 09 Apr 2018 19:39:18 GMT
Repository: helix
Updated Branches:
  refs/heads/master 3c7e73417 -> 4a76f03e6


[HELIX-689] remove redundant logs from zkclient


Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/4a76f03e
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/4a76f03e
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/4a76f03e

Branch: refs/heads/master
Commit: 4a76f03e6a153831cfde3e50fff67fab58c4fb46
Parents: 3c7e734
Author: Harry Zhang <zhan849@usc.edu>
Authored: Tue Apr 3 14:22:53 2018 -0700
Committer: Harry Zhang <zhan849@usc.edu>
Committed: Mon Apr 9 12:38:38 2018 -0700

----------------------------------------------------------------------
 .../apache/helix/controller/stages/MessageGenerationPhase.java   | 4 ----
 .../java/org/apache/helix/manager/zk/ZkBaseDataAccessor.java     | 2 ++
 .../java/org/apache/helix/manager/zk/zookeeper/ZkClient.java     | 4 +++-
 3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/helix/blob/4a76f03e/helix-core/src/main/java/org/apache/helix/controller/stages/MessageGenerationPhase.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/MessageGenerationPhase.java
b/helix-core/src/main/java/org/apache/helix/controller/stages/MessageGenerationPhase.java
index dd6ed6e..de466ac 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/MessageGenerationPhase.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/MessageGenerationPhase.java
@@ -259,10 +259,6 @@ public class MessageGenerationPhase extends AbstractBaseStage {
             for (Message msg : entry.getValue().values()) {
               if (accessor.removeProperty(msg.getKey(accessor.keyBuilder(), instanceName)))
{
                 logger.info("Deleted message {} from instance {}", msg.getMsgId(), instanceName);
-              } else {
-                logger.warn(
-                    "Failed to delete message {} from instance {}. Will retry next time if
the message is still there",
-                    msg.getMsgId(), instanceName);
               }
             }
           }

http://git-wip-us.apache.org/repos/asf/helix/blob/4a76f03e/helix-core/src/main/java/org/apache/helix/manager/zk/ZkBaseDataAccessor.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZkBaseDataAccessor.java
b/helix-core/src/main/java/org/apache/helix/manager/zk/ZkBaseDataAccessor.java
index 6ee64a4..7d0032e 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZkBaseDataAccessor.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZkBaseDataAccessor.java
@@ -538,6 +538,8 @@ public class ZkBaseDataAccessor<T> implements BaseDataAccessor<T>
{
       // optimize on common path
       return _zkClient.delete(path);
     } catch (ZkException e) {
+      LOG.warn(String.format("Caught exception when deleting %s with options %s.", path,
options),
+          e);
       return _zkClient.deleteRecursive(path);
     }
   }

http://git-wip-us.apache.org/repos/asf/helix/blob/4a76f03e/helix-core/src/main/java/org/apache/helix/manager/zk/zookeeper/ZkClient.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/zookeeper/ZkClient.java
b/helix-core/src/main/java/org/apache/helix/manager/zk/zookeeper/ZkClient.java
index af242da..edf1cd1 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/zookeeper/ZkClient.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/zookeeper/ZkClient.java
@@ -1130,7 +1130,9 @@ public class ZkClient implements Watcher {
         success = true;
       } catch (ZkNoNodeException e) {
         success = false;
-        LOG.warn("Failed to delete path " + path + ", znode does not exist!");
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("Failed to delete path " + path + ", znode does not exist!");
+        }
       }
       record(path, null, startT, ZkClientMonitor.AccessType.WRITE);
     } catch (Exception e) {


Mime
View raw message