Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-2662. TestCgroupsLCEResourcesHandler leaks file descriptors. Contributed by Chris Nauroth. 

(cherry picked from commit d3afd730ac)
(cherry picked from commit b81641a310)
This commit is contained in:
cnauroth 2014-10-09 22:44:44 -07:00
parent 308e336853
commit 281041a57e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-yarn-project/CHANGES.txt
View File

@ -541,6 +541,8 @@ Release 2.6.0 - UNRELEASED
YARN-2649. Fixed TestAMRMRPCNodeUpdates test failure. (Ming Ma via jianhe) 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 BREAKDOWN OF YARN-913 SUBTASKS AND RELATED JIRAS
YARN-2652 Add hadoop-yarn-registry package under hadoop-yarn. (stevel) YARN-2652 Add hadoop-yarn-registry package under hadoop-yarn. (stevel)

7
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/util/TestCgroupsLCEResourcesHandler.java
View File

@ -165,10 +165,11 @@ public class TestCgroupsLCEResourcesHandler {
private int readIntFromFile(File targetFile) throws IOException { private int readIntFromFile(File targetFile) throws IOException {
Scanner scanner = new Scanner(targetFile); Scanner scanner = new Scanner(targetFile);
if (scanner.hasNextInt()) { try {
return scanner.nextInt(); return scanner.hasNextInt() ? scanner.nextInt() : -1;
} finally {
scanner.close();
} }
return -1;
} }
@Test @Test