Skip to content

Compaction task can not stopped when abort compaction #14538

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 5 commits into from
Dec 25, 2024
Merged

Compaction task can not stopped when abort compaction #14538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
18aee54
Compaction task can not stopped when abort compaction
shuwenwei Dec 24, 2024
ab88328
add ut
shuwenwei Dec 25, 2024
cc44204
abort sub task
shuwenwei Dec 25, 2024
6fd0161
fix review
shuwenwei Dec 25, 2024
ed8cf4f
modify comment
shuwenwei Dec 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
15 changes: 15 additions & 0 deletions ...b/storageengine/dataregion/compaction/execute/performer/impl/FastCompactionPerformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,21 @@ private void compactNonAlignedSeries(
throw (StopReadTsFileByInterruptException) cause;
}
throw new IOException("[Compaction] SubCompactionTask meet errors ", e);
} catch (InterruptedException e) {
abortAllSubTasks(futures);
throw e;
}
}
}

private void abortAllSubTasks(List<Future<Void>> futures) {
for (Future<Void> future : futures) {
future.cancel(true);
}
for (Future<Void> future : futures) {
try {
future.get();
} catch (Exception ignored) {
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...g/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionTaskManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,8 @@ public synchronized Future<Void> submitSubTask(Callable<Void> subCompactionTask)

/**
* Abort all compactions of a database. The running compaction tasks will be returned as a list,
* the compaction threads for the database are not terminated util all the tasks in the list is
* finish. The outer caller can use function isAnyTaskInListStillRunning to determine this.
* the compaction threads for the database are interrupted immediately. The outer caller can use
* function isAnyTaskInListStillRunning to determine whether the tasks in list are finished.
*/
public synchronized List<AbstractCompactionTask> abortCompaction(String storageGroupName) {
List<AbstractCompactionTask> compactionTaskOfCurSG = new ArrayList<>();
Expand Down
7 changes: 6 additions & 1 deletion ...va/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,21 @@ public boolean processOneCompactionTask(AbstractCompactionTask task) {
return taskSuccess;
}

static class CompactionTaskFuture implements Future<CompactionTaskSummary> {
public static class CompactionTaskFuture implements Future<CompactionTaskSummary> {
CompactionTaskSummary summary;
Thread thread;

public CompactionTaskFuture(CompactionTaskSummary summary) {
this.thread = Thread.currentThread();
this.summary = summary;
}

@Override
public boolean cancel(boolean mayInterruptIfRunning) {
summary.cancel();
if (mayInterruptIfRunning) {
this.thread.interrupt();
}
return true;
}

Expand Down
33 changes: 33 additions & 0 deletions ...st/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionWorkerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@

import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task.AbstractCompactionTask;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task.CompactionTaskSummary;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task.CrossSpaceCompactionTask;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task.InnerSpaceCompactionTask;
import org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.CompactionTaskQueue;
import org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.CompactionWorker;
import org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.comparator.DefaultCompactionTaskComparatorImpl;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileManager;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
Expand All @@ -42,7 +44,11 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Phaser;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;

public class CompactionWorkerTest {
@Before
Expand Down Expand Up @@ -261,4 +267,31 @@ public void testFailedToCheckValidInInnerTask() throws InterruptedException {
thread.interrupt();
thread.join();
}

@Test
public void testAbortCompactionTask() {
AtomicReference<CompactionWorker.CompactionTaskFuture> compactionTaskSummary =
new AtomicReference<>();
AtomicBoolean isInterrupted = new AtomicBoolean(false);
CountDownLatch latch = new CountDownLatch(1);
Phaser phaser = new Phaser(2);
Thread t =
new Thread(
() -> {
compactionTaskSummary.set(
new CompactionWorker.CompactionTaskFuture(new CompactionTaskSummary()));
phaser.arriveAndAwaitAdvance();
try {
latch.await();
} catch (InterruptedException ignored) {
isInterrupted.set(true);
}
phaser.arriveAndAwaitAdvance();
});
t.start();
phaser.arriveAndAwaitAdvance();
compactionTaskSummary.get().cancel(true);
phaser.arriveAndAwaitAdvance();
Assert.assertTrue(isInterrupted.get());
}
}
Loading