You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ea...@apache.org on 2019/05/07 09:39:57 UTC
[incubator-iotdb] branch cluster_nodetool updated: fix sonar issue
This is an automated email from the ASF dual-hosted git repository.
east pushed a commit to branch cluster_nodetool
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/cluster_nodetool by this push:
new d7ce930 fix sonar issue
d7ce930 is described below
commit d7ce9303ff3338dcc59acac7b4c5ca632528291b
Author: mdf369 <95...@qq.com>
AuthorDate: Tue May 7 17:39:33 2019 +0800
fix sonar issue
---
.../java/org/apache/iotdb/cluster/service/ClusterMonitor.java | 8 +++++---
.../org/apache/iotdb/cluster/service/ClusterMonitorMBean.java | 6 ------
.../java/org/apache/iotdb/cluster/service/nodetool/Host.java | 2 +-
.../org/apache/iotdb/cluster/service/nodetool/NodeTool.java | 11 ++++++-----
.../main/java/org/apache/iotdb/cluster/utils/RaftUtils.java | 10 +++++++---
5 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/service/ClusterMonitor.java b/cluster/src/main/java/org/apache/iotdb/cluster/service/ClusterMonitor.java
index f42a1f4..5e14e0b 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/service/ClusterMonitor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/service/ClusterMonitor.java
@@ -26,12 +26,14 @@ import org.apache.iotdb.db.exception.StartupException;
import org.apache.iotdb.db.service.IService;
import org.apache.iotdb.db.service.JMXService;
import org.apache.iotdb.db.service.ServiceType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class ClusterMonitor implements ClusterMonitorMBean, IService {
- private static final Logger LOGGER = LoggerFactory.getLogger(ClusterMonitor.class);
+ /**
+ * Original format = String.format("%s:%s=%s",
+ * IoTDBConstant.IOTDB_PACKAGE, IoTDBConstant.JMX_TYPE, getID().getJmxName()
+ */
+ public static final String MBEAN_NAME = "org.apache.iotdb.service:type=Cluster Monitor";
public static final ClusterMonitor INSTANCE = new ClusterMonitor();
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/service/ClusterMonitorMBean.java b/cluster/src/main/java/org/apache/iotdb/cluster/service/ClusterMonitorMBean.java
index 24d3ff2..a2fffb7 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/service/ClusterMonitorMBean.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/service/ClusterMonitorMBean.java
@@ -23,12 +23,6 @@ import java.util.Map;
public interface ClusterMonitorMBean {
/**
- * Original format = String.format("%s:%s=%s",
- * IoTDBConstant.IOTDB_PACKAGE, IoTDBConstant.JMX_TYPE, getID().getJmxName()
- */
- public static final String MBEAN_NAME = "org.apache.iotdb.service:type=Cluster Monitor";
-
- /**
* Get physical hash ring
*
* @return key: hash value, value: node ip
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/service/nodetool/Host.java b/cluster/src/main/java/org/apache/iotdb/cluster/service/nodetool/Host.java
index 80bf308..6a443ae 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/service/nodetool/Host.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/service/nodetool/Host.java
@@ -28,7 +28,7 @@ import org.apache.iotdb.cluster.service.ClusterMonitorMBean;
@Command(name = "host", description = "Print all data partitions information which specific host belongs to")
public class Host extends NodeToolCmd {
- private final int DEFAULT_PORT = -1;
+ private static final int DEFAULT_PORT = -1;
@Option(title = "ip", name = {"-i", "--ip"}, description = "Specify the host ip for accurate hosts information")
private String ip = "127.0.0.1";
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/service/nodetool/NodeTool.java b/cluster/src/main/java/org/apache/iotdb/cluster/service/nodetool/NodeTool.java
index 0d87478..64bb52b 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/service/nodetool/NodeTool.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/service/nodetool/NodeTool.java
@@ -42,6 +42,7 @@ import javax.management.ObjectName;
import javax.management.remote.JMXConnector;
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
+import org.apache.iotdb.cluster.service.ClusterMonitor;
import org.apache.iotdb.cluster.service.ClusterMonitorMBean;
public class NodeTool {
@@ -79,8 +80,8 @@ public class NodeTool {
ParseCommandUnrecognizedException e) {
badUse(e);
status = 1;
- } catch (Throwable throwable) {
- err(Throwables.getRootCause(throwable));
+ } catch (Exception e) {
+ err(Throwables.getRootCause(e));
status = 2;
}
@@ -98,7 +99,7 @@ public class NodeTool {
System.err.println(Throwables.getStackTraceAsString(e));
}
- public static abstract class NodeToolCmd implements Runnable {
+ public abstract static class NodeToolCmd implements Runnable {
@Option(type = OptionType.GLOBAL, name = {"-h",
"--host"}, description = "Node hostname or ip address")
@@ -108,13 +109,13 @@ public class NodeTool {
"--port"}, description = "Remote jmx agent port number")
private String port = "31999";
- private final String JMX_URL_FORMAT = "service:jmx:rmi:///jndi/rmi://%s:%s/jmxrmi";
+ private static final String JMX_URL_FORMAT = "service:jmx:rmi:///jndi/rmi://%s:%s/jmxrmi";
@Override
public void run() {
try {
MBeanServerConnection mbsc = connect();
- ObjectName name = new ObjectName(ClusterMonitorMBean.MBEAN_NAME);
+ ObjectName name = new ObjectName(ClusterMonitor.MBEAN_NAME);
ClusterMonitorMBean clusterMonitorProxy = JMX
.newMBeanProxy(mbsc, name, ClusterMonitorMBean.class);
execute(clusterMonitorProxy);
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/utils/RaftUtils.java b/cluster/src/main/java/org/apache/iotdb/cluster/utils/RaftUtils.java
index 189714f..83aa3c4 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/utils/RaftUtils.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/utils/RaftUtils.java
@@ -236,8 +236,10 @@ public class RaftUtils {
}
asyncContext.sendResponse(response);
});
- LOGGER.debug(
- String.format("Processor batch size() : %d", request.getPhysicalPlanBytes().size()));
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(
+ String.format("Processor batch size() : %d", request.getPhysicalPlanBytes().size()));
+ }
task.setDone(closure);
try {
task.setData(ByteBuffer
@@ -312,6 +314,7 @@ public class RaftUtils {
});
nullReadTask.await();
} catch (InterruptedException e) {
+ LOGGER.warn("Exception {} occurs while handling null read to metadata group.", e);
status.setCode(-1);
status.setErrorMsg(e.getMessage());
}
@@ -324,7 +327,7 @@ public class RaftUtils {
return status;
}
- public static ConcurrentHashMap<String, PeerId> getGroupLeaderCache() {
+ public static Map<String, PeerId> getGroupLeaderCache() {
return groupLeaderCache;
}
@@ -520,6 +523,7 @@ public class RaftUtils {
}
return value;
} catch (RaftConnectionException | InterruptedException e) {
+ LOGGER.error("Fail to get replica metric from remote node because of {}.", e);
return null;
}
}