You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/01/14 10:13:36 UTC
[iotdb] branch master updated: [IOTDB-2395] Thread Name Conflict (#4816)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new da91b60 [IOTDB-2395] Thread Name Conflict (#4816)
da91b60 is described below
commit da91b605fe11f7c5560430728812faecbea20f05
Author: Alan Choo <43...@users.noreply.github.com>
AuthorDate: Fri Jan 14 18:13:01 2022 +0800
[IOTDB-2395] Thread Name Conflict (#4816)
---
.../storagegroup/VirtualStorageGroupProcessor.java | 19 +++++++++++++++----
.../org/apache/iotdb/db/service/SettleService.java | 1 -
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/VirtualStorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/VirtualStorageGroupProcessor.java
index 9699cc7..9df8abf 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/VirtualStorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/VirtualStorageGroupProcessor.java
@@ -271,9 +271,7 @@ public class VirtualStorageGroupProcessor {
*/
private String insertWriteLockHolder = "";
- private ScheduledExecutorService timedCompactionScheduleTask =
- IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor(
- ThreadName.COMPACTION_SCHEDULE.getName());
+ private ScheduledExecutorService timedCompactionScheduleTask;
public static final long COMPACTION_TASK_SUBMIT_DELAY = 20L * 1000L;
@@ -426,7 +424,12 @@ public class VirtualStorageGroupProcessor {
// start trim task at last
ScheduledExecutorService executorService =
- IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor(ThreadName.WAL_TRIM.getName());
+ IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor(
+ ThreadName.WAL_TRIM.getName()
+ + "-"
+ + logicalStorageGroupName
+ + "-"
+ + virtualStorageGroupId);
executorService.scheduleWithFixedDelay(
this::trimTask,
config.getWalPoolTrimIntervalInMS(),
@@ -542,6 +545,14 @@ public class VirtualStorageGroupProcessor {
}
private void initCompaction() {
+ timedCompactionScheduleTask =
+ IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor(
+ ThreadName.COMPACTION_SCHEDULE.getName()
+ + "-"
+ + logicalStorageGroupName
+ + "-"
+ + virtualStorageGroupId);
+
CompactionTaskManager.getInstance()
.submitTask(
logicalStorageGroupName + "-" + virtualStorageGroupId,
diff --git a/server/src/main/java/org/apache/iotdb/db/service/SettleService.java b/server/src/main/java/org/apache/iotdb/db/service/SettleService.java
index 9f108da..cee74d1 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/SettleService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/SettleService.java
@@ -46,7 +46,6 @@ import java.util.concurrent.atomic.AtomicInteger;
public class SettleService implements IService {
private static final Logger logger = LoggerFactory.getLogger(SettleService.class);
- private AtomicInteger threadCnt = new AtomicInteger();
private ExecutorService settleThreadPool;
private boolean isRecoverFinish;