This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch cluster- in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 0c13adf1f9e9af0c35686decc0d4a70c0fd506bb Author: xiangdong huang <[email protected]> AuthorDate: Thu Aug 12 10:44:11 2021 +0800 contine to fix tests --- cluster/src/main/java/org/apache/iotdb/cluster/ClusterIoTDB.java | 9 +++++---- .../java/org/apache/iotdb/cluster/coordinator/Coordinator.java | 1 + .../iotdb/cluster/log/manage/PartitionedSnapshotLogManager.java | 1 + .../org/apache/iotdb/cluster/server/member/DataGroupMember.java | 1 + .../org/apache/iotdb/cluster/server/member/MetaGroupMember.java | 1 + .../apache/iotdb/cluster/server/raft/AbstractRaftService.java | 1 + .../iotdb/cluster/server/service/DataGroupServiceImpls.java | 1 + .../apache/iotdb/cluster/server/service/MetaAsyncService.java | 1 + .../org/apache/iotdb/cluster/integration/BaseSingleNodeTest.java | 1 + .../org/apache/iotdb/cluster/integration/SingleNodeTest.java | 8 ++------ .../apache/iotdb/cluster/server/member/MetaGroupMemberTest.java | 1 + 11 files changed, 16 insertions(+), 10 deletions(-) diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/ClusterIoTDB.java b/cluster/src/main/java/org/apache/iotdb/cluster/ClusterIoTDB.java index 5913b80..0201c6c 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/ClusterIoTDB.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/ClusterIoTDB.java @@ -113,14 +113,12 @@ public class ClusterIoTDB implements ClusterIoTDBMBean { * a single thread pool, every "REPORT_INTERVAL_SEC" seconds, "reportThread" will print the status * of all raft members in this node */ - private ScheduledExecutorService reportThread = - IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor("NodeReportThread"); + private ScheduledExecutorService reportThread; private boolean allowReport = true; /** hardLinkCleaner will periodically clean expired hardlinks created during snapshots */ - private ScheduledExecutorService hardLinkCleanerThread = - IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor("HardLinkCleaner"); + private ScheduledExecutorService hardLinkCleanerThread; // currently, dataClientProvider is only used for those instances who do not belong to any // DataGroup.. @@ -159,11 +157,14 @@ public class ClusterIoTDB implements ClusterIoTDBMBean { } private void initTasks() { + reportThread = IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor("NodeReportThread"); reportThread.scheduleAtFixedRate( this::generateNodeReport, ClusterConstant.REPORT_INTERVAL_SEC, ClusterConstant.REPORT_INTERVAL_SEC, TimeUnit.SECONDS); + hardLinkCleanerThread = + IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor("HardLinkCleaner"); hardLinkCleanerThread.scheduleAtFixedRate( new HardLinkCleaner(), ClusterConstant.CLEAN_HARDLINK_INTERVAL_SEC, diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java b/cluster/src/main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java index 68518b1..c4ec857 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java @@ -63,6 +63,7 @@ import org.apache.iotdb.rpc.RpcUtils; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.service.rpc.thrift.EndPoint; import org.apache.iotdb.service.rpc.thrift.TSStatus; + import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/PartitionedSnapshotLogManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/PartitionedSnapshotLogManager.java index c2e3c1b..af39472 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/PartitionedSnapshotLogManager.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/PartitionedSnapshotLogManager.java @@ -33,6 +33,7 @@ import org.apache.iotdb.db.metadata.mnode.IMNode; import org.apache.iotdb.db.metadata.mnode.IStorageGroupMNode; import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.tsfile.write.schema.TimeseriesSchema; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java index 0b1abca..287f24a 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java @@ -95,6 +95,7 @@ import org.apache.iotdb.db.utils.TestOnly; import org.apache.iotdb.service.rpc.thrift.EndPoint; import org.apache.iotdb.service.rpc.thrift.TSStatus; import org.apache.iotdb.tsfile.utils.Pair; + import org.apache.thrift.protocol.TProtocolFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java index 429459d..3029a18 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java @@ -96,6 +96,7 @@ import org.apache.iotdb.db.utils.TimeValuePairUtils.Intervals; import org.apache.iotdb.service.rpc.thrift.EndPoint; import org.apache.iotdb.service.rpc.thrift.TSStatus; import org.apache.iotdb.tsfile.read.filter.basic.Filter; + import org.apache.thrift.TException; import org.apache.thrift.protocol.TProtocolFactory; import org.apache.thrift.transport.TTransportException; diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/AbstractRaftService.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/AbstractRaftService.java index 2a13550..643b05c 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/AbstractRaftService.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/AbstractRaftService.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.runtime.RPCServiceException; import org.apache.iotdb.db.service.thrift.ThriftService; import org.apache.iotdb.db.service.thrift.ThriftServiceThread; + import org.apache.thrift.TBaseAsyncProcessor; public abstract class AbstractRaftService extends ThriftService { diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/service/DataGroupServiceImpls.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/service/DataGroupServiceImpls.java index 5eec743..ac660dd 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/server/service/DataGroupServiceImpls.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/service/DataGroupServiceImpls.java @@ -65,6 +65,7 @@ import org.apache.iotdb.db.service.IService; import org.apache.iotdb.db.service.ServiceType; import org.apache.iotdb.db.utils.TestOnly; import org.apache.iotdb.service.rpc.thrift.TSStatus; + import org.apache.thrift.TException; import org.apache.thrift.async.AsyncMethodCallback; import org.apache.thrift.protocol.TProtocolFactory; diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/service/MetaAsyncService.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/service/MetaAsyncService.java index 8114425..ab3a6a2 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/server/service/MetaAsyncService.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/service/MetaAsyncService.java @@ -38,6 +38,7 @@ import org.apache.iotdb.cluster.server.NodeCharacter; import org.apache.iotdb.cluster.server.Response; import org.apache.iotdb.cluster.server.member.MetaGroupMember; import org.apache.iotdb.cluster.utils.ClusterUtils; + import org.apache.thrift.TException; import org.apache.thrift.async.AsyncMethodCallback; import org.slf4j.Logger; diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/integration/BaseSingleNodeTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/integration/BaseSingleNodeTest.java index cedaf7d..feb010c 100644 --- a/cluster/src/test/java/org/apache/iotdb/cluster/integration/BaseSingleNodeTest.java +++ b/cluster/src/test/java/org/apache/iotdb/cluster/integration/BaseSingleNodeTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.cluster.utils.Constants; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.session.Session; + import org.junit.After; import org.junit.Before; diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/integration/SingleNodeTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/integration/SingleNodeTest.java index 690dd48..f806a9d 100644 --- a/cluster/src/test/java/org/apache/iotdb/cluster/integration/SingleNodeTest.java +++ b/cluster/src/test/java/org/apache/iotdb/cluster/integration/SingleNodeTest.java @@ -24,7 +24,6 @@ import org.apache.iotdb.jdbc.Config; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.Session; - import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -36,10 +35,7 @@ import java.sql.Statement; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; public class SingleNodeTest extends BaseSingleNodeTest { @@ -55,10 +51,10 @@ public class SingleNodeTest extends BaseSingleNodeTest { @Override @After public void tearDown() throws Exception { - super.tearDown(); if (session != null) { session.close(); } + super.tearDown(); } @Test diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java index 73eb793..016a722 100644 --- a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java +++ b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java @@ -108,6 +108,7 @@ import org.apache.iotdb.tsfile.read.filter.TimeFilter; import org.apache.iotdb.tsfile.read.filter.ValueFilter; import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; import org.apache.iotdb.tsfile.write.schema.TimeseriesSchema; + import org.apache.thrift.async.AsyncMethodCallback; import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TCompactProtocol.Factory;
