From 9b8a60f44f67725f489aa93dd242cee84b67f571 Mon Sep 17 00:00:00 2001 From: Jing Zhao Date: Mon, 22 Jul 2013 05:33:40 +0000 Subject: [PATCH] HDFS-5018. Merge change r1505603 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505604 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 6fd5262012a..d23fc9f9200 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -494,6 +494,9 @@ Release 2.1.0-beta - 2013-07-02 HDFS-5003. TestNNThroughputBenchmark failed caused by existing directories. (Xi Fang via cnauroth) + HDFS-5018. Misspelled DFSConfigKeys#DFS_NAMENODE_STALE_DATANODE_INTERVAL_DEFAULT + in javadoc of DatanodeInfo#isStale(). (Ted Yu via jing9) + BREAKDOWN OF HDFS-347 SUBTASKS AND RELATED JIRAS HDFS-4353. Encapsulate connections to peers in Peer and PeerServer classes. diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java index d1aa4d316fb..725ae85983d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java @@ -327,7 +327,7 @@ public class DatanodeInfo extends DatanodeID implements Node { * Check if the datanode is in stale state. Here if * the namenode has not received heartbeat msg from a * datanode for more than staleInterval (default value is - * {@link DFSConfigKeys#DFS_NAMENODE_STALE_DATANODE_INTERVAL_MILLI_DEFAULT}), + * {@link DFSConfigKeys#DFS_NAMENODE_STALE_DATANODE_INTERVAL_DEFAULT}), * the datanode will be treated as stale node. * * @param staleInterval