Repository: hadoop Updated Branches: refs/heads/trunk 6635ccd21 -> a4876c130
HDFS-7552. Change FsVolumeList toString() to fix TestDataNodeVolumeFailureToleration (Liang Xie via Colin P. McCabe) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a4876c13 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a4876c13 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a4876c13 Branch: refs/heads/trunk Commit: a4876c130f1627e59ef055e586640d1933fc49af Parents: 6635ccd Author: Colin Patrick Mccabe <cmcc...@cloudera.com> Authored: Fri Dec 19 11:13:04 2014 -0800 Committer: Colin Patrick Mccabe <cmcc...@cloudera.com> Committed: Fri Dec 19 11:13:04 2014 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeList.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a4876c13/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 73286cd..e74e6d9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -621,6 +621,9 @@ Release 2.7.0 - UNRELEASED HDFS-7431. log message for InvalidMagicNumberException may be incorrect. (Yi Liu via cnauroth) + HDFS-7552. Change FsVolumeList toString() to fix + TestDataNodeVolumeFailureToleration (Liang Xie via Colin P. McCabe) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/a4876c13/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeList.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeList.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeList.java index b506710..c02603d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeList.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeList.java @@ -213,7 +213,7 @@ class FsVolumeList { @Override public String toString() { - return volumes.toString(); + return Arrays.toString(volumes.get()); } /**