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 zh...@apache.org on 2014/12/29 19:40:15 UTC
[3/6] hadoop git commit: YARN-2988. Graph#save() may leak file
descriptors. (Ted Yu via ozawa)
YARN-2988. Graph#save() may leak file descriptors. (Ted Yu via ozawa)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cda156b9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cda156b9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cda156b9
Branch: refs/heads/HDFS-EC
Commit: cda156b9a143b3244c6a8bdc867e221eb81b844b
Parents: 860f06b
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Thu Dec 25 12:48:24 2014 +0900
Committer: Zhe Zhang <zh...@apache.org>
Committed: Mon Dec 29 10:34:38 2014 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 2 ++
.../src/main/java/org/apache/hadoop/yarn/state/Graph.java | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cda156b9/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index f0d4af6..5dfb278 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -284,6 +284,8 @@ Release 2.7.0 - UNRELEASED
YARN-2946. Fixed potential deadlock in RMStateStore. (Rohith Sharmaks via
jianhe)
+ YARN-2988. Graph#save() may leak file descriptors. (Ted Yu via ozawa)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cda156b9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/Graph.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/Graph.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/Graph.java
index a090194..390deb2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/Graph.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/Graph.java
@@ -188,10 +188,10 @@ public class Graph {
}
public void save(String filepath) throws IOException {
- OutputStreamWriter fout = new OutputStreamWriter(
- new FileOutputStream(filepath), Charset.forName("UTF-8"));
- fout.write(generateGraphViz());
- fout.close();
+ try (OutputStreamWriter fout = new OutputStreamWriter(
+ new FileOutputStream(filepath), Charset.forName("UTF-8"));) {
+ fout.write(generateGraphViz());
+ }
}
public static List<Edge> combineEdges(List<Edge> edges) {