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 yl...@apache.org on 2014/11/24 06:22:22 UTC

hadoop git commit: HDFS-7403. Inaccurate javadoc of BlockUCState#COMPLETE state. (Yongjun Zhang via yliu)

Repository: hadoop
Updated Branches:
  refs/heads/trunk a4df9eed0 -> 555fa2d9d


HDFS-7403. Inaccurate javadoc of  BlockUCState#COMPLETE state. (Yongjun Zhang via yliu)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/555fa2d9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/555fa2d9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/555fa2d9

Branch: refs/heads/trunk
Commit: 555fa2d9d0dbb3bf2b209a953eb07a59bbfe3197
Parents: a4df9ee
Author: yliu <yl...@apache.org>
Authored: Mon Nov 24 04:17:17 2014 +0800
Committer: yliu <yl...@apache.org>
Committed: Mon Nov 24 04:17:17 2014 +0800

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                   | 3 +++
 .../apache/hadoop/hdfs/server/common/HdfsServerConstants.java | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/555fa2d9/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 3f12cec..5c06333 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -473,6 +473,9 @@ Release 2.7.0 - UNRELEASED
 
     HDFS-7374. Allow decommissioning of dead DataNodes. (Zhe Zhang)
 
+    HDFS-7403. Inaccurate javadoc of  BlockUCState#COMPLETE state. (
+    Yongjun Zhang via yliu)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/555fa2d9/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.java
index 3e8c842..9bba2c9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.java
@@ -280,8 +280,11 @@ public final class HdfsServerConstants {
   static public enum BlockUCState {
     /**
      * Block construction completed.<br>
-     * The block has at least one {@link ReplicaState#FINALIZED} replica,
-     * and is not going to be modified.
+     * The block has at least the configured minimal replication number
+     * of {@link ReplicaState#FINALIZED} replica(s), and is not going to be
+     * modified.
+     * NOTE, in some special cases, a block may be forced to COMPLETE state,
+     * even if it doesn't have required minimal replications.
      */
     COMPLETE,
     /**