This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new f9a7b44 HDFS-14465. When the Block expected replications is larger
than the number of DataNodes, entering maintenance will never exit. Contributed
by Yicong Cai.
f9a7b44 is described below
commit f9a7b442fdd7855e3c7b28e19a12580df48d92bf
Author: Wei-Chiu Chuang <[email protected]>
AuthorDate: Mon Jun 17 15:16:41 2019 -0700
HDFS-14465. When the Block expected replications is larger than the number
of DataNodes, entering maintenance will never exit. Contributed by Yicong Cai.
---
.../hdfs/server/blockmanagement/DatanodeAdminManager.java | 11 +++++++++--
.../java/org/apache/hadoop/hdfs/TestMaintenanceState.java | 1 +
2 files changed, 10 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 f2ae4df..6327b4f 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
@@ -345,7 +345,9 @@ public class DatanodeAdminManager {
* @return true if sufficient, else false.
*/
private boolean isSufficient(BlockInfo block, BlockCollection bc,
- NumberReplicas numberReplicas, boolean isDecommission) {
+ NumberReplicas numberReplicas,
+ boolean isDecommission,
+ boolean isMaintenance) {
if (blockManager.hasEnoughEffectiveReplicas(block, numberReplicas, 0)) {
// Block has enough replica, skip
LOG.trace("Block {} does not need replication.", block);
@@ -379,6 +381,10 @@ public class DatanodeAdminManager {
}
}
}
+ if (isMaintenance
+ && numLive >= blockManager.getMinReplicationToBeInMaintenance()) {
+ return true;
+ }
return false;
}
@@ -705,6 +711,7 @@ public class DatanodeAdminManager {
// Schedule low redundancy blocks for reconstruction
// if not already pending.
boolean isDecommission = datanode.isDecommissionInProgress();
+ boolean isMaintenance = datanode.isEnteringMaintenance();
boolean neededReconstruction = isDecommission ?
blockManager.isNeededReconstruction(block, num) :
blockManager.isNeededReconstructionForMaintenance(block, num);
@@ -723,7 +730,7 @@ public class DatanodeAdminManager {
// Even if the block is without sufficient redundancy,
// it might not block decommission/maintenance if it
// has sufficient redundancy.
- if (isSufficient(block, bc, num, isDecommission)) {
+ if (isSufficient(block, bc, num, isDecommission, isMaintenance)) {
if (pruneReliableBlocks) {
it.remove();
}
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java
index 092b5af..fcff0e2 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java
@@ -373,6 +373,7 @@ public class TestMaintenanceState extends
AdminStatesBaseTest {
testExpectedReplication(2);
testExpectedReplication(3);
testExpectedReplication(4);
+ testExpectedReplication(10);
}
private void testExpectedReplication(int replicationFactor)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
