Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-14010. Pass correct DF usage to ReservedSpaceCalculator builder. Contributed by Virajith Jalaparti.

This commit is contained in:
Wei-Chiu Chuang 2019-06-18 00:33:10 -07:00
parent e188bb12b0
commit 335c1c9938
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeImpl.java
View File

@ -163,6 +163,13 @@ public class FsVolumeImpl implements FsVolumeSpi {
this.storageType = storageLocation.getStorageType();
this.configuredCapacity = -1;
this.usage = usage;
if (this.usage != null) {
reserved = new ReservedSpaceCalculator.Builder(conf)
.setUsage(this.usage).setStorageType(storageType).build();
} else {
reserved = null;
LOG.warn("Setting reserved to null as usage is null");
}
if (currentDir != null) {
File parent = currentDir.getParentFile();
cacheExecutor = initializeCacheExecutor(parent);
@ -173,8 +180,6 @@ public class FsVolumeImpl implements FsVolumeSpi {
}
this.conf = conf;
this.fileIoProvider = fileIoProvider;
this.reserved = new ReservedSpaceCalculator.Builder(conf)
.setUsage(usage).setStorageType(storageType).build();
}
protected ThreadPoolExecutor initializeCacheExecutor(File parent) {
@ -473,7 +478,7 @@ public class FsVolumeImpl implements FsVolumeSpi {
}
long getReserved(){
return reserved.getReserved();
return reserved != null ? reserved.getReserved() : 0;
}
@VisibleForTesting

8
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestProvidedImpl.java
View File

@ -353,6 +353,14 @@ public class TestProvidedImpl {
}
}
@Test
public void testReserved() throws Exception {
for (FsVolumeSpi vol : providedVolumes) {
// the reserved space for provided volumes should be 0.
assertEquals(0, ((FsVolumeImpl) vol).getReserved());
}
}
@Test
public void testProvidedVolumeImpl() throws IOException {