This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 248c5486166 Fix decommission UnsupportedOperationException (#4172)
248c5486166 is described below
commit 248c54861662248104f8ec36ccafadb684f899e6
Author: daimin <[email protected]>
AuthorDate: Mon Apr 18 10:40:12 2022 +0800
Fix decommission UnsupportedOperationException (#4172)
Reviewed-by: tomscut <[email protected]>
Signed-off-by: Wei-Chiu Chuang <[email protected]>
---
.../server/blockmanagement/DatanodeAdminManager.java | 6 ++++--
.../java/org/apache/hadoop/hdfs/TestDecommission.java | 17 +++++++++++++++++
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminManager.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminManager.java
index fc826e4fa41..6b176b4acea 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminManager.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminManager.java
@@ -751,8 +751,10 @@ public class DatanodeAdminManager {
// Remove the block from the list if it's no longer in the block map,
// e.g. the containing file has been deleted
if (blockManager.blocksMap.getStoredBlock(block) == null) {
- LOG.trace("Removing unknown block {}", block);
- it.remove();
+ if (pruneReliableBlocks) {
+ LOG.trace("Removing unknown block {}", block);
+ it.remove();
+ }
continue;
}
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDecommission.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDecommission.java
index a9e2bd593f2..39b93f281a4 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDecommission.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDecommission.java
@@ -53,6 +53,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.client.HdfsDataInputStream;
import org.apache.hadoop.hdfs.client.HdfsDataOutputStream;
+import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.protocol.DatanodeID;
import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
import org.apache.hadoop.hdfs.protocol.DatanodeInfo.AdminStates;
@@ -61,6 +62,7 @@ import
org.apache.hadoop.hdfs.protocol.HdfsConstants.DatanodeReportType;
import org.apache.hadoop.hdfs.protocol.LocatedBlock;
import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo;
+import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfoContiguous;
import org.apache.hadoop.hdfs.server.blockmanagement.BlockManager;
import org.apache.hadoop.hdfs.server.blockmanagement.BlockManagerTestUtil;
import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor;
@@ -668,6 +670,21 @@ public class TestDecommission extends AdminStatesBaseTest {
fdos.close();
}
+ @Test(timeout = 20000)
+ public void testDecommissionWithUnknownBlock() throws IOException {
+ startCluster(1, 3);
+
+ FSNamesystem ns = getCluster().getNamesystem(0);
+ DatanodeManager datanodeManager =
ns.getBlockManager().getDatanodeManager();
+
+ BlockInfo blk = new BlockInfoContiguous(new Block(1L), (short) 1);
+ DatanodeDescriptor dn = datanodeManager.getDatanodes().iterator().next();
+ dn.getStorageInfos()[0].addBlock(blk, blk);
+
+ datanodeManager.getDatanodeAdminManager().startDecommission(dn);
+ waitNodeState(dn, DatanodeInfo.AdminStates.DECOMMISSIONED);
+ }
+
private static String scanIntoString(final ByteArrayOutputStream baos) {
final TextStringBuilder sb = new TextStringBuilder();
final Scanner scanner = new Scanner(baos.toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
