From 8639ecb26d479da9f99de503e79a26e21562aafd Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Tue, 5 Nov 2013 18:27:00 +0000 Subject: [PATCH] HDFS-5458. Datanode failed volume threshold ignored if exception is thrown in getDataDirsFromURIs. Contributed by Mike Mellenthin. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539091 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/datanode/DataNode.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 5c6d9b05fe3..9fedc0ed020 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -585,6 +585,9 @@ Release 2.2.1 - UNRELEASED HDFS-5456. NameNode startup progress creates new steps if caller attempts to create a counter for a step that doesn't already exist. (cnauroth) + HDFS-5458. Datanode failed volume threshold ignored if exception is thrown + in getDataDirsFromURIs. (Mike Mellenthin via wang) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java index fee84190486..7529b9f37b6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java @@ -1770,7 +1770,7 @@ public class DataNode extends Configured } catch (IOException ioe) { LOG.warn("Invalid " + DFS_DATANODE_DATA_DIR_KEY + " " + dir + " : ", ioe); - invalidDirs.append("\"").append(dir.getCanonicalPath()).append("\" "); + invalidDirs.append("\"").append(dirURI.getPath()).append("\" "); } } if (dirs.size() == 0) {