From 555fa2d9d0dbb3bf2b209a953eb07a59bbfe3197 Mon Sep 17 00:00:00 2001 From: yliu Date: Mon, 24 Nov 2014 04:17:17 +0800 Subject: [PATCH] HDFS-7403. Inaccurate javadoc of BlockUCState#COMPLETE state. (Yongjun Zhang via yliu) --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop/hdfs/server/common/HdfsServerConstants.java | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 3f12cec4242..5c0633354c0 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 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 3e8c842b34e..9bba2c950b8 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 void write(DataOutput out) throws IOException { static public enum BlockUCState { /** * Block construction completed.
- * 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, /**