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

HDFS-14700. Clean up pmem cache before setting pmem cache capacity. Contributed by Feilong He. 

(cherry picked from commit f6fa865d6f)
This commit is contained in:
Rakesh Radhakrishnan 2019-08-09 14:07:54 +05:30
parent f2563dcca1
commit cd1277398a
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,6 +218,8 @@ public final class PmemVolumeManager {
try { try {
File pmemDir = new File(volumes[n]); File pmemDir = new File(volumes[n]);
File realPmemDir = verifyIfValidPmemVolume(pmemDir); File realPmemDir = verifyIfValidPmemVolume(pmemDir);
// Clean up the cache left before, if any.
cleanup(realPmemDir);
this.pmemVolumes.add(realPmemDir.getPath()); this.pmemVolumes.add(realPmemDir.getPath());
long maxBytes; long maxBytes;
if (maxBytesPerPmem == -1) { if (maxBytesPerPmem == -1) {
@ -242,17 +244,20 @@ public final class PmemVolumeManager {
throw new IOException( throw new IOException(
"At least one valid persistent memory volume is required!"); "At least one valid persistent memory volume is required!");
} }
cleanup(); }
void cleanup(File realPmemDir) {
try {
FileUtils.cleanDirectory(realPmemDir);
} catch (IOException e) {
LOG.error("Failed to clean up " + realPmemDir.getPath(), e);
}
} }
void cleanup() { void cleanup() {
// Remove all files under the volume. // Remove all files under the volume.
for (String pmemDir: pmemVolumes) { for (String pmemVolume : pmemVolumes) {
try { cleanup(new File(pmemVolume));
FileUtils.cleanDirectory(new File(pmemDir));
} catch (IOException e) {
LOG.error("Failed to clean up " + pmemDir, e);
}
} }
} }