You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ju...@apache.org on 2016/01/15 17:32:10 UTC
hadoop git commit: YARN-4581. AHS writer thread leak makes RM crash
while RM is recovering. Contributed by sandflee.
Repository: hadoop
Updated Branches:
refs/heads/trunk f7736f464 -> fc6d3a3b2
YARN-4581. AHS writer thread leak makes RM crash while RM is recovering. Contributed by sandflee.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fc6d3a3b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fc6d3a3b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fc6d3a3b
Branch: refs/heads/trunk
Commit: fc6d3a3b234efff2b0b646c31a4e6ff0a5118ef9
Parents: f7736f4
Author: Junping Du <ju...@apache.org>
Authored: Fri Jan 15 08:40:56 2016 -0800
Committer: Junping Du <ju...@apache.org>
Committed: Fri Jan 15 08:40:56 2016 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 9 +++++++++
.../FileSystemApplicationHistoryStore.java | 17 +++++++++++------
2 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc6d3a3b/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 0af7715..9dbed10 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1259,6 +1259,9 @@ Release 2.8.0 - UNRELEASED
failure-threshold" should be app specific rather than a setting for whole
YARN cluster. (Sunil G via rohithsharmaks)
+ YARN-4581. AHS writer thread leak makes RM crash while RM is recovering.
+ (sandflee via junping_du)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
@@ -1323,6 +1326,9 @@ Release 2.7.3 - UNRELEASED
YARN-4414. Nodemanager connection errors are retried at multiple levels
(Chang Li via jlowe)
+ YARN-4581. AHS writer thread leak makes RM crash while RM is recovering.
+ (sandflee via junping_du)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
@@ -2209,6 +2215,9 @@ Release 2.6.4 - UNRELEASED
YARN-4414. Nodemanager connection errors are retried at multiple levels
(Chang Li via jlowe)
+ YARN-4581. AHS writer thread leak makes RM crash while RM is recovering.
+ (sandflee via junping_du)
+
Release 2.6.3 - 2015-12-17
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc6d3a3b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java
index 6d76864..c340b19 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java
@@ -734,12 +734,17 @@ public class FileSystemApplicationHistoryStore extends AbstractService
} else {
fsdos = fs.create(historyFile);
}
- fs.setPermission(historyFile, HISTORY_FILE_UMASK);
- writer =
- new TFile.Writer(fsdos, MIN_BLOCK_SIZE, getConfig().get(
- YarnConfiguration.FS_APPLICATION_HISTORY_STORE_COMPRESSION_TYPE,
- YarnConfiguration.DEFAULT_FS_APPLICATION_HISTORY_STORE_COMPRESSION_TYPE), null,
- getConfig());
+ try {
+ fs.setPermission(historyFile, HISTORY_FILE_UMASK);
+ writer =
+ new TFile.Writer(fsdos, MIN_BLOCK_SIZE, getConfig().get(
+ YarnConfiguration.FS_APPLICATION_HISTORY_STORE_COMPRESSION_TYPE,
+ YarnConfiguration.DEFAULT_FS_APPLICATION_HISTORY_STORE_COMPRESSION_TYPE), null,
+ getConfig());
+ } catch (IOException e) {
+ IOUtils.cleanup(LOG, fsdos);
+ throw e;
+ }
}
public synchronized void close() {