Repository: hadoop Updated Branches: refs/heads/trunk 777877d07 -> d3afd730a
YARN-2662. TestCgroupsLCEResourcesHandler leaks file descriptors. Contributed by Chris Nauroth. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d3afd730 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d3afd730 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d3afd730 Branch: refs/heads/trunk Commit: d3afd730acfa380ab5032be5ee296c5d73744518 Parents: 777877d Author: cnauroth <[email protected]> Authored: Thu Oct 9 22:44:44 2014 -0700 Committer: cnauroth <[email protected]> Committed: Thu Oct 9 22:44:44 2014 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 2 ++ .../nodemanager/util/TestCgroupsLCEResourcesHandler.java | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d3afd730/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 8dd9cff..578ab6e 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -604,6 +604,8 @@ Release 2.6.0 - UNRELEASED YARN-2649. Fixed TestAMRMRPCNodeUpdates test failure. (Ming Ma via jianhe) + YARN-2662. TestCgroupsLCEResourcesHandler leaks file descriptors. (cnauroth) + BREAKDOWN OF YARN-913 SUBTASKS AND RELATED JIRAS YARN-2652 Add hadoop-yarn-registry package under hadoop-yarn. (stevel) http://git-wip-us.apache.org/repos/asf/hadoop/blob/d3afd730/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/util/TestCgroupsLCEResourcesHandler.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/util/TestCgroupsLCEResourcesHandler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/util/TestCgroupsLCEResourcesHandler.java index de2af37..d0bceee 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/util/TestCgroupsLCEResourcesHandler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/util/TestCgroupsLCEResourcesHandler.java @@ -165,10 +165,11 @@ public class TestCgroupsLCEResourcesHandler { private int readIntFromFile(File targetFile) throws IOException { Scanner scanner = new Scanner(targetFile); - if (scanner.hasNextInt()) { - return scanner.nextInt(); + try { + return scanner.hasNextInt() ? scanner.nextInt() : -1; + } finally { + scanner.close(); } - return -1; } @Test
