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/12/04 17:23:56 UTC
hadoop git commit: HDFS-13999. Bogus missing block warning if the
file is under construction when NN starts. Contributed by Wei-Chiu Chuang.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 b1258ad58 -> d9fe68894
HDFS-13999. Bogus missing block warning if the file is under construction when NN starts. Contributed by Wei-Chiu Chuang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d9fe6889
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d9fe6889
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d9fe6889
Branch: refs/heads/branch-2.7
Commit: d9fe688945adaea112a4e68ad0979caded04e5fd
Parents: b1258ad
Author: Wei-Chiu Chuang <we...@apache.org>
Authored: Tue Dec 4 09:23:24 2018 -0800
Committer: Wei-Chiu Chuang <we...@apache.org>
Committed: Tue Dec 4 09:23:24 2018 -0800
----------------------------------------------------------------------
.../hdfs/server/blockmanagement/BlockInfoContiguous.java | 6 ++++++
.../hadoop/hdfs/server/blockmanagement/BlockManager.java | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d9fe6889/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java
index 1d3df26..5162ec8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java
@@ -369,6 +369,12 @@ public class BlockInfoContiguous extends Block
return getBlockUCState().equals(BlockUCState.COMPLETE);
}
+ public final boolean isCompleteOrCommitted() {
+ final BlockUCState state = getBlockUCState();
+ return state.equals(BlockUCState.COMPLETE) ||
+ state.equals(BlockUCState.COMMITTED);
+ }
+
/**
* Convert a complete block to an under construction block.
* @return BlockInfoUnderConstruction - an under construction block.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d9fe6889/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
index 797215c..d45b2f4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
@@ -2594,8 +2594,8 @@ public class BlockManager {
namesystem.incrementSafeBlockCount(numCurrentReplica);
}
- // if file is under construction, then done for now
- if (bc.isUnderConstruction()) {
+ // if block is still under construction, then done for now
+ if (!storedBlock.isCompleteOrCommitted()) {
return storedBlock;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org