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

YARN-4581. AHS writer thread leak makes RM crash while RM is recovering. Contributed by sandflee. 

(cherry picked from commit fc6d3a3b23)

Conflicts:

	hadoop-yarn-project/CHANGES.txt
(cherry picked from commit e09222306f)

Conflicts:

	hadoop-yarn-project/CHANGES.txt
This commit is contained in:
Junping Du 2016-01-15 08:40:56 -08:00
parent d01362f10f
commit f7d3870034
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -63,6 +63,9 @@ Release 2.7.3 - UNRELEASED
YARN-4121. Fix typos in capacity scheduler documentation. YARN-4121. Fix typos in capacity scheduler documentation.
(Kai Sasaki via vvasudev) (Kai Sasaki via vvasudev)
YARN-4581. AHS writer thread leak makes RM crash while RM is recovering.
(sandflee via junping_du)
Release 2.7.2 - UNRELEASED Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java
View File

@ -734,12 +734,17 @@ public class FileSystemApplicationHistoryStore extends AbstractService
} else { } else {
fsdos = fs.create(historyFile); fsdos = fs.create(historyFile);
} }
try {
fs.setPermission(historyFile, HISTORY_FILE_UMASK); fs.setPermission(historyFile, HISTORY_FILE_UMASK);
writer = writer =
new TFile.Writer(fsdos, MIN_BLOCK_SIZE, getConfig().get( new TFile.Writer(fsdos, MIN_BLOCK_SIZE, getConfig().get(
YarnConfiguration.FS_APPLICATION_HISTORY_STORE_COMPRESSION_TYPE, YarnConfiguration.FS_APPLICATION_HISTORY_STORE_COMPRESSION_TYPE,
YarnConfiguration.DEFAULT_FS_APPLICATION_HISTORY_STORE_COMPRESSION_TYPE), null, YarnConfiguration.DEFAULT_FS_APPLICATION_HISTORY_STORE_COMPRESSION_TYPE), null,
getConfig()); getConfig());
} catch (IOException e) {
IOUtils.cleanup(LOG, fsdos);
throw e;
}
} }
public synchronized void close() { public synchronized void close() {