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 vi...@apache.org on 2015/09/10 00:11:09 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.6.1 0adcfe6c7 -> adc340532


HDFS-7552. Change FsVolumeList toString() to fix TestDataNodeVolumeFailureToleration (Liang Xie via Colin P. McCabe)
(cherry picked from commit a4876c130f1627e59ef055e586640d1933fc49af)

(cherry picked from commit 22f72c79462c424e47610470fd48e871887ac326)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/adc34053
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/adc34053
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/adc34053

Branch: refs/heads/branch-2.6.1
Commit: adc340532164c9f39962de0eeab837a8cd9f3460
Parents: 0adcfe6
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Fri Dec 19 11:13:04 2014 -0800
Committer: Vinod Kumar Vavilapalli <vi...@apache.org>
Committed: Wed Sep 9 14:59:31 2015 -0700

----------------------------------------------------------------------
 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/adc34053/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 2234da3..2eeb79f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -175,6 +175,9 @@ Release 2.6.1 - UNRELEASED
     HDFS-8863. The remaining space check in BlockPlacementPolicyDefault is
     flawed. (Kihwal Lee via yliu)
 
+    HDFS-7552. Change FsVolumeList toString() to fix
+    TestDataNodeVolumeFailureToleration (Liang Xie via Colin P. McCabe)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/adc34053/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 b17b90b..367824a 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
@@ -216,7 +216,7 @@ class FsVolumeList {
 
   @Override
   public String toString() {
-    return volumes.toString();
+    return Arrays.toString(volumes.get());
   }
 
   /**