Fix process resource release issue

microsoft · Sep 17, 2023 · 3d85bc4 · 3d85bc4
1 parent 9d369ae
commit 3d85bc4
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 19 deletions.
diff --git a/agent/src/main/java/com/microsoft/hydralab/agent/runner/smart/SmartTestUtil.java b/agent/src/main/java/com/microsoft/hydralab/agent/runner/smart/SmartTestUtil.java
@@ -36,22 +36,21 @@ public SmartTestUtil(String location) {
         stringFolderPath = testBaseDir.getAbsolutePath() + "/" + Const.SmartTestConfig.STRING_FOLDER_NAME
                 + "/";
 
-        try {
-            InputStream resourceAsStream = FileUtils.class.getClassLoader().getResourceAsStream(name);
+        File smartTestZip = new File(testBaseDir, name);
+        File smartTestFolder = new File(testBaseDir, folderName);
+        if (smartTestZip.exists()) {
+            FileUtil.deleteFileRecursively(smartTestZip);
+        }
+        if (smartTestFolder.exists()) {
+            FileUtil.deleteFileRecursively(smartTestFolder);
+        }
+
+        try (InputStream resourceAsStream = FileUtils.class.getClassLoader().getResourceAsStream(name);
+             OutputStream out = new FileOutputStream(smartTestZip)) {
             if (resourceAsStream == null) {
                 return;
             }
-            File smartTestZip = new File(testBaseDir, name);
-            File smartTestFolder = new File(testBaseDir, folderName);
-            if (smartTestZip.exists()) {
-                FileUtil.deleteFileRecursively(smartTestZip);
-            }
-            if (smartTestFolder.exists()) {
-                FileUtil.deleteFileRecursively(smartTestFolder);
-            }
-            OutputStream out = new FileOutputStream(smartTestZip);
             IOUtils.copy(Objects.requireNonNull(resourceAsStream), out);
-            out.close();
             FileUtil.unzipFile(smartTestZip.getAbsolutePath(), testBaseDir.getAbsolutePath());
             if (smartTestZip.exists()) {
                 FileUtil.deleteFileRecursively(smartTestZip);
@@ -83,13 +82,21 @@ public String runPYFunction(SmartTestParam smartTestParam, Logger logger) throws
         for (String tempArg : runArgs) {
             logger.info(tempArg);
         }
+
         Process proc = Runtime.getRuntime().exec(runArgs);
-        SmartTestLog err = new SmartTestLog(proc.getErrorStream(), logger);
-        SmartTestLog out = new SmartTestLog(proc.getInputStream(), logger);
-        err.start();
-        out.start();
-        res = out.getContent();
-        proc.waitFor();
+
+        try (InputStream errorInput = proc.getErrorStream();
+             InputStream inputStream = proc.getInputStream()) {
+            SmartTestLog err = new SmartTestLog(errorInput, logger);
+            SmartTestLog out = new SmartTestLog(inputStream, logger);
+            err.start();
+            out.start();
+            proc.waitFor();
+            res = out.getContent();
+        } finally {
+            proc.destroy();
+        }
+
 
         return res;
     }

diff --git a/agent/src/main/java/com/microsoft/hydralab/agent/runner/xctest/XCTestRunner.java b/agent/src/main/java/com/microsoft/hydralab/agent/runner/xctest/XCTestRunner.java
@@ -115,8 +115,9 @@ private ArrayList<String> runXctest(TestRunDevice testRunDevice, Logger logger,
         String command = String.format(commFormat, deviceId, resultPath);
         testRun.addNewTimeTag("testRunStarted", System.currentTimeMillis() - testRun.getTestStartTimeMillis());
         ArrayList<String> result;
+        Process proc = null;
         try {
-            Process proc = Runtime.getRuntime().exec(command);
+            proc = Runtime.getRuntime().exec(command);
             XCTestCommandReceiver err = new XCTestCommandReceiver(proc.getErrorStream(), logger);
             XCTestCommandReceiver out = new XCTestCommandReceiver(proc.getInputStream(), logger);
             err.start();
@@ -126,6 +127,10 @@ private ArrayList<String> runXctest(TestRunDevice testRunDevice, Logger logger,
             testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 0, logger);
         } catch (Exception e) {
             throw new RuntimeException("Execute XCTest failed");
+        } finally {
+            if (proc != null) {
+                proc.destroy();
+            }
         }
 
         if (result == null) {