Repository: hadoop Updated Branches: refs/heads/trunk 0c6638c2e -> 132d909d4
YARN-3594. WintuilsProcessStubExecutor.startStreamReader leaks streams. Contributed by Lars Francke. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/132d909d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/132d909d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/132d909d Branch: refs/heads/trunk Commit: 132d909d4a6509af9e63e24cbb719be10006b6cd Parents: 0c6638c Author: Junping Du <[email protected]> Authored: Fri May 22 04:23:25 2015 -0700 Committer: Junping Du <[email protected]> Committed: Fri May 22 04:23:25 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../server/nodemanager/WindowsSecureContainerExecutor.java | 9 +++------ 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/132d909d/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 59d6ee6..c98bfe3 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -256,6 +256,9 @@ Release 2.8.0 - UNRELEASED YARN-3684. Changed ContainerExecutor's primary lifecycle methods to use a more extensible mechanism of context objects. (Sidharta Seethana via vinodkv) + YARN-3594. WintuilsProcessStubExecutor.startStreamReader leaks streams. + (Lars Francke via junping_du) + OPTIMIZATIONS YARN-3339. TestDockerContainerExecutor should pull a single image and not http://git-wip-us.apache.org/repos/asf/hadoop/blob/132d909d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java index 0aa9d03..fd2e31b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java @@ -501,17 +501,14 @@ public class WindowsSecureContainerExecutor extends DefaultContainerExecutor { @Override public void run() { - try - { - BufferedReader lines = new BufferedReader( - new InputStreamReader(stream, Charset.forName("UTF-8"))); + try (BufferedReader lines = new BufferedReader( + new InputStreamReader(stream, Charset.forName("UTF-8")))) { char[] buf = new char[512]; int nRead; while ((nRead = lines.read(buf, 0, buf.length)) > 0) { output.append(buf, 0, nRead); } - } - catch(Throwable t) { + } catch (Throwable t) { LOG.error("Error occured reading the process stdout", t); } }
