This is an automated email from the ASF dual-hosted git repository.
nealsun 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 654636e54 Unnecessary log removal (#2208)
654636e54 is described below
commit 654636e54268907deb2e12d32913455cc543b436
Author: Marcosrico <[email protected]>
AuthorDate: Thu Sep 29 15:29:44 2022 -0400
Unnecessary log removal (#2208)
Remove unnecessary logs to clean up code in Helix.
---
.../helix/manager/zk/CallbackEventThreadPoolFactory.java | 4 ----
.../main/java/org/apache/helix/manager/zk/ZKHelixManager.java | 3 ---
.../java/org/apache/helix/manager/zk/ZkBaseDataAccessor.java | 3 ---
.../java/org/apache/helix/tools/commandtools/JmxDumper.java | 5 -----
.../java/org/apache/helix/tools/commandtools/TaskAdmin.java | 10 ++--------
.../org/apache/helix/rest/client/CustomRestClientImpl.java | 2 --
.../java/org/apache/helix/rest/server/HelixRestServer.java | 1 -
.../helix/rest/server/resources/helix/InstancesAccessor.java | 2 +-
.../helix/view/statemodel/DistViewAggregatorStateModel.java | 2 +-
.../java/org/apache/helix/zookeeper/zkclient/ZkClient.java | 2 +-
10 files changed, 5 insertions(+), 29 deletions(-)
diff --git
a/helix-core/src/main/java/org/apache/helix/manager/zk/CallbackEventThreadPoolFactory.java
b/helix-core/src/main/java/org/apache/helix/manager/zk/CallbackEventThreadPoolFactory.java
index 73cbf8599..1a79f88d1 100644
---
a/helix-core/src/main/java/org/apache/helix/manager/zk/CallbackEventThreadPoolFactory.java
+++
b/helix-core/src/main/java/org/apache/helix/manager/zk/CallbackEventThreadPoolFactory.java
@@ -82,10 +82,6 @@ public class CallbackEventThreadPoolFactory {
result.allowCoreThreadTimeOut(true);
_managerToCallBackThreadPoolMap.put(hash, result);
_callBackEventProcessorCountPerThreadPool.put(hash, new
AtomicInteger(1));
- } catch (Exception e) {
- logger.error(String
- .format("Error when creating new ThreadPoolExecutor for %s.",
hash), e);
- throw e;
} finally {
_lock.writeLock().unlock();
}
diff --git
a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
index 1ed87fe50..65303b389 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
@@ -781,9 +781,6 @@ public class ZKHelixManager implements HelixManager,
IZkStateListener {
*/
handleNewSession(ZKUtil.toHexSessionId(sessionId));
break;
- } catch (HelixException e) {
- LOG.error("fail to createClient.", e);
- throw e;
} catch (Exception e) {
retryCount++;
LOG.error("fail to createClient. retry " + retryCount, e);
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 0c7a94f1b..e95fe3463 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
@@ -393,9 +393,6 @@ public class ZkBaseDataAccessor<T> implements
BaseDataAccessor<T> {
result._retCode = RetCode.ERROR;
return result;
}
- } catch (ZkBadVersionException e) {
- LOG.debug("Exception while setting path: " + path, e);
- throw e;
} catch (Exception e) {
LOG.error("Exception while setting path: " + path, e);
result._retCode = RetCode.ERROR;
diff --git
a/helix-core/src/main/java/org/apache/helix/tools/commandtools/JmxDumper.java
b/helix-core/src/main/java/org/apache/helix/tools/commandtools/JmxDumper.java
index d7d59dd83..824c7b6d9 100644
---
a/helix-core/src/main/java/org/apache/helix/tools/commandtools/JmxDumper.java
+++
b/helix-core/src/main/java/org/apache/helix/tools/commandtools/JmxDumper.java
@@ -197,7 +197,6 @@ public class JmxDumper implements NotificationListener {
}
void init() throws Exception {
- try {
Set<ObjectInstance> existingInstances =
_mbeanServer.queryMBeans(new ObjectName(_namePattern), null);
_logger.info("Total " + existingInstances.size() + " mbeans matched " +
_namePattern);
@@ -210,10 +209,6 @@ public class JmxDumper implements NotificationListener {
FileWriter fos = new FileWriter(_outputFileName);
System.out.println(_outputFileName);
_outputFile = new PrintWriter(fos);
- } catch (Exception e) {
- _logger.error("fail to get all existing mbeans in " + _domain, e);
- throw e;
- }
}
@Override
diff --git
a/helix-core/src/main/java/org/apache/helix/tools/commandtools/TaskAdmin.java
b/helix-core/src/main/java/org/apache/helix/tools/commandtools/TaskAdmin.java
index f565e0f52..52a2524a1 100644
---
a/helix-core/src/main/java/org/apache/helix/tools/commandtools/TaskAdmin.java
+++
b/helix-core/src/main/java/org/apache/helix/tools/commandtools/TaskAdmin.java
@@ -92,9 +92,8 @@ public class TaskAdmin {
zkAddr);
helixMgr.connect();
TaskDriver driver = new TaskDriver(helixMgr);
- try {
- TaskDriver.DriverCommand cmd = TaskDriver.DriverCommand.valueOf(args[0]);
- switch (cmd) {
+ TaskDriver.DriverCommand cmd = TaskDriver.DriverCommand.valueOf(args[0]);
+ switch (cmd) {
case start:
if (cl.hasOption(WORKFLOW_FILE_OPTION)) {
driver.start(Workflow.parse(new
File(cl.getOptionValue(WORKFLOW_FILE_OPTION))));
@@ -123,11 +122,6 @@ public class TaskAdmin {
default:
throw new IllegalArgumentException("Unknown command " + args[0]);
}
- } catch (IllegalArgumentException e) {
- LOG.error("Unknown driver command " + args[0]);
- throw e;
- }
-
helixMgr.disconnect();
}
diff --git
a/helix-rest/src/main/java/org/apache/helix/rest/client/CustomRestClientImpl.java
b/helix-rest/src/main/java/org/apache/helix/rest/client/CustomRestClientImpl.java
index 6406f0b11..b358b6c75 100644
---
a/helix-rest/src/main/java/org/apache/helix/rest/client/CustomRestClientImpl.java
+++
b/helix-rest/src/main/java/org/apache/helix/rest/client/CustomRestClientImpl.java
@@ -143,8 +143,6 @@ class CustomRestClientImpl implements CustomRestClient {
return response;
} catch (IOException e) {
- LOG.error("Failed to perform customized health check. Is participant
endpoint {} available?",
- url, e);
// Release connection to be reused and avoid connection leakage.
postRequest.releaseConnection();
throw e;
diff --git
a/helix-rest/src/main/java/org/apache/helix/rest/server/HelixRestServer.java
b/helix-rest/src/main/java/org/apache/helix/rest/server/HelixRestServer.java
index f8e78ee75..66413f889 100644
--- a/helix-rest/src/main/java/org/apache/helix/rest/server/HelixRestServer.java
+++ b/helix-rest/src/main/java/org/apache/helix/rest/server/HelixRestServer.java
@@ -150,7 +150,6 @@ public class HelixRestServer {
}
}
} catch (Exception e) {
- LOG.error("Failed to initialize helix rest server. Tearing down.");
cleanupResourceConfigs();
throw e;
}
diff --git
a/helix-rest/src/main/java/org/apache/helix/rest/server/resources/helix/InstancesAccessor.java
b/helix-rest/src/main/java/org/apache/helix/rest/server/resources/helix/InstancesAccessor.java
index 076fe6de0..22e03145b 100644
---
a/helix-rest/src/main/java/org/apache/helix/rest/server/resources/helix/InstancesAccessor.java
+++
b/helix-rest/src/main/java/org/apache/helix/rest/server/resources/helix/InstancesAccessor.java
@@ -274,7 +274,7 @@ public class InstancesAccessor extends
AbstractHelixResource {
return JSONRepresentation(result);
} catch (HelixException e) {
_logger
- .error(String.format("Current cluster %s has issue with health
checks!", clusterId), e);
+ .error(String.format("Current cluster %s has issue with health
checks!", clusterId), e);
throw new HelixHealthException(e);
} catch (Exception e) {
_logger.error(String.format(
diff --git
a/helix-view-aggregator/src/main/java/org/apache/helix/view/statemodel/DistViewAggregatorStateModel.java
b/helix-view-aggregator/src/main/java/org/apache/helix/view/statemodel/DistViewAggregatorStateModel.java
index 7ac20b0da..e335e0537 100644
---
a/helix-view-aggregator/src/main/java/org/apache/helix/view/statemodel/DistViewAggregatorStateModel.java
+++
b/helix-view-aggregator/src/main/java/org/apache/helix/view/statemodel/DistViewAggregatorStateModel.java
@@ -58,7 +58,7 @@ public class DistViewAggregatorStateModel extends
AbstractHelixLeaderStandbyStat
_aggregator.start();
} catch (Exception e) {
logger.error("Aggregator failed to become leader from stand by for view
cluster {}",
- viewClusterName, e);
+ viewClusterName, e);
reset();
throw e;
}
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 a24a098dd..527e46f90 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
@@ -2066,7 +2066,7 @@ public class ZkClient implements Watcher {
success = true;
} catch (ZkNoNodeException e) {
success = false;
- LOG.debug("zkclient {}, Failed to delete path {}, znode does not
exist!", _uid, path);
+ LOG.debug("zkclient {}, Failed to delete path {}, znode does not
exist!", _uid, path, e);
}
record(path, null, startT, ZkClientMonitor.AccessType.WRITE);
} catch (Exception e) {
