Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,26 @@ public List<DeletionResource> getAllDeletionResources() {
}
}

public void removeDAL() {
/** Close an existing manager and remove its DAL without creating a manager for cleanup. */
public static void closeAndRemoveDAL(int groupId) {
if (DeletionResourceManagerHolder.CONSENSUS_GROUP_ID_2_INSTANCE_MAP == null) {
return;
}
final DeletionResourceManager manager =
DeletionResourceManagerHolder.CONSENSUS_GROUP_ID_2_INSTANCE_MAP.get(groupId);
if (manager != null) {
manager.close();
removeDAL(groupId, manager.storageDir);
} else {
removeDAL(
groupId,
new File(
IoTDBDescriptor.getInstance().getConfig().getIotConsensusV2DeletionFileDir(),
Integer.toString(groupId)));
}
}

private static void removeDAL(int dataRegionId, File storageDir) {
if (storageDir.exists()) {
FileUtils.deleteFileOrDirectory(storageDir);
LOGGER.info(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,11 @@ private void persistDeletion() throws IOException {
maxProgressIndexInCurrentFile.updateToMinimumEqualOrIsAfterProgressIndex(
firstDeletionResource.getProgressIndex());
} catch (InterruptedException e) {
LOGGER.warn(DataNodePipeMessages.INTERRUPTED_WHEN_WAITING_FOR_TAKING_DELETIONRESOURCE_FROM);
// shutdownNow interrupts the idle queue wait during normal close.
if (!isClosed) {
LOGGER.warn(
DataNodePipeMessages.INTERRUPTED_WHEN_WAITING_FOR_TAKING_DELETIONRESOURCE_FROM);
}
Thread.currentThread().interrupt();
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2456,12 +2456,7 @@ public void shutdownUpgradeModFileThreadPool() {
}

public void deleteDALFolderAndClose() {
Optional.ofNullable(DeletionResourceManager.getInstance(dataRegionId.getId()))
.ifPresent(
manager -> {
manager.close();
manager.removeDAL();
});
DeletionResourceManager.closeAndRemoveDAL(dataRegionId.getId());
}

/** close all tsfile resource */
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.apache.iotdb.db.pipe.consensus.deletion;

import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.pipe.consensus.deletion.persist.PageCacheDeletionBuffer;

import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.nio.file.Files;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;

public class DeletionResourceManagerCleanupTest {
private static final int REGION_ID = 91821;
@Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder();
private String previousDirectory;
private int previousBufferSize;
private Logger bufferLogger;
private Appender<ILoggingEvent> appender;

@Before
@SuppressWarnings("unchecked")
public void setUp() throws Exception {
previousDirectory =
IoTDBDescriptor.getInstance().getConfig().getIotConsensusV2DeletionFileDir();
previousBufferSize = PageCacheDeletionBuffer.DAL_BUFFER_SIZE;
IoTDBDescriptor.getInstance()
.getConfig()
.setIotConsensusV2DeletionFileDir(temporaryFolder.getRoot().getAbsolutePath());
PageCacheDeletionBuffer.setDalBufferSize(1024);
DeletionResourceManager.buildForTest();
bufferLogger = (Logger) LoggerFactory.getLogger(PageCacheDeletionBuffer.class);
appender = mock(Appender.class);
bufferLogger.addAppender(appender);
}

@After
public void tearDown() {
try {
DeletionResourceManager.closeAndRemoveDAL(REGION_ID);
} finally {
bufferLogger.detachAppender(appender);
IoTDBDescriptor.getInstance().getConfig().setIotConsensusV2DeletionFileDir(previousDirectory);
PageCacheDeletionBuffer.setDalBufferSize(previousBufferSize);
}
}

@Test
public void testCleanupWithoutManagerDoesNotStartBuffer() {
DeletionResourceManager.closeAndRemoveDAL(REGION_ID);

Assert.assertFalse(regionDirectory().exists());
verify(appender, never()).doAppend(any(ILoggingEvent.class));
}

@Test
public void testCleanupRemovesOrphanedDALWithoutStartingBuffer() throws Exception {
final File directory = regionDirectory();
Assert.assertTrue(directory.mkdir());
Files.write(new File(directory, "_0-0.deletion").toPath(), new byte[] {1, 2, 3});

DeletionResourceManager.closeAndRemoveDAL(REGION_ID);

Assert.assertFalse(directory.exists());
verify(appender, never()).doAppend(any(ILoggingEvent.class));
}

@Test
public void testCleanupClosesExistingManagerAndAllowsRecreation() {
final DeletionResourceManager manager = DeletionResourceManager.getInstance(REGION_ID);
Assert.assertTrue(regionDirectory().exists());

DeletionResourceManager.closeAndRemoveDAL(REGION_ID);

Assert.assertFalse(regionDirectory().exists());
Assert.assertNotSame(manager, DeletionResourceManager.getInstance(REGION_ID));
Assert.assertTrue(regionDirectory().exists());
}

private File regionDirectory() {
return new File(temporaryFolder.getRoot(), Integer.toString(REGION_ID));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,16 @@
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.i18n.DataNodePipeMessages;
import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource;
import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResourceManager;
import org.apache.iotdb.db.pipe.consensus.deletion.recover.DeletionReader;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode;

import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import org.awaitility.Awaitility;
import org.junit.After;
import org.junit.Assert;
Expand All @@ -37,6 +42,7 @@
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.mockito.InOrder;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.io.IOException;
Expand All @@ -45,11 +51,16 @@
import java.nio.channels.FileChannel;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;

import static org.mockito.AdditionalAnswers.delegatesTo;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doThrow;
Expand All @@ -75,6 +86,70 @@ public void tearDown() {
PageCacheDeletionBuffer.setDalBufferSize(previousDalBufferSize);
}

@Test
public void testIdleCloseDoesNotWarnAboutQueueInterruption() throws Exception {
assertQueueInterruptionLogging(true);
}

@Test
public void testUnexpectedQueueInterruptionStillWarns() throws Exception {
assertQueueInterruptionLogging(false);
}

@SuppressWarnings("unchecked")
private void assertQueueInterruptionLogging(boolean closeNormally) throws Exception {
final PageCacheDeletionBuffer deletionBuffer =
new PageCacheDeletionBuffer(1, temporaryFolder.newFolder("interrupt").getAbsolutePath());
final CountDownLatch taking = new CountDownLatch(1);
final AtomicReference<Thread> worker = new AtomicReference<>();
final Field queueField = PageCacheDeletionBuffer.class.getDeclaredField("deletionResources");
queueField.setAccessible(true);
final BlockingQueue<DeletionResource> originalQueue =
(BlockingQueue<DeletionResource>) queueField.get(deletionBuffer);
final BlockingQueue<DeletionResource> queue =
mock(BlockingQueue.class, delegatesTo(originalQueue));
doAnswer(
invocation -> {
worker.set(Thread.currentThread());
taking.countDown();
return originalQueue.take();
})
.when(queue)
.take();
queueField.set(deletionBuffer, queue);
final Logger logger = (Logger) LoggerFactory.getLogger(PageCacheDeletionBuffer.class);
final Appender<ILoggingEvent> appender = mock(Appender.class);
logger.addAppender(appender);
deletionBuffer.start();
try {
Assert.assertTrue(taking.await(10, TimeUnit.SECONDS));
if (!closeNormally) {
worker.get().interrupt();
Awaitility.await()
.atMost(10, TimeUnit.SECONDS)
.untilAsserted(
() ->
verify(appender, atLeastOnce())
.doAppend(argThat(this::isQueueInterruptionWarning)));
}
} finally {
try {
deletionBuffer.close();
if (closeNormally) {
verify(appender, never()).doAppend(argThat(this::isQueueInterruptionWarning));
}
} finally {
logger.detachAppender(appender);
}
}
}

private boolean isQueueInterruptionWarning(ILoggingEvent event) {
return event.getLevel() == Level.WARN
&& DataNodePipeMessages.INTERRUPTED_WHEN_WAITING_FOR_TAKING_DELETIONRESOURCE_FROM.equals(
event.getMessage());
}

@Test
public void testDequeuedDeletionIsNotReportedAsFlushed() throws Exception {
final CountDownLatch serializationStarted = new CountDownLatch(1);
Expand Down
Loading