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 385e0da add monitor module
385e0da is described below
commit 385e0daa2176df235e4a0808d067e6051c309710
Author: mdf369 <[email protected]>
AuthorDate: Mon Apr 22 16:21:38 2019 +0800
add monitor module
---
cluster/pom.xml | 6 ++
.../org/apache/iotdb/cluster/entity/Server.java | 3 +-
iotdb-cli/pom.xml | 2 +-
{cluster => monitor}/pom.xml | 73 +++++-----------------
.../iotdb/monitor}/service/ClusterMonitor.java | 2 +-
.../monitor}/service/ClusterMonitorMBean.java | 2 +-
pom.xml | 1 +
7 files changed, 26 insertions(+), 63 deletions(-)
diff --git a/cluster/pom.xml b/cluster/pom.xml
index b0bca81..907c32e 100644
--- a/cluster/pom.xml
+++ b/cluster/pom.xml
@@ -76,6 +76,12 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.iotdb</groupId>
+ <artifactId>iotdb-monitor</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/entity/Server.java
b/cluster/src/main/java/org/apache/iotdb/cluster/entity/Server.java
index b77d9c1..20617cc 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/entity/Server.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/entity/Server.java
@@ -39,15 +39,14 @@ import
org.apache.iotdb.cluster.rpc.raft.processor.QueryMetadataInStringAsyncPro
import org.apache.iotdb.cluster.rpc.raft.processor.QueryPathsAsyncProcessor;
import
org.apache.iotdb.cluster.rpc.raft.processor.QuerySeriesTypeAsyncProcessor;
import
org.apache.iotdb.cluster.rpc.raft.processor.QueryTimeSeriesAsyncProcessor;
-import org.apache.iotdb.cluster.service.ClusterMonitor;
import org.apache.iotdb.cluster.utils.RaftUtils;
import org.apache.iotdb.cluster.utils.hash.PhysicalNode;
import org.apache.iotdb.cluster.utils.hash.Router;
-import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.exception.StartupException;
import org.apache.iotdb.db.exception.ProcessorException;
import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.service.RegisterManager;
+import org.apache.iotdb.monitor.service.ClusterMonitor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/iotdb-cli/pom.xml b/iotdb-cli/pom.xml
index 8546eb9..b116f05 100644
--- a/iotdb-cli/pom.xml
+++ b/iotdb-cli/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
- <artifactId>IoTDB-cluster</artifactId>
+ <artifactId>iotdb-monitor</artifactId>
<version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/cluster/pom.xml b/monitor/pom.xml
similarity index 68%
copy from cluster/pom.xml
copy to monitor/pom.xml
index b0bca81..96cbf35 100644
--- a/cluster/pom.xml
+++ b/monitor/pom.xml
@@ -26,15 +26,13 @@
<version>0.8.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>IoTDB-cluster</artifactId>
- <name>IoTDB Cluster</name>
+ <artifactId>iotdb-monitor</artifactId>
+ <name>IoTDB Monitor</name>
<properties>
- <jraft.version>1.2.4</jraft.version>
- <antlr3.version>3.5.2</antlr3.version>
<common.lang3.version>3.8.1</common.lang3.version>
- <cluster.test.skip>false</cluster.test.skip>
- <cluster.it.skip>${cluster.test.skip}</cluster.it.skip>
- <cluster.ut.skip>${cluster.test.skip}</cluster.ut.skip>
+ <monitor.test.skip>false</monitor.test.skip>
+ <monitor.it.skip>${monitor.test.skip}</monitor.it.skip>
+ <monitor.ut.skip>${monitor.test.skip}</monitor.ut.skip>
</properties>
<dependencies>
<dependency>
@@ -44,37 +42,8 @@
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
- <artifactId>iotdb-jdbc</artifactId>
+ <artifactId>iotdb-cluster</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- jraft -->
- <dependency>
- <groupId>com.alipay.sofa</groupId>
- <artifactId>jraft-core</artifactId>
- <version>${jraft.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
<build>
@@ -108,18 +77,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.antlr</groupId>
- <artifactId>antlr3-maven-plugin</artifactId>
- <version>${antlr3.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>antlr</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -143,12 +100,12 @@
</configuration>
</plugin>
<!--using `mvn test` to run UT, `mvn verify` to run ITs
- Reference:
https://antoniogoncalves.org/2012/12/13/lets-turn-integration-tests-with-maven-to-a-first-class-citizen/-->
+ Reference:
https://antoniogoncalves.org/2012/12/13/lets-turn-integration-tests-with-maven-to-a-first-class-citizen/-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skipTests>${cluster.ut.skip}</skipTests>
+ <skipTests>${monitor.ut.skip}</skipTests>
</configuration>
</plugin>
<plugin>
@@ -165,15 +122,15 @@
</execution>
</executions>
<configuration>
- <skipTests>${cluster.test.skip}</skipTests>
- <skipITs>${cluster.it.skip}</skipITs>
+ <skipTests>${monitor.test.skip}</skipTests>
+ <skipITs>${monitor.it.skip}</skipITs>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>skipClusterTests</id>
+ <id>skipMonitorTests</id>
<activation>
<property>
<name>skipTests</name>
@@ -181,13 +138,13 @@
</property>
</activation>
<properties>
- <cluster.test.skip>true</cluster.test.skip>
- <cluster.ut.skip>true</cluster.ut.skip>
- <cluster.it.skip>true</cluster.it.skip>
+ <monitor.test.skip>true</monitor.test.skip>
+ <monitor.ut.skip>true</monitor.ut.skip>
+ <monitor.it.skip>true</monitor.it.skip>
</properties>
</profile>
<profile>
- <id>skipUT_Cluster_Tests</id>
+ <id>skipUT_Monitor_Tests</id>
<activation>
<property>
<name>skipUTs</name>
diff --git
a/cluster/src/main/java/org/apache/iotdb/cluster/service/ClusterMonitor.java
b/monitor/src/main/java/org/apache/iotdb/monitor/service/ClusterMonitor.java
similarity index 98%
rename from
cluster/src/main/java/org/apache/iotdb/cluster/service/ClusterMonitor.java
rename to
monitor/src/main/java/org/apache/iotdb/monitor/service/ClusterMonitor.java
index d3c2f01..ba9a267 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/service/ClusterMonitor.java
+++ b/monitor/src/main/java/org/apache/iotdb/monitor/service/ClusterMonitor.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.service;
+package org.apache.iotdb.monitor.service;
import com.alipay.sofa.jraft.entity.PeerId;
import java.util.HashMap;
diff --git
a/cluster/src/main/java/org/apache/iotdb/cluster/service/ClusterMonitorMBean.java
b/monitor/src/main/java/org/apache/iotdb/monitor/service/ClusterMonitorMBean.java
similarity index 97%
rename from
cluster/src/main/java/org/apache/iotdb/cluster/service/ClusterMonitorMBean.java
rename to
monitor/src/main/java/org/apache/iotdb/monitor/service/ClusterMonitorMBean.java
index 09bad03..6cfa051 100644
---
a/cluster/src/main/java/org/apache/iotdb/cluster/service/ClusterMonitorMBean.java
+++
b/monitor/src/main/java/org/apache/iotdb/monitor/service/ClusterMonitorMBean.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.service;
+package org.apache.iotdb.monitor.service;
import java.util.List;
import java.util.Map;
diff --git a/pom.xml b/pom.xml
index 7b1fbfa..41cb9e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,6 +136,7 @@
<module>iotdb-cli</module>
<module>example</module>
<module>cluster</module>
+ <module>monitor</module>
<!--<module>hadoop</module>-->
<!--<module>spark</module>-->
</modules>
