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

(cherry picked from commit d3afd730acfa380ab5032be5ee296c5d73744518)
(cherry picked from commit b81641a31050b6a5cf5db3af636125e0617ffd56)

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)

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