You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by we...@apache.org on 2018/08/14 18:52:06 UTC
hadoop git commit: HDFS-13758. DatanodeManager should throw exception
if it has BlockRecoveryCommand but the block is not under construction.
Contributed by chencan.
Repository: hadoop
Updated Branches:
refs/heads/trunk 4cba0741d -> 61a9b4f58
HDFS-13758. DatanodeManager should throw exception if it has BlockRecoveryCommand but the block is not under construction. Contributed by chencan.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/61a9b4f5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/61a9b4f5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/61a9b4f5
Branch: refs/heads/trunk
Commit: 61a9b4f58b639e71c564d84b529ac66aaae7f8ef
Parents: 4cba074
Author: Wei-Chiu Chuang <we...@apache.org>
Authored: Tue Aug 14 11:51:27 2018 -0700
Committer: Wei-Chiu Chuang <we...@apache.org>
Committed: Tue Aug 14 11:51:27 2018 -0700
----------------------------------------------------------------------
.../hadoop/hdfs/server/blockmanagement/DatanodeManager.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/61a9b4f5/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
index 7d5d73c..1131506 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
@@ -1542,7 +1542,7 @@ public class DatanodeManager {
}
private BlockRecoveryCommand getBlockRecoveryCommand(String blockPoolId,
- DatanodeDescriptor nodeinfo) {
+ DatanodeDescriptor nodeinfo) throws IOException {
BlockInfo[] blocks = nodeinfo.getLeaseRecoveryCommand(Integer.MAX_VALUE);
if (blocks == null) {
return null;
@@ -1550,7 +1550,10 @@ public class DatanodeManager {
BlockRecoveryCommand brCommand = new BlockRecoveryCommand(blocks.length);
for (BlockInfo b : blocks) {
BlockUnderConstructionFeature uc = b.getUnderConstructionFeature();
- assert uc != null;
+ if(uc == null) {
+ throw new IOException("Recovery block " + b +
+ "where it is not under construction.");
+ }
final DatanodeStorageInfo[] storages = uc.getExpectedStorageLocations();
// Skip stale nodes during recovery
final List<DatanodeStorageInfo> recoveryLocations =
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org