|
@@ -31,10 +31,15 @@ import java.util.concurrent.locks.ReentrantLock;
|
|
|
import java.util.stream.Collectors;
|
|
|
import org.apache.hadoop.conf.Configuration;
|
|
|
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
|
|
|
-import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.ContainerBlocksDeletionACKProto;
|
|
|
-import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.ContainerBlocksDeletionACKProto.DeleteBlockTransactionResult;
|
|
|
-import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.DeletedBlocksTransaction;
|
|
|
-import org.apache.hadoop.hdds.scm.command.CommandStatusReportHandler.DeleteBlockStatus;
|
|
|
+import org.apache.hadoop.hdds.protocol.proto
|
|
|
+ .StorageContainerDatanodeProtocolProtos.ContainerBlocksDeletionACKProto;
|
|
|
+import org.apache.hadoop.hdds.protocol.proto
|
|
|
+ .StorageContainerDatanodeProtocolProtos.ContainerBlocksDeletionACKProto
|
|
|
+ .DeleteBlockTransactionResult;
|
|
|
+import org.apache.hadoop.hdds.protocol.proto
|
|
|
+ .StorageContainerDatanodeProtocolProtos.DeletedBlocksTransaction;
|
|
|
+import org.apache.hadoop.hdds.scm.command
|
|
|
+ .CommandStatusReportHandler.DeleteBlockStatus;
|
|
|
import org.apache.hadoop.hdds.scm.container.ContainerID;
|
|
|
import org.apache.hadoop.hdds.scm.container.ContainerInfo;
|
|
|
import org.apache.hadoop.hdds.scm.container.ContainerManager;
|
|
@@ -50,8 +55,10 @@ import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
|
|
import static java.lang.Math.min;
|
|
|
-import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_BLOCK_DELETION_MAX_RETRY;
|
|
|
-import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_BLOCK_DELETION_MAX_RETRY_DEFAULT;
|
|
|
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys
|
|
|
+ .OZONE_SCM_BLOCK_DELETION_MAX_RETRY;
|
|
|
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys
|
|
|
+ .OZONE_SCM_BLOCK_DELETION_MAX_RETRY_DEFAULT;
|
|
|
|
|
|
/**
|
|
|
* A implement class of {@link DeletedBlockLog}, and it uses
|
|
@@ -328,12 +335,14 @@ public class DeletedBlockLogImpl
|
|
|
? extends Table.KeyValue<Long, DeletedBlocksTransaction>> iter =
|
|
|
scmMetadataStore.getDeletedBlocksTXTable().iterator()) {
|
|
|
while (iter.hasNext()) {
|
|
|
- Table.KeyValue<Long, DeletedBlocksTransaction> keyValue = iter.next();
|
|
|
+ Table.KeyValue<Long, DeletedBlocksTransaction> keyValue =
|
|
|
+ iter.next();
|
|
|
DeletedBlocksTransaction block = keyValue.getValue();
|
|
|
if (block.getCount() > -1 && block.getCount() <= maxRetry) {
|
|
|
if (transactions.addTransaction(block,
|
|
|
transactionToDNsCommitMap.get(block.getTxID()))) {
|
|
|
- deleteTransactionMap.put(block.getContainerID(), block.getTxID());
|
|
|
+ deleteTransactionMap.put(block.getContainerID(),
|
|
|
+ block.getTxID());
|
|
|
transactionToDNsCommitMap
|
|
|
.putIfAbsent(block.getTxID(), new ConcurrentHashSet<>());
|
|
|
}
|