hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject hadoop git commit: HDFS-7946. TestDataNodeVolumeFailureReporting NPE on Windows. (Contributed by Xiaoyu Yao)
Date Wed, 18 Mar 2015 04:34:22 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 47e6fc2bf -> 26c35438f


HDFS-7946. TestDataNodeVolumeFailureReporting NPE on Windows. (Contributed by Xiaoyu Yao)


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

Branch: refs/heads/branch-2.7
Commit: 26c35438f3681c157aae86a5de135c03315969f9
Parents: 47e6fc2
Author: Arpit Agarwal <arp@apache.org>
Authored: Tue Mar 17 21:29:19 2015 -0700
Committer: Arpit Agarwal <arp@apache.org>
Committed: Tue Mar 17 21:30:13 2015 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                     | 3 +++
 .../server/datanode/TestDataNodeVolumeFailureReporting.java     | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/26c35438/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 2aff3b3..5c486b0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -849,6 +849,9 @@ Release 2.7.0 - UNRELEASED
     HDFS-7915. The DataNode can sometimes allocate a ShortCircuitShm slot and
     fail to tell the DFSClient about it because of a network error (cmccabe)
 
+    HDFS-7946. TestDataNodeVolumeFailureReporting NPE on Windows. (Xiaoyu Yao
+    via Arpit Agarwal)
+
     BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
 
       HDFS-7720. Quota by Storage Type API, tools and ClientNameNode

http://git-wip-us.apache.org/repos/asf/hadoop/blob/26c35438/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureReporting.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureReporting.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureReporting.java
index 788ddb3..9842f25 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureReporting.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureReporting.java
@@ -91,6 +91,7 @@ public class TestDataNodeVolumeFailureReporting {
     // been simulated by denying execute access.  This is based on the maximum
     // number of datanodes and the maximum number of storages per data node used
     // throughout the tests in this suite.
+    assumeTrue(!Path.WINDOWS);
     int maxDataNodes = 3;
     int maxStoragesPerDataNode = 4;
     for (int i = 0; i < maxDataNodes; i++) {
@@ -100,7 +101,9 @@ public class TestDataNodeVolumeFailureReporting {
       }
     }
     IOUtils.cleanup(LOG, fs);
-    cluster.shutdown();
+    if (cluster != null) {
+      cluster.shutdown();
+    }
   }
 
   /**


Mime
View raw message