You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by GitBox <gi...@apache.org> on 2020/11/12 06:31:55 UTC
[GitHub] [incubator-dolphinscheduler] lenboo commented on a change in pull request #4042: [FIX-3900][server] kill multi yarn app in one job
lenboo commented on a change in pull request #4042:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/4042#discussion_r521867404
##########
File path: dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java
##########
@@ -38,368 +41,385 @@
import java.util.regex.Pattern;
/**
- * mainly used to get the start command line of a process.
+ * mainly used to get the start command line of a process.
*/
public class ProcessUtils {
- /**
- * logger.
- */
- private static final Logger logger = LoggerFactory.getLogger(ProcessUtils.class);
-
- /**
- * Initialization regularization, solve the problem of pre-compilation performance,
- * avoid the thread safety problem of multi-thread operation.
- */
- private static final Pattern MACPATTERN = Pattern.compile("-[+|-]-\\s(\\d+)");
-
- private static final Pattern WINDOWSATTERN = Pattern.compile("(\\d+)");
-
- /**
- * 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()]);
- SecurityManager security = System.getSecurityManager();
- boolean allowAmbiguousCommands = false;
- if (security == null) {
- allowAmbiguousCommands = true;
- String value = System.getProperty("jdk.lang.Process.allowAmbiguousCommands");
- if (value != null) {
- allowAmbiguousCommands = !"false".equalsIgnoreCase(value);
- }
- }
- if (allowAmbiguousCommands) {
+ /**
+ * logger.
+ */
+ private static final Logger logger = LoggerFactory.getLogger(ProcessUtils.class);
+
+ /**
+ * Initialization regularization, solve the problem of pre-compilation performance,
+ * avoid the thread safety problem of multi-thread operation.
+ */
+ private static final Pattern MACPATTERN = Pattern.compile("-[+|-]-\\s(\\d+)");
+
+ private static final Pattern WINDOWSATTERN = Pattern.compile("(\\d+)");
+
+ /**
+ * 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[0]);
+ SecurityManager security = System.getSecurityManager();
+ boolean allowAmbiguousCommands = false;
+ if (security == null) {
+ allowAmbiguousCommands = true;
+ String value = System.getProperty("jdk.lang.Process.allowAmbiguousCommands");
+ if (value != null) {
+ allowAmbiguousCommands = !"false".equalsIgnoreCase(value);
+ }
+ }
+ if (allowAmbiguousCommands) {
- String executablePath = new File(cmd[0]).getPath();
+ String executablePath = new File(cmd[0]).getPath();
- if (needsEscaping(VERIFICATION_LEGACY, executablePath)) {
- executablePath = quoteString(executablePath);
- }
+ if (needsEscaping(VERIFICATION_LEGACY, executablePath)) {
+ executablePath = quoteString(executablePath);
+ }
- cmdstr = createCommandLine(
- VERIFICATION_LEGACY, executablePath, cmd);
- } else {
- String executablePath;
- try {
- executablePath = getExecutablePath(cmd[0]);
- } catch (IllegalArgumentException e) {
+ cmdstr = createCommandLine(
+ VERIFICATION_LEGACY, executablePath, cmd);
+ } else {
+ String executablePath;
+ try {
+ executablePath = getExecutablePath(cmd[0]);
+ } catch (IllegalArgumentException e) {
- StringBuilder join = new StringBuilder();
- for (String s : cmd) {
- join.append(s).append(' ');
- }
+ StringBuilder join = new StringBuilder();
+ for (String s : cmd) {
+ join.append(s).append(' ');
+ }
- cmd = getTokensFromCommand(join.toString());
- executablePath = getExecutablePath(cmd[0]);
+ cmd = getTokensFromCommand(join.toString());
+ executablePath = getExecutablePath(cmd[0]);
- // Check new executable name once more
- if (security != null) {
- security.checkExec(executablePath);
- }
- }
+ // Check new executable name once more
+ if (security != null) {
+ security.checkExec(executablePath);
+ }
+ }
- cmdstr = createCommandLine(
+ cmdstr = createCommandLine(
- isShellFile(executablePath) ? VERIFICATION_CMD_BAT : VERIFICATION_WIN32, quoteString(executablePath), cmd);
- }
- return cmdstr;
- }
-
- /**
- * get executable path.
- *
- * @param path path
- * @return executable path
- */
- private static String getExecutablePath(String path) {
- boolean pathIsQuoted = isQuoted(true, path, "Executable name has embedded quote, split the arguments");
-
- File fileToRun = new File(pathIsQuoted ? path.substring(1, path.length() - 1) : path);
- return fileToRun.getPath();
- }
-
- /**
- * whether is shell file.
- *
- * @param executablePath executable path
- * @return true if endsWith .CMD or .BAT
- */
- private static boolean isShellFile(String executablePath) {
- String upPath = executablePath.toUpperCase();
- return (upPath.endsWith(".CMD") || upPath.endsWith(".BAT"));
- }
-
- /**
- * quote string.
- *
- * @param arg argument
- * @return format arg
- */
- private static String quoteString(String arg) {
- StringBuilder argbuf = new StringBuilder(arg.length() + 2);
- return argbuf.append('"').append(arg).append('"').toString();
- }
-
- /**
- * get tokens from command.
- *
- * @param command command
- * @return token string array
- */
- private static String[] getTokensFromCommand(String command) {
- ArrayList<String> matchList = new ArrayList<>(8);
- Matcher regexMatcher = LazyPattern.PATTERN.matcher(command);
- while (regexMatcher.find()) {
- matchList.add(regexMatcher.group());
- }
- return matchList.toArray(new String[matchList.size()]);
- }
-
- /**
- * Lazy Pattern.
- */
- private static class LazyPattern {
- // Escape-support version:
- // "(\")((?:\\\\\\1|.)+?)\\1|([^\\s\"]+)";
- private static final Pattern PATTERN = Pattern.compile("[^\\s\"]+|\"[^\"]*\"");
- }
-
- /**
- * verification cmd bat.
- */
- private static final int VERIFICATION_CMD_BAT = 0;
-
- /**
- * verification win32.
- */
- private static final int VERIFICATION_WIN32 = 1;
-
- /**
- * verification legacy.
- */
- private static final int VERIFICATION_LEGACY = 2;
-
- /**
- * escape verification.
- */
- private static final char[][] ESCAPE_VERIFICATION = {{' ', '\t', '<', '>', '&', '|', '^'},
-
- {' ', '\t', '<', '>'}, {' ', '\t'}};
-
- /**
- * create command line.
- * @param verificationType verification type
- * @param executablePath executable path
- * @param cmd cmd
- * @return command line
- */
- private static String createCommandLine(int verificationType, final String executablePath, final String[] cmd) {
- StringBuilder cmdbuf = new StringBuilder(80);
-
- cmdbuf.append(executablePath);
-
- for (int i = 1; i < cmd.length; ++i) {
- cmdbuf.append(' ');
- String s = cmd[i];
- if (needsEscaping(verificationType, s)) {
- cmdbuf.append('"').append(s);
-
- if ((verificationType != VERIFICATION_CMD_BAT) && s.endsWith("\\")) {
- cmdbuf.append('\\');
+ isShellFile(executablePath) ? VERIFICATION_CMD_BAT : VERIFICATION_WIN32, quoteString(executablePath), cmd);
}
- cmdbuf.append('"');
- } else {
- cmdbuf.append(s);
- }
+ return cmdstr;
}
- return cmdbuf.toString();
- }
-
- /**
- * whether is quoted.
- * @param noQuotesInside
- * @param arg
- * @param errorMessage
- * @return boolean
- */
- private static boolean isQuoted(boolean noQuotesInside, String arg, String errorMessage) {
- int lastPos = arg.length() - 1;
- if (lastPos >= 1 && arg.charAt(0) == '"' && arg.charAt(lastPos) == '"') {
- // The argument has already been quoted.
- if (noQuotesInside) {
- if (arg.indexOf('"', 1) != lastPos) {
- // There is ["] inside.
- throw new IllegalArgumentException(errorMessage);
- }
- }
- return true;
+
+ /**
+ * get executable path.
+ *
+ * @param path path
+ * @return executable path
+ */
+ private static String getExecutablePath(String path) {
+ boolean pathIsQuoted = isQuoted(true, path, "Executable name has embedded quote, split the arguments");
+
+ File fileToRun = new File(pathIsQuoted ? path.substring(1, path.length() - 1) : path);
+ return fileToRun.getPath();
}
- if (noQuotesInside) {
- if (arg.indexOf('"') >= 0) {
- // There is ["] inside.
- throw new IllegalArgumentException(errorMessage);
- }
+
+ /**
+ * whether is shell file.
+ *
+ * @param executablePath executable path
+ * @return true if endsWith .CMD or .BAT
+ */
+ private static boolean isShellFile(String executablePath) {
+ String upPath = executablePath.toUpperCase();
+ return (upPath.endsWith(".CMD") || upPath.endsWith(".BAT"));
}
- return false;
- }
-
- /**
- * whether needs escaping.
- *
- * @param verificationType verification type
- * @param arg arg
- * @return boolean
- */
- private static boolean needsEscaping(int verificationType, String arg) {
-
- boolean argIsQuoted = isQuoted((verificationType == VERIFICATION_CMD_BAT), arg, "Argument has embedded quote, use the explicit CMD.EXE call.");
-
- if (!argIsQuoted) {
- char[] testEscape = ESCAPE_VERIFICATION[verificationType];
- for (int i = 0; i < testEscape.length; ++i) {
- if (arg.indexOf(testEscape[i]) >= 0) {
- return true;
- }
- }
+
+ /**
+ * quote string.
+ *
+ * @param arg argument
+ * @return format arg
+ */
+ private static String quoteString(String arg) {
+ return '"' + arg + '"';
}
- return false;
- }
-
- /**
- * kill yarn application.
- *
- * @param appIds app id list
- * @param logger logger
- * @param tenantCode tenant code
- * @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);
- String commandFile = String
- .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");
+
+ /**
+ * get tokens from command.
+ *
+ * @param command command
+ * @return token string array
+ */
+ private static String[] getTokensFromCommand(String command) {
+ ArrayList<String> matchList = new ArrayList<>(8);
+ Matcher regexMatcher = LazyPattern.PATTERN.matcher(command);
+ while (regexMatcher.find()) {
+ matchList.add(regexMatcher.group());
}
- sb.append("\n\n");
- sb.append(cmd);
+ return matchList.toArray(new String[0]);
+ }
- File f = new File(commandFile);
+ /**
+ * Lazy Pattern.
+ */
+ private static class LazyPattern {
+ // Escape-support version:
+ // "(\")((?:\\\\\\1|.)+?)\\1|([^\\s\"]+)";
+ private static final Pattern PATTERN = Pattern.compile("[^\\s\"]+|\"[^\"]*\"");
+ }
- if (!f.exists()) {
- FileUtils.writeStringToFile(new File(commandFile), sb.toString(), StandardCharsets.UTF_8);
+ /**
+ * verification cmd bat.
+ */
+ private static final int VERIFICATION_CMD_BAT = 0;
+
+ /**
+ * verification win32.
+ */
+ private static final int VERIFICATION_WIN32 = 1;
+
+ /**
+ * verification legacy.
+ */
+ private static final int VERIFICATION_LEGACY = 2;
+
+ /**
+ * escape verification.
+ */
+ private static final char[][] ESCAPE_VERIFICATION = {{' ', '\t', '<', '>', '&', '|', '^'},
+
+ {' ', '\t', '<', '>'}, {' ', '\t'}};
+
+ /**
+ * create command line.
+ *
+ * @param verificationType verification type
+ * @param executablePath executable path
+ * @param cmd cmd
+ * @return command line
+ */
+ private static String createCommandLine(int verificationType, final String executablePath, final String[] cmd) {
+ StringBuilder cmdbuf = new StringBuilder(80);
+
+ cmdbuf.append(executablePath);
+
+ for (int i = 1; i < cmd.length; ++i) {
+ cmdbuf.append(' ');
+ String s = cmd[i];
+ if (needsEscaping(verificationType, s)) {
+ cmdbuf.append('"').append(s);
+
+ if ((verificationType != VERIFICATION_CMD_BAT) && s.endsWith("\\")) {
+ cmdbuf.append('\\');
+ }
+ cmdbuf.append('"');
+ } else {
+ cmdbuf.append(s);
+ }
}
+ return cmdbuf.toString();
+ }
- String runCmd = "sh " + commandFile;
- if (StringUtils.isNotEmpty(tenantCode)) {
- runCmd = "sudo -u " + tenantCode + " " + runCmd;
+ /**
+ * whether is quoted.
+ *
+ * @param noQuotesInside no quotes inside
+ * @param arg arg
+ * @param errorMessage error message
+ * @return boolean
+ */
+ private static boolean isQuoted(boolean noQuotesInside, String arg, String errorMessage) {
+ int lastPos = arg.length() - 1;
+ if (lastPos >= 1 && arg.charAt(0) == '"' && arg.charAt(lastPos) == '"') {
+ // The argument has already been quoted.
+ if (noQuotesInside) {
+ if (arg.indexOf('"', 1) != lastPos) {
+ // There is ["] inside.
+ throw new IllegalArgumentException(errorMessage);
+ }
+ }
+ return true;
+ }
+ if (noQuotesInside) {
+ if (arg.indexOf('"') >= 0) {
+ // There is ["] inside.
+ throw new IllegalArgumentException(errorMessage);
+ }
}
+ return false;
+ }
- logger.info("kill cmd:{}", runCmd);
+ /**
+ * whether needs escaping.
+ *
+ * @param verificationType verification type
+ * @param arg arg
+ * @return boolean
+ */
+ private static boolean needsEscaping(int verificationType, String arg) {
+
+ boolean argIsQuoted = isQuoted((verificationType == VERIFICATION_CMD_BAT), arg, "Argument has embedded quote, use the explicit CMD.EXE call.");
+
+ if (!argIsQuoted) {
+ char[] testEscape = ESCAPE_VERIFICATION[verificationType];
+ for (char c : testEscape) {
+ if (arg.indexOf(c) >= 0) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
- Runtime.getRuntime().exec(runCmd);
- } catch (Exception e) {
- logger.error("kill application error", e);
- }
+ /**
+ * kill yarn application.
+ *
+ * @param appIds app id list
+ * @param logger logger
+ * @param tenantCode tenant code
+ * @param executePath execute path
+ */
+ public static void cancelApplication(List<String> appIds, Logger logger, String tenantCode, String executePath) {
+ if (CollectionUtils.isNotEmpty(appIds)) {
+
Review comment:
i think we should reduce its cognitive complexity here.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org