You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2021/08/18 15:10:57 UTC
[iotdb] branch cluster- updated: fix jmx for threadpool step 1
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
The following commit(s) were added to refs/heads/cluster- by this push:
new e47afa9 fix jmx for threadpool step 1
e47afa9 is described below
commit e47afa9d7bb8865ae006651a2180682471299135
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Aug 18 23:09:56 2021 +0800
fix jmx for threadpool step 1
---
.../iotdb/cluster/client/sync/SyncClientPool.java | 1 +
.../iotdb/cluster/client/sync/SyncDataClient.java | 1 +
.../client/sync/SyncDataHeartbeatClient.java | 1 +
.../cluster/server/member/DataGroupMember.java | 8 +++
.../cluster/client/sync/SyncDataClientTest.java | 1 +
.../client/sync/SyncDataHeartbeatClientTest.java | 1 +
.../client/sync/SyncMetaHeartbeatClientTest.java | 1 +
.../apache/iotdb/cluster/log/LogParserTest.java | 1 +
.../cluster/log/applier/MetaLogApplierTest.java | 1 +
.../cluster/log/logtypes/SerializeLogTest.java | 1 +
.../cluster/log/snapshot/DataSnapshotTest.java | 4 +-
.../engine/storagegroup/StorageGroupProcessor.java | 3 +-
.../db/writelog/node/ExclusiveWriteLogNode.java | 3 ++
.../apache/iotdb/db/integration/IoTDBJMXTest.java | 62 ++++++++++++++++++++++
14 files changed, 87 insertions(+), 2 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/client/sync/SyncClientPool.java b/cluster/src/main/java/org/apache/iotdb/cluster/client/sync/SyncClientPool.java
index e0c55e8..661161e 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/client/sync/SyncClientPool.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/client/sync/SyncClientPool.java
@@ -26,6 +26,7 @@ import org.apache.iotdb.cluster.rpc.thrift.RaftService;
import org.apache.iotdb.cluster.server.monitor.NodeStatusManager;
import org.apache.iotdb.cluster.utils.ClusterNode;
import org.apache.iotdb.db.utils.TestOnly;
+
import org.apache.thrift.transport.TTransportException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/client/sync/SyncDataClient.java b/cluster/src/main/java/org/apache/iotdb/cluster/client/sync/SyncDataClient.java
index 2854670..aeb40cf 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/client/sync/SyncDataClient.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/client/sync/SyncDataClient.java
@@ -22,6 +22,7 @@ package org.apache.iotdb.cluster.client.sync;
import org.apache.iotdb.cluster.config.ClusterConstant;
import org.apache.iotdb.cluster.rpc.thrift.Node;
import org.apache.iotdb.db.utils.TestOnly;
+
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.protocol.TProtocolFactory;
import org.apache.thrift.transport.TTransportException;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/client/sync/SyncDataHeartbeatClient.java b/cluster/src/main/java/org/apache/iotdb/cluster/client/sync/SyncDataHeartbeatClient.java
index cea6eff..3a332ef 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/client/sync/SyncDataHeartbeatClient.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/client/sync/SyncDataHeartbeatClient.java
@@ -22,6 +22,7 @@ package org.apache.iotdb.cluster.client.sync;
import org.apache.iotdb.cluster.config.ClusterConstant;
import org.apache.iotdb.cluster.rpc.thrift.Node;
import org.apache.iotdb.cluster.utils.ClusterUtils;
+
import org.apache.thrift.protocol.TProtocolFactory;
import org.apache.thrift.transport.TTransportException;
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 aaf14ec..90d7459 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
@@ -170,6 +170,14 @@ public class DataGroupMember extends RaftMember implements DataGroupMemberMBean
@TestOnly
public DataGroupMember(PartitionGroup nodes) {
// constructor for test
+ this.name =
+ "Data-"
+ + nodes.getHeader().getNode().getInternalIp()
+ + "-"
+ + nodes.getHeader().getNode().getDataPort()
+ + "-raftId-"
+ + nodes.getId()
+ + "";
allNodes = nodes;
mbeanName =
String.format(
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/client/sync/SyncDataClientTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/client/sync/SyncDataClientTest.java
index feeb9ba..14566f9 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/client/sync/SyncDataClientTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/client/sync/SyncDataClientTest.java
@@ -8,6 +8,7 @@ import org.apache.iotdb.cluster.client.sync.SyncDataClient.Factory;
import org.apache.iotdb.cluster.rpc.thrift.Node;
import org.apache.iotdb.cluster.rpc.thrift.RaftService.Client;
import org.apache.iotdb.rpc.TSocketWrapper;
+
import org.apache.thrift.protocol.TBinaryProtocol;
import org.junit.Test;
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/client/sync/SyncDataHeartbeatClientTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/client/sync/SyncDataHeartbeatClientTest.java
index d81a424..8bccd22 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/client/sync/SyncDataHeartbeatClientTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/client/sync/SyncDataHeartbeatClientTest.java
@@ -20,6 +20,7 @@
package org.apache.iotdb.cluster.client.sync;
import org.apache.iotdb.cluster.rpc.thrift.Node;
+
import org.apache.thrift.protocol.TBinaryProtocol.Factory;
import org.apache.thrift.transport.TTransportException;
import org.junit.Assert;
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/client/sync/SyncMetaHeartbeatClientTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/client/sync/SyncMetaHeartbeatClientTest.java
index 45fb718..c01d6a9 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/client/sync/SyncMetaHeartbeatClientTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/client/sync/SyncMetaHeartbeatClientTest.java
@@ -20,6 +20,7 @@
package org.apache.iotdb.cluster.client.sync;
import org.apache.iotdb.cluster.rpc.thrift.Node;
+
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.transport.TTransportException;
import org.junit.Assert;
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/log/LogParserTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/log/LogParserTest.java
index 5abb81a..c7c2656 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/log/LogParserTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/log/LogParserTest.java
@@ -32,6 +32,7 @@ import org.apache.iotdb.db.metadata.PartialPath;
import org.apache.iotdb.db.qp.physical.PhysicalPlan;
import org.apache.iotdb.db.qp.physical.sys.LogPlan;
import org.apache.iotdb.db.qp.physical.sys.SetStorageGroupPlan;
+
import org.junit.Test;
import java.io.IOException;
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/MetaLogApplierTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/MetaLogApplierTest.java
index 93b1469..1115aaf 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/MetaLogApplierTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/MetaLogApplierTest.java
@@ -39,6 +39,7 @@ import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
+
import org.junit.After;
import org.junit.Test;
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/log/logtypes/SerializeLogTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/log/logtypes/SerializeLogTest.java
index 52da961..d5bfde1 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/log/logtypes/SerializeLogTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/log/logtypes/SerializeLogTest.java
@@ -34,6 +34,7 @@ import org.apache.iotdb.db.qp.physical.sys.SetStorageGroupPlan;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
+
import org.junit.Test;
import java.nio.ByteBuffer;
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/log/snapshot/DataSnapshotTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/log/snapshot/DataSnapshotTest.java
index 1c7ad73..8cbba73 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/log/snapshot/DataSnapshotTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/log/snapshot/DataSnapshotTest.java
@@ -39,6 +39,7 @@ import org.apache.iotdb.db.exception.metadata.MetadataException;
import org.apache.iotdb.db.metadata.PartialPath;
import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
+
import org.apache.thrift.TConfiguration;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
@@ -88,7 +89,8 @@ public abstract class DataSnapshotTest {
() -> {
if (addNetFailure && (failureCnt++) % failureFrequency == 0) {
// insert 1 failure in every 10 requests
- resultHandler.onError(new Exception("Faked network failure"));
+ resultHandler.onError(
+ new Exception("[Ignore me in Tests] Faked network failure"));
return;
}
try {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index d765199..c6b1d05 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -407,7 +407,8 @@ public class StorageGroupProcessor {
.getTsFileManagement(logicalStorageGroupName, storageGroupSysDir.getAbsolutePath());
ScheduledExecutorService executorService =
- IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor("WAL-Trim");
+ IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor(
+ String.format("WAL-trimTask-%s/%s", logicalStorageGroupName, virtualStorageGroupId));
executorService.scheduleWithFixedDelay(
this::trimTask,
config.getWalPoolTrimIntervalInMS(),
diff --git a/server/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java b/server/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java
index e59aada..dfd689e 100644
--- a/server/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java
@@ -69,6 +69,9 @@ public class ExclusiveWriteLogNode implements WriteLogNode, Comparable<Exclusive
private ReentrantLock lock = new ReentrantLock();
private static final ExecutorService FLUSH_BUFFER_THREAD_POOL =
IoTDBThreadPoolFactory.newCachedThreadPoolWithDaemon("Flush-WAL-Thread");
+ // TODO: FLUSH_BUFFER_THREAD_POOL =
+ // IoTDBThreadPoolFactory.newSingleThreadExecutor(
+ // "Flush-WAL-Thread-" + SystemFileFactory.INSTANCE.getFile(logDirectory).getName());
private long fileId = 0;
private long lastFlushedId = 0;
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBJMXTest.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBJMXTest.java
new file mode 100644
index 0000000..d9b239b
--- /dev/null
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBJMXTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.db.integration;
+
+import org.apache.iotdb.db.utils.EnvironmentUtils;
+import org.apache.iotdb.jdbc.Config;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+public class IoTDBJMXTest {
+
+ @BeforeClass
+ public static void setUp() throws Exception {
+ EnvironmentUtils.envSetUp();
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ EnvironmentUtils.cleanEnv();
+ }
+
+ @Test
+ public void testThreadPool() {
+ try (Connection connection =
+ DriverManager.getConnection(
+ Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
+ Statement statement = connection.createStatement(); ) {
+ // make sure two storage groups having no conflict when registering their JMX info (for their
+ // thread pools)
+ statement.execute("set storage group to root.sg1");
+ statement.execute("set storage group to root.sg2");
+ statement.execute("insert into root.sg1.d1 (time, s1) values (1, 1)");
+ statement.execute("insert into root.sg2.d1 (time, s1) values (1, 1)");
+ } catch (SQLException throwables) {
+ throwables.printStackTrace();
+ }
+ }
+}