fix #3900 kill multi yarn app in one job

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java

@@ -18,8 +18,11 @@
 package org.apache.dolphinscheduler.server.utils;
 
 import org.apache.dolphinscheduler.common.Constants;
+import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
+import org.apache.dolphinscheduler.common.utils.CollectionUtils;
 import org.apache.dolphinscheduler.common.utils.CommonUtils;
 import org.apache.dolphinscheduler.common.utils.FileUtils;
+import org.apache.dolphinscheduler.common.utils.HadoopUtils;
 import org.apache.dolphinscheduler.common.utils.LoggerUtils;
 import org.apache.dolphinscheduler.common.utils.OSUtils;
 import org.apache.dolphinscheduler.common.utils.StringUtils;
@@ -56,12 +59,13 @@ public class ProcessUtils {
 
     /**
      * build command line characters.
+     *
      * @param commandList command list
      * @return command
      */
     public static String buildCommandStr(List<String> commandList) {
         String cmdstr;
-    String[] cmd = commandList.toArray(new String[commandList.size()]);
+        String[] cmd = (String[]) commandList.toArray();
         SecurityManager security = System.getSecurityManager();
         boolean allowAmbiguousCommands = false;
         if (security == null) {
@@ -139,8 +143,7 @@ public class ProcessUtils {
      * @return format arg
      */
     private static String quoteString(String arg) {
-    StringBuilder argbuf = new StringBuilder(arg.length() + 2);
-    return argbuf.append('"').append(arg).append('"').toString();
+        return '"' + arg + '"';
     }
 
     /**
@@ -155,7 +158,7 @@ public class ProcessUtils {
         while (regexMatcher.find()) {
             matchList.add(regexMatcher.group());
         }
-    return matchList.toArray(new String[matchList.size()]);
+        return (String[]) matchList.toArray();
     }
 
     /**
@@ -191,6 +194,7 @@ public class ProcessUtils {
 
     /**
      * create command line.
+     *
      * @param verificationType verification type
      * @param executablePath   executable path
      * @param cmd              cmd
@@ -220,9 +224,10 @@ public class ProcessUtils {
 
     /**
      * whether is quoted.
-   * @param noQuotesInside
-   * @param arg
-   * @param errorMessage
+     *
+     * @param noQuotesInside no quotes inside
+     * @param arg            arg
+     * @param errorMessage   error message
      * @return boolean
      */
     private static boolean isQuoted(boolean noQuotesInside, String arg, String errorMessage) {
@@ -259,8 +264,8 @@ public class ProcessUtils {
 
         if (!argIsQuoted) {
             char[] testEscape = ESCAPE_VERIFICATION[verificationType];
-      for (int i = 0; i < testEscape.length; ++i) {
-        if (arg.indexOf(testEscape[i]) >= 0) {
+            for (char c : testEscape) {
+                if (arg.indexOf(c) >= 0) {
                     return true;
                 }
             }
@@ -277,18 +282,23 @@ public class ProcessUtils {
      * @param executePath execute path
      */
     public static void cancelApplication(List<String> appIds, Logger logger, String tenantCode, String executePath) {
-    if (appIds.size() > 0) {
-      String appid = appIds.get(appIds.size() - 1);
+        if (CollectionUtils.isNotEmpty(appIds)) {
+
+            for (String appId : appIds) {
+                try {
+                    ExecutionStatus applicationStatus = HadoopUtils.getInstance().getApplicationStatus(appId);
+
+                    if (!applicationStatus.typeIsFinished()) {
                         String commandFile = String
-              .format("%s/%s.kill", executePath, appid);
-      String cmd = "yarn application -kill " + appid;
+                            .format("%s/%s.kill", executePath, appId);
+                        String cmd = "yarn application -kill " + appId;
                         try {
                             StringBuilder sb = new StringBuilder();
                             sb.append("#!/bin/sh\n");
                             sb.append("BASEDIR=$(cd `dirname $0`; pwd)\n");
                             sb.append("cd $BASEDIR\n");
                             if (CommonUtils.getSystemEnvPath() != null) {
-          sb.append("source " + CommonUtils.getSystemEnvPath() + "\n");
+                                sb.append("source ").append(CommonUtils.getSystemEnvPath()).append("\n");
                             }
                             sb.append("\n\n");
                             sb.append(cmd);
@@ -308,7 +318,12 @@ public class ProcessUtils {
 
                             Runtime.getRuntime().exec(runCmd);
                         } catch (Exception e) {
-        logger.error("kill application error", e);
+                            logger.error(String.format("Kill yarn application app id [%s] failed: [%s]", appId, e.getMessage()));
+                        }
+                    }
+                } catch (Exception e) {
+                    logger.error(String.format("Get yarn application app id [%s] status failed: [%s]", appId, e.getMessage()));
+                }
             }
         }
     }
@@ -375,7 +390,7 @@ public class ProcessUtils {
         try {
             Thread.sleep(Constants.SLEEP_TIME_MILLIS);
             LogClientService logClient = null;
-      String log = null;
+            String log;
             try {
                 logClient = new LogClientService();
                 log = logClient.viewLog(Host.of(taskExecutionContext.getHost()).getIp(),