Skip to content

HDDS-4370. Datanode deletion service can avoid storing deleted blocks. #1620

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
aryangupta1998 wants to merge 5 commits into from
Closed

HDDS-4370. Datanode deletion service can avoid storing deleted blocks. #1620

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
3f171aa
HDDS-4370. Datanode deletion service can avoid storing deleted blocks.
aryangupta1998 Nov 24, 2020
2647d29
HDDS-4370. Datanode deletion service can avoid storing deleted blocks.
aryangupta1998 Nov 24, 2020
fb34f03
Merge branch 'master' into HDDS-4370
aryangupta1998 Nov 24, 2020
70ae0a9
HDDS-4370. Datanode deletion service can avoid storing deleted blocks…
aryangupta1998 Nov 25, 2020
ed4d31d
Merge branch 'HDDS-4370' of https://github.com/aryangupta1998/hadoop-…
aryangupta1998 Nov 25, 2020
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
19 changes: 1 addition & 18 deletions .../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 @@ -29,7 +29,6 @@
import java.util.stream.Collectors;

import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
Expand All @@ -41,9 +40,7 @@
import org.apache.hadoop.hdds.utils.MetadataKeyFilters;
import org.apache.hadoop.hdds.utils.MetadataKeyFilters.KeyPrefixFilter;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.container.common.helpers.BlockData;
import org.apache.hadoop.ozone.container.common.helpers.ChunkInfoList;
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.hadoop.ozone.container.common.impl.TopNOrderedContainerDeletionChoosingPolicy;
import org.apache.hadoop.ozone.container.common.interfaces.Container;
Expand Down Expand Up @@ -293,29 +290,15 @@ public BackgroundTaskResult call() throws Exception {
}
}

// Once files are deleted... replace deleting entries with deleted
// entries
// Once blocks are deleted... remove the blockID from blockDataTable.
try(BatchOperation batch = meta.getStore().getBatchHandler()
.initBatchOperation()) {
Table< String, ChunkInfoList > deletedBlocksTable =
meta.getStore().getDeletedBlocksTable();
for (String entry : succeedBlocks) {
List< ContainerProtos.ChunkInfo > chunkList =
blockDataTable.get(entry).getChunks();
String blockId = entry.substring(
OzoneConsts.DELETING_KEY_PREFIX.length());

deletedBlocksTable.putWithBatch(
batch, blockId,
new ChunkInfoList(chunkList));
blockDataTable.deleteWithBatch(batch, entry);
}

int deleteBlockCount = succeedBlocks.size();
containerData.updateAndCommitDBCounters(meta, batch,
deleteBlockCount);


// update count of pending deletion blocks and block count in
// in-memory container status.
containerData.decrPendingDeletionBlocks(deleteBlockCount);
Expand Down
Loading