HDFS-7951. Fix NPE for TestFsDatasetImpl#testAddVolumeFailureReleasesInUseLock on Linux. (Contributed by Xiaoyu Yao)

This commit is contained in:
Arpit Agarwal 2015-03-18 12:45:46 -07:00
parent 97341a4a1d
commit 6b7cf6e096
2 changed files with 5 additions and 1 deletions

View File

@ -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

View File

@ -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.<List<NamespaceInfo>>any()))
.thenReturn(builder);