Skip to content

Fix compaction mods metrics update #17636

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

Merged
jt2594838 merged 1 commit into from
May 12, 2026
Merged

Fix compaction mods metrics update #17636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 14 additions & 8 deletions ...main/java/org/apache/iotdb/db/storageengine/dataregion/modification/ModificationFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import java.io.OutputStream;
import java.nio.channels.FileChannel;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
Expand Down Expand Up @@ -334,10 +335,11 @@ public boolean exists() {
public void remove() throws IOException {
lock.writeLock().lock();
try {
long sizeBeforeRemove = fileExists ? getFileLength() : 0;
close();
FileUtils.deleteFileOrDirectory(file);
if (fileExists) {
updateModFileMetric(-1, -getFileLength());
updateModFileMetric(-1, -sizeBeforeRemove);
}
fileExists = false;
removed = true;
Expand Down Expand Up @@ -394,12 +396,12 @@ public String toString() {
public void compact() throws IOException {
long originFileSize = getFileLength();
if (originFileSize > COMPACT_THRESHOLD && !hasCompacted) {
File compactedFile = new File(getFile().getPath() + COMPACT_SUFFIX);
try {
Map<PartialPath, List<ModEntry>> pathModificationMap =
getAllMods().stream().collect(Collectors.groupingBy(ModEntry::keyOfPatternTree));
String newModsFileName = getFile().getPath() + COMPACT_SUFFIX;
try (ModificationFile compactedModificationFile =
new ModificationFile(newModsFileName, false)) {
new ModificationFile(compactedFile, false)) {
Set<Entry<PartialPath, List<ModEntry>>> modificationsEntrySet =
pathModificationMap.entrySet();
for (Map.Entry<PartialPath, List<ModEntry>> modificationEntry : modificationsEntrySet) {
Expand All @@ -408,12 +410,15 @@ public void compact() throws IOException {
}
} catch (IOException e) {
LOGGER.error("compact mods file exception of {}", file, e);
throw e;
}
// remove origin mods file
this.remove();
fileExists = true;
// rename new mods file to origin name
Files.move(new File(newModsFileName).toPath(), file.toPath());
long compactedFileSize = compactedFile.length();
close();
Files.move(compactedFile.toPath(), file.toPath(), StandardCopyOption.REPLACE_EXISTING);
if (updateMetrics) {
FileMetrics.getInstance().increaseModFileSize(compactedFileSize - originFileSize);
}
fileExists = compactedFileSize > 0;
LOGGER.info("{} settle successful", file);

if (getFileLength() > COMPACT_THRESHOLD) {
Expand All @@ -424,6 +429,7 @@ public void compact() throws IOException {
}
} catch (IOException e) {
LOGGER.error("remove origin file or rename new mods file error.", e);
throw e;
}
hasCompacted = true;
}
Expand Down
36 changes: 36 additions & 0 deletions ...va/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@
package org.apache.iotdb.db.storageengine.dataregion.compaction.utils;

import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.service.metrics.FileMetrics;
import org.apache.iotdb.db.storageengine.dataregion.compaction.AbstractCompactionTest;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.utils.CompactionPathUtils;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.utils.CompactionUtils;
import org.apache.iotdb.db.storageengine.dataregion.modification.ModificationFile;
import org.apache.iotdb.db.storageengine.dataregion.modification.TreeDeletionEntry;

import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.file.metadata.IDeviceID;
Expand All @@ -32,6 +37,7 @@
import org.junit.Test;

import java.io.IOException;
import java.util.ArrayList;

public class CompactionUtilsTest extends AbstractCompactionTest {
@Override
Expand All @@ -54,4 +60,34 @@ public void testCompactionPathUtils() {
Assert.fail();
}
}

@Test
public void testDeleteSourceTsFileUpdatesModMetrics() throws Exception {
int modFileNumBefore = FileMetrics.getInstance().getModFileNum();
long modFileSizeBefore = FileMetrics.getInstance().getModFileSize();

createFiles(2, 1, 1, 10, 0, 0, 10, 10, false, true);

long totalModFileSize = 0;
for (int i = 0; i < seqResources.size(); i++) {
try (ModificationFile modificationFile = seqResources.get(i).getModFileForWrite()) {
modificationFile.write(
new TreeDeletionEntry(
new MeasurementPath(new String[] {COMPACTION_TEST_SG, "d0", "s0"}),
Long.MIN_VALUE,
i + 10));
totalModFileSize += modificationFile.getFileLength();
}
}

Assert.assertEquals(
modFileNumBefore + seqResources.size(), FileMetrics.getInstance().getModFileNum());
Assert.assertEquals(
modFileSizeBefore + totalModFileSize, FileMetrics.getInstance().getModFileSize());

CompactionUtils.deleteSourceTsFileAndUpdateFileMetrics(new ArrayList<>(seqResources), true);

Assert.assertEquals(modFileNumBefore, FileMetrics.getInstance().getModFileNum());
Assert.assertEquals(modFileSizeBefore, FileMetrics.getInstance().getModFileSize());
}
}
62 changes: 62 additions & 0 deletions .../java/org/apache/iotdb/db/storageengine/dataregion/modification/ModificationFileTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.db.service.metrics.FileMetrics;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.recover.CompactionRecoverManager;
import org.apache.iotdb.db.storageengine.dataregion.modification.IDPredicate.FullExactMatch;
import org.apache.iotdb.db.storageengine.dataregion.modification.IDPredicate.NOP;
Expand Down Expand Up @@ -50,6 +51,67 @@

public class ModificationFileTest {

@Test
public void testRemoveUpdatesMetrics() throws IOException {
String tempFileName = TestConstant.BASE_OUTPUT_PATH.concat("mod.remove.metrics.temp");
int modFileNumBefore = FileMetrics.getInstance().getModFileNum();
long modFileSizeBefore = FileMetrics.getInstance().getModFileSize();
try (ModificationFile modificationFile = new ModificationFile(tempFileName, true)) {
modificationFile.write(
new TreeDeletionEntry(
new MeasurementPath(new String[] {"root", "sg", "d1", "s1"}), 1, 10));
long fileLength = modificationFile.getFileLength();
assertEquals(modFileNumBefore + 1, FileMetrics.getInstance().getModFileNum());
assertEquals(modFileSizeBefore + fileLength, FileMetrics.getInstance().getModFileSize());

modificationFile.remove();
assertEquals(modFileNumBefore, FileMetrics.getInstance().getModFileNum());
assertEquals(modFileSizeBefore, FileMetrics.getInstance().getModFileSize());
} finally {
Files.deleteIfExists(new File(tempFileName).toPath());
}
}

@Test
public void testCompactUpdatesMetricsAndAllowFurtherWrite() throws IOException {
String tempFileName = TestConstant.BASE_OUTPUT_PATH.concat("mod.compact.metrics.temp");
int modFileNumBefore = FileMetrics.getInstance().getModFileNum();
long modFileSizeBefore = FileMetrics.getInstance().getModFileSize();
long time = 1000;
try (ModificationFile modificationFile = new ModificationFile(tempFileName, true)) {
while (modificationFile.getFileLength() < 1024 * 1024) {
modificationFile.write(
new TreeDeletionEntry(
new MeasurementPath(new String[] {"root", "sg", "d1", "s1"}),
Long.MIN_VALUE,
time += 5000));
}

assertEquals(modFileNumBefore + 1, FileMetrics.getInstance().getModFileNum());
modificationFile.compact();
assertEquals(modFileNumBefore + 1, FileMetrics.getInstance().getModFileNum());
assertEquals(
modFileSizeBefore + modificationFile.getFileLength(),
FileMetrics.getInstance().getModFileSize());

modificationFile.write(
new TreeDeletionEntry(
new MeasurementPath(new String[] {"root", "sg", "d1", "s2"}),
Long.MIN_VALUE,
time + 5000));
assertEquals(modFileNumBefore + 1, FileMetrics.getInstance().getModFileNum());
assertEquals(
modFileSizeBefore + modificationFile.getFileLength(),
FileMetrics.getInstance().getModFileSize());

modificationFile.remove();
assertEquals(modFileNumBefore, FileMetrics.getInstance().getModFileNum());
assertEquals(modFileSizeBefore, FileMetrics.getInstance().getModFileSize());
} finally {
Files.deleteIfExists(new File(tempFileName).toPath());
}
}

@Test
public void readMyWrite() {
String tempFileName = TestConstant.BASE_OUTPUT_PATH.concat("mod.temp");
Expand Down
Loading