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

YARN-5027. NM should clean up app log dirs after NM restart. Contributed by sandflee 

(cherry picked from commit 7146359bfd)
This commit is contained in:
Jason Lowe 2016-10-28 15:48:58 +00:00
parent 558e53b10b
commit 83bb428e6c
1 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java
View File

@ -239,6 +239,7 @@ public void serviceInit(Configuration conf) throws Exception {
if (!stateStore.canRecover()|| stateStore.isNewlyCreated()) { if (!stateStore.canRecover()|| stateStore.isNewlyCreated()) {
cleanUpLocalDirs(lfs, delService); cleanUpLocalDirs(lfs, delService);
cleanupLogDirs(lfs, delService);
initializeLocalDirs(lfs); initializeLocalDirs(lfs);
initializeLogDirs(lfs); initializeLogDirs(lfs);
} }
@ -1343,9 +1344,9 @@ private void initializeLogDirs(FileContext lfs) {
} }
} }
private void initializeLogDir(FileContext lfs, String logDir) { private void initializeLogDir(FileContext fs, String logDir) {
try { try {
lfs.mkdir(new Path(logDir), null, true); fs.mkdir(new Path(logDir), null, true);
} catch (FileAlreadyExistsException fe) { } catch (FileAlreadyExistsException fe) {
// do nothing // do nothing
} catch (IOException e) { } catch (IOException e) {
@ -1355,6 +1356,57 @@ private void initializeLogDir(FileContext lfs, String logDir) {
} }
} }
private void cleanupLogDirs(FileContext fs, DeletionService del) {
for (String logDir : dirsHandler.getLogDirsForCleanup()) {
try {
cleanupLogDir(fs, del, logDir);
} catch (IOException e) {
LOG.warn("failed to cleanup app log dir " + logDir, e);
}
}
}
private void cleanupLogDir(FileContext fs, DeletionService del,
String logDir) throws IOException {
if (!fs.util().exists(new Path(logDir))){
return;
}
renameAppLogDir(logDir);
deleteAppLogDir(fs, del, logDir);
}
private void renameAppLogDir(String logDir) throws IOException {
long currentTimeStamp = System.currentTimeMillis();
RemoteIterator<FileStatus> fileStatuses =
lfs.listStatus(new Path(logDir));
if (fileStatuses != null) {
while (fileStatuses.hasNext()) {
FileStatus fileStatus = fileStatuses.next();
String appName = fileStatus.getPath().getName();
if (appName.matches("^application_\\d+_\\d+$")) {
lfs.rename(new Path(logDir, appName),
new Path(logDir, appName + "_DEL_" + currentTimeStamp));
}
}
}
}
private void deleteAppLogDir(FileContext fs, DeletionService del,
String logDir) throws IOException {
RemoteIterator<FileStatus> fileStatuses =
fs.listStatus(new Path(logDir));
if (fileStatuses != null) {
while (fileStatuses.hasNext()) {
FileStatus fileStatus = fileStatuses.next();
String appName = fileStatus.getPath().getName();
if (appName.matches("^application_\\d+_\\d+_DEL_\\d+$")) {
LOG.info("delete app log dir," + appName);
del.delete(null, fileStatus.getPath());
}
}
}
}
private void cleanUpLocalDirs(FileContext lfs, DeletionService del) { private void cleanUpLocalDirs(FileContext lfs, DeletionService del) {
for (String localDir : dirsHandler.getLocalDirsForCleanup()) { for (String localDir : dirsHandler.getLocalDirsForCleanup()) {
cleanUpLocalDir(lfs, del, localDir); cleanUpLocalDir(lfs, del, localDir);