From 6b7cf6e096b12e577d925ad1c3bd3fba5844900c Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Wed, 18 Mar 2015 12:45:46 -0700 Subject: [PATCH] HDFS-7951. Fix NPE for TestFsDatasetImpl#testAddVolumeFailureReleasesInUseLock on Linux. (Contributed by Xiaoyu Yao) --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 4 ++++ .../server/datanode/fsdataset/impl/TestFsDatasetImpl.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index dc7d4a9411b..6b14d5cd611 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 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 73fcd197aff..56a4287d631 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 void testAddVolumeFailureReleasesInUseLock() throws IOException { 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.>any())) .thenReturn(builder);