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 ar...@apache.org on 2015/03/18 20:46:49 UTC
[2/3] hadoop git commit: HDFS-7951. Fix NPE for
TestFsDatasetImpl#testAddVolumeFailureReleasesInUseLock on Linux.
(Contributed by Xiaoyu Yao)
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/6b7cf6e0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6b7cf6e0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6b7cf6e0
Branch: refs/heads/branch-2
Commit: 6b7cf6e096b12e577d925ad1c3bd3fba5844900c
Parents: 97341a4
Author: Arpit Agarwal <ar...@apache.org>
Authored: Wed Mar 18 12:45:46 2015 -0700
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Wed Mar 18 12:46:09 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/6b7cf6e0/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 dc7d4a9..6b14d5c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -878,6 +878,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/6b7cf6e0/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);