Repository: hadoop Updated Branches: refs/heads/branch-2.6 308e33685 -> 281041a57
YARN-2662. TestCgroupsLCEResourcesHandler leaks file descriptors. Contributed by Chris Nauroth. (cherry picked from commit d3afd730acfa380ab5032be5ee296c5d73744518) (cherry picked from commit b81641a31050b6a5cf5db3af636125e0617ffd56) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/281041a5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/281041a5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/281041a5 Branch: refs/heads/branch-2.6 Commit: 281041a57e56708a0ec6767b44d88f3765c57c94 Parents: 308e336 Author: cnauroth <[email protected]> Authored: Thu Oct 9 22:44:44 2014 -0700 Committer: cnauroth <[email protected]> Committed: Thu Oct 9 22:49:00 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/281041a5/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 30ec40f..674909c 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -541,6 +541,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/281041a5/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
