This is an automated email from the ASF dual-hosted git repository.
xingtanzjr 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 20cb7295f4c Modify compaction schedule for insertion compaction
(#11582)
20cb7295f4c is described below
commit 20cb7295f4cf467f66ea9d47767033ae186a4292
Author: shuwenwei <[email protected]>
AuthorDate: Tue Nov 21 10:05:55 2023 +0800
Modify compaction schedule for insertion compaction (#11582)
---
.../db/storageengine/dataregion/DataRegion.java | 24 ++++++++++++++--------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
index b2a1b3511c0..615b86ef3a5 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
@@ -2147,19 +2147,25 @@ public class DataRegion implements IDataRegionForQuery {
trySubmitCount += executeInsertionCompaction(timePartitions);
summary.incrementSubmitTaskNum(CompactionTaskType.INSERTION,
trySubmitCount);
}
- // the name of this variable is trySubmitCount, because the task submitted
to the queue could be
- // evicted due to the low priority of the task
- try {
- for (long timePartition : timePartitions) {
- trySubmitCount +=
- CompactionScheduler.scheduleCompaction(tsFileManager,
timePartition, summary);
+ if (summary.getSubmitInsertionCrossSpaceCompactionTaskNum() == 0) {
+ // the name of this variable is trySubmitCount, because the task
submitted to the queue could
+ // be
+ // evicted due to the low priority of the task
+ try {
+ for (long timePartition : timePartitions) {
+ trySubmitCount +=
+ CompactionScheduler.scheduleCompaction(tsFileManager,
timePartition, summary);
+ }
+ } catch (Throwable e) {
+ logger.error("Meet error in compaction schedule.", e);
}
- } catch (Throwable e) {
- logger.error("Meet error in compaction schedule.", e);
}
if (summary.hasSubmitTask()) {
logger.info(
- "[CompactionScheduler][{}] selected sequence
InnerSpaceCompactionTask num is {}, selected unsequence
InnerSpaceCompactionTask num is {}, selected CrossSpaceCompactionTask num is
{}, selected InsertionCrossSpaceCompactionTask num is {}",
+ "[CompactionScheduler][{}] selected sequence
InnerSpaceCompactionTask num is {},"
+ + " selected unsequence InnerSpaceCompactionTask num is {},"
+ + " selected CrossSpaceCompactionTask num is {},"
+ + " selected InsertionCrossSpaceCompactionTask num is {}",
dataRegionId,
summary.getSubmitSeqInnerSpaceCompactionTaskNum(),
summary.getSubmitUnseqInnerSpaceCompactionTaskNum(),
