Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-12298. Ozone: Block deletion service floods the log when deleting large number of block files. Contributed by Yiqun Lin.

This commit is contained in:
Weiwei Yang 2017-08-15 17:12:59 +08:00 committed by Owen O'Malley
parent 25586607a1
commit e61530f5d9
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/background/BlockDeletingService.java
View File

@ -28,6 +28,7 @@ import org.apache.hadoop.ozone.container.common.helpers.ContainerData;
import org.apache.hadoop.ozone.container.common.helpers.KeyUtils; import org.apache.hadoop.ozone.container.common.helpers.KeyUtils;
import org.apache.hadoop.ozone.container.common.interfaces.ContainerManager; import org.apache.hadoop.ozone.container.common.interfaces.ContainerManager;
import org.apache.hadoop.scm.container.common.helpers.StorageContainerException; import org.apache.hadoop.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.utils.BackgroundService; import org.apache.hadoop.utils.BackgroundService;
import org.apache.hadoop.utils.BackgroundTaskResult; import org.apache.hadoop.utils.BackgroundTaskResult;
import org.apache.hadoop.utils.BackgroundTaskQueue; import org.apache.hadoop.utils.BackgroundTaskQueue;
@ -157,6 +158,7 @@ public class BlockDeletingService extends BackgroundService{
@Override @Override
public BackgroundTaskResult call() throws Exception { public BackgroundTaskResult call() throws Exception {
long startTime = Time.monotonicNow();
// Scan container's db and get list of under deletion blocks // Scan container's db and get list of under deletion blocks
MetadataStore meta = KeyUtils.getDB(containerData, conf); MetadataStore meta = KeyUtils.getDB(containerData, conf);
// # of blocks to delete is throttled // # of blocks to delete is throttled
@ -165,16 +167,16 @@ public class BlockDeletingService extends BackgroundService{
List<Map.Entry<byte[], byte[]>> toDeleteBlocks = List<Map.Entry<byte[], byte[]>> toDeleteBlocks =
meta.getRangeKVs(null, blockLimitPerTask, filter); meta.getRangeKVs(null, blockLimitPerTask, filter);
if (toDeleteBlocks.isEmpty()) { if (toDeleteBlocks.isEmpty()) {
LOG.info("No under deletion block found in container : {}", LOG.debug("No under deletion block found in container : {}",
containerData.getContainerName()); containerData.getContainerName());
} }
List<String> succeedBlocks = new LinkedList<>(); List<String> succeedBlocks = new LinkedList<>();
LOG.info("Container : {}, To-Delete blocks : {}", LOG.debug("Container : {}, To-Delete blocks : {}",
containerData.getContainerName(), toDeleteBlocks.size()); containerData.getContainerName(), toDeleteBlocks.size());
toDeleteBlocks.forEach(entry -> { toDeleteBlocks.forEach(entry -> {
String blockName = DFSUtil.bytes2String(entry.getKey()); String blockName = DFSUtil.bytes2String(entry.getKey());
LOG.info("Deleting block {}", blockName); LOG.debug("Deleting block {}", blockName);
try { try {
ContainerProtos.KeyData data = ContainerProtos.KeyData data =
ContainerProtos.KeyData.parseFrom(entry.getValue()); ContainerProtos.KeyData.parseFrom(entry.getValue());
@ -182,7 +184,7 @@ public class BlockDeletingService extends BackgroundService{
for (ContainerProtos.ChunkInfo chunkInfo : data.getChunksList()) { for (ContainerProtos.ChunkInfo chunkInfo : data.getChunksList()) {
File chunkFile = new File(chunkInfo.getChunkName()); File chunkFile = new File(chunkInfo.getChunkName());
if (FileUtils.deleteQuietly(chunkFile)) { if (FileUtils.deleteQuietly(chunkFile)) {
LOG.info("block {} chunk {} deleted", blockName, LOG.debug("block {} chunk {} deleted", blockName,
chunkFile.getAbsolutePath()); chunkFile.getAbsolutePath());
} }
} }
@ -198,6 +200,10 @@ public class BlockDeletingService extends BackgroundService{
batch.delete(DFSUtil.string2Bytes(entry))); batch.delete(DFSUtil.string2Bytes(entry)));
meta.writeBatch(batch); meta.writeBatch(batch);
LOG.info("The elapsed time of task@{} for"
+ " deleting blocks: {}ms.",
Integer.toHexString(this.hashCode()),
Time.monotonicNow() - startTime);
ContainerBackgroundTaskResult crr = new ContainerBackgroundTaskResult(); ContainerBackgroundTaskResult crr = new ContainerBackgroundTaskResult();
crr.addAll(succeedBlocks); crr.addAll(succeedBlocks);
return crr; return crr;