Skip to content

HDDS-6287. BlockDeletingService add inDeleting Container condition #3058

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

Closed
guohao-rosicky wants to merge 3 commits into from
Closed

HDDS-6287. BlockDeletingService add inDeleting Container condition #3058

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4fc25c
HDDS-6287. BlockDeletingService add inDeleting Container condition
guohao-rosicky Feb 9, 2022
86cd4d0
trigger new CI
guohao-rosicky Feb 9, 2022
1568399
trigger new CI
guohao-rosicky Feb 9, 2022
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
13 changes: 12 additions & 1 deletion .../apache/hadoop/ozone/container/keyvalue/statemachine/background/BlockDeletingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@

import java.io.File;
import java.io.IOException;
import java.util.Set;
import java.util.UUID;
import java.util.LinkedList;
import java.util.Objects;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -90,6 +92,8 @@ public class BlockDeletingService extends BackgroundService {
// Core pool size for container tasks
private static final int BLOCK_DELETING_SERVICE_CORE_POOL_SIZE = 10;

private final Set<Long> inDeletingContainer = new CopyOnWriteArraySet<>();

public BlockDeletingService(OzoneContainer ozoneContainer,
long serviceInterval, long serviceTimeout, TimeUnit timeUnit,
ConfigurationSource conf) {
Expand Down Expand Up @@ -152,6 +156,8 @@ public BackgroundTaskQueue getTasks() {
new BlockDeletingTask(containerBlockInfo.containerData,
TASK_PRIORITY_DEFAULT, containerBlockInfo.numBlocksToDelete);
queue.add(containerBlockInfos);
inDeletingContainer
.add(containerBlockInfo.getContainerData().getContainerID());
totalBlocks += containerBlockInfo.numBlocksToDelete;
}
if (containers.size() > 0) {
Expand Down Expand Up @@ -186,6 +192,9 @@ public List<ContainerBlockInfo> chooseContainerForBlockDeletion(

private boolean isDeletionAllowed(ContainerData containerData,
ContainerDeletionChoosingPolicy deletionPolicy) {
if (inDeletingContainer.contains(containerData.getContainerID())) {
return false;
}
if (!deletionPolicy
.isValidContainerType(containerData.getContainerType())) {
return false;
Expand Down Expand Up @@ -272,8 +281,9 @@ private class BlockDeletingTask implements BackgroundTask {
@Override
public BackgroundTaskResult call() throws Exception {
ContainerBackgroundTaskResult crr;
long containerID = containerData.getContainerID();
final Container container = ozoneContainer.getContainerSet()
.getContainer(containerData.getContainerID());
.getContainer(containerID);
container.writeLock();
File dataDir = new File(containerData.getChunksPath());
long startTime = Time.monotonicNow();
Expand All @@ -290,6 +300,7 @@ public BackgroundTaskResult call() throws Exception {
return crr;
} finally {
container.writeUnlock();
inDeletingContainer.remove(containerID);
}
}

Expand Down