hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [1/3] hadoop git commit: HDFS-7951. Fix NPE for TestFsDatasetImpl#testAddVolumeFailureReleasesInUseLock on Linux. (Contributed by Xiaoyu Yao)
Date Wed, 18 Mar 2015 19:46:48 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 97341a4a1 -> 6b7cf6e09
  refs/heads/branch-2.7 ae6d273d6 -> 2b589da77
  refs/heads/trunk d462c6275 -> e817cedcd


HDFS-7951. Fix NPE for TestFsDatasetImpl#testAddVolumeFailureReleasesInUseLock on Linux. (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/e817cedc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e817cedc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e817cedc

Branch: refs/heads/trunk
Commit: e817cedcdc262630206630d4a58d1051ceab8794
Parents: d462c62
Author: Arpit Agarwal <arp@apache.org>
Authored: Wed Mar 18 12:45:46 2015 -0700
Committer: Arpit Agarwal <arp@apache.org>
Committed: Wed Mar 18 12:45:46 2015 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                      | 4 ++++
 .../hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e817cedc/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 9e54b3d..eb84213 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1181,6 +1181,10 @@ Release 2.7.0 - UNRELEASED
     HDFS-7950. Fix TestFsDatasetImpl#testAddVolumes failure on Windows.
     (Xiaoyu Yao via Arpit Agarwal)
 
+    HDFS-7951. Fix NPE for
+    TestFsDatasetImpl#testAddVolumeFailureReleasesInUseLock on Linux
+    (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/e817cedc/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
index 73fcd19..56a4287 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
@@ -330,7 +330,7 @@ public class TestFsDatasetImpl {
     Storage.StorageDirectory sd = createStorageDirectory(badDir);
     sd.lock();
     DataStorage.VolumeBuilder builder = new DataStorage.VolumeBuilder(storage, sd);
-    when(storage.prepareVolume(eq(datanode), eq(badDir),
+    when(storage.prepareVolume(eq(datanode), eq(badDir.getAbsoluteFile()),
         Matchers.<List<NamespaceInfo>>any()))
         .thenReturn(builder);
 


Mime
View raw message