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 cm...@apache.org on 2014/12/19 20:20:50 UTC
hadoop git commit: HDFS-7552. Change FsVolumeList toString() to fix
TestDataNodeVolumeFailureToleration (Liang Xie via Colin P. McCabe) (cherry
picked from commit a4876c130f1627e59ef055e586640d1933fc49af)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 fe38ed2ee -> 22f72c794
HDFS-7552. Change FsVolumeList toString() to fix TestDataNodeVolumeFailureToleration (Liang Xie via Colin P. McCabe)
(cherry picked from commit a4876c130f1627e59ef055e586640d1933fc49af)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/22f72c79
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/22f72c79
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/22f72c79
Branch: refs/heads/branch-2
Commit: 22f72c79462c424e47610470fd48e871887ac326
Parents: fe38ed2
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Fri Dec 19 11:13:04 2014 -0800
Committer: Colin Patrick Mccabe <cm...@cloudera.com>
Committed: Fri Dec 19 11:20:43 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/22f72c79/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 595951f..3ab119f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -364,6 +364,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/22f72c79/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());
}
/**