Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix estimating compaction memory without acquire read lock #11972

Merged
merged 2 commits into from
Jan 26, 2024
Merged

Fix estimating compaction memory without acquire read lock #11972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eac2286
fix estimating compaction memory without acquire read lock
shuwenwei Jan 25, 2024
8254d00
fix failure it
shuwenwei Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRepairDataIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.concurrent.TimeUnit;

import static org.apache.iotdb.db.utils.constant.TestConstant.TIMESTAMP_STR;
import static org.junit.Assert.assertNotNull;
Expand Down Expand Up @@ -81,6 +82,7 @@ public void testRepairData() {
if (sorted) {
return;
}
Thread.sleep(TimeUnit.SECONDS.toMillis(1));
}
Assert.fail();
} catch (Exception e) {
Expand Down
10 changes: 10 additions & 0 deletions ...b/storageengine/dataregion/compaction/selector/estimator/AbstractCompactionEstimator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.storageengine.dataregion.flush.CompressionRatio;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResourceStatus;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.timeindex.DeviceTimeIndex;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.timeindex.FileTimeIndex;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.timeindex.ITimeIndex;
Expand Down Expand Up @@ -63,6 +64,15 @@ public abstract class AbstractCompactionEstimator {

protected abstract long calculatingDataMemoryCost(CompactionTaskInfo taskInfo) throws IOException;

protected boolean isAllSourceFileExist(List<TsFileResource> resources) {
for (TsFileResource resource : resources) {
if (resource.getStatus() == TsFileResourceStatus.DELETED) {
return false;
}
}
return true;
}

protected CompactionTaskInfo calculatingCompactionTaskInfo(List<TsFileResource> resources)
throws IOException {
List<FileInfo> fileInfoList = new ArrayList<>();
Expand Down
3 changes: 3 additions & 0 deletions ...b/storageengine/dataregion/compaction/selector/estimator/AbstractCrossSpaceEstimator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ public long estimateCrossCompactionMemory(

long cost = 0;
try {
if (!isAllSourceFileExist(resources)) {
return -1L;
}
CompactionTaskInfo taskInfo = calculatingCompactionTaskInfo(resources);
cost += calculatingMetadataMemoryCost(taskInfo);
cost += calculatingDataMemoryCost(taskInfo);
Expand Down
19 changes: 16 additions & 3 deletions ...b/storageengine/dataregion/compaction/selector/estimator/AbstractInnerSpaceEstimator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,22 @@ public long estimateInnerCompactionMemory(List<TsFileResource> resources) throws
if (!config.isEnableCompactionMemControl()) {
return 0;
}
CompactionTaskInfo taskInfo = calculatingCompactionTaskInfo(resources);
long cost = calculatingMetadataMemoryCost(taskInfo);
cost += calculatingDataMemoryCost(taskInfo);

if (!CompactionEstimateUtils.addReadLock(resources)) {
return -1L;
}
long cost = 0;
try {
if (!isAllSourceFileExist(resources)) {
return -1L;
}

CompactionTaskInfo taskInfo = calculatingCompactionTaskInfo(resources);
cost = calculatingMetadataMemoryCost(taskInfo);
cost += calculatingDataMemoryCost(taskInfo);
} finally {
CompactionEstimateUtils.releaseReadLock(resources);
}
return cost;
}
}