[Improvement-15719] Remove the useless methods in ProcessUtils (#15720)

apache · Mar 18, 2024 · b652967 · b652967
1 parent 0cce220
commit b652967
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 193 deletions.
diff --git a/...heduler-service/src/main/java/org/apache/dolphinscheduler/service/utils/ProcessUtils.java b/...heduler-service/src/main/java/org/apache/dolphinscheduler/service/utils/ProcessUtils.java
@@ -19,142 +19,27 @@
 
 import org.apache.dolphinscheduler.common.constants.Constants;
 import org.apache.dolphinscheduler.common.utils.FileUtils;
-import org.apache.dolphinscheduler.common.utils.OSUtils;
-import org.apache.dolphinscheduler.common.utils.PropertyUtils;
 import org.apache.dolphinscheduler.plugin.task.api.TaskConstants;
 import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.SystemUtils;
 
-import java.io.File;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
 
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 
-import org.slf4j.Logger;
-
 /**
  * mainly used to get the start command line of a process.
  */
 @Slf4j
 public class ProcessUtils {
 
-    /**
-     * 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+)");
-
-    /**
-     * Expression of PID recognition in Windows scene
-     */
-    private static final Pattern WINDOWSATTERN = Pattern.compile("\\w+\\((\\d+)\\)");
-
-    /**
-     * get kerberos init command
-     */
-    static String getKerberosInitCommand() {
-        log.info("get kerberos init command");
-        StringBuilder kerberosCommandBuilder = new StringBuilder();
-        boolean hadoopKerberosState =
-                PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE, false);
-        if (hadoopKerberosState) {
-            kerberosCommandBuilder.append("export KRB5_CONFIG=")
-                    .append(PropertyUtils.getString(Constants.JAVA_SECURITY_KRB5_CONF_PATH))
-                    .append("\n\n")
-                    .append(String.format("kinit -k -t %s %s || true",
-                            PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_PATH),
-                            PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_USERNAME)))
-                    .append("\n\n");
-            log.info("kerberos init command: {}", kerberosCommandBuilder);
-        }
-        return kerberosCommandBuilder.toString();
-    }
-
-    /**
-     * build kill command for yarn application
-     *
-     * @param logger logger
-     * @param tenantCode tenant code
-     * @param appId app id
-     * @param commandFile command file
-     * @param cmd cmd
-     */
-    private static void execYarnKillCommand(Logger logger, String tenantCode, String appId, String commandFile,
-                                            String cmd) {
-        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 ").append(CommonUtils.getSystemEnvPath()).append("\n");
-            }
-            sb.append("\n\n");
-            sb.append(cmd);
-
-            File f = new File(commandFile);
-
-            if (!f.exists()) {
-                org.apache.commons.io.FileUtils.writeStringToFile(new File(commandFile), sb.toString(),
-                        StandardCharsets.UTF_8);
-            }
-
-            String runCmd = String.format("%s %s", Constants.SH, commandFile);
-            runCmd = OSUtils.getSudoCmd(tenantCode, runCmd);
-            log.info("kill cmd:{}", runCmd);
-            OSUtils.exeCmd(runCmd);
-        } catch (Exception e) {
-            log.error(String.format("Kill yarn application app id [%s] failed: [%s]", appId, e.getMessage()));
-        }
-    }
-
-    /**
-     * get pids str.
-     *
-     * @param processId process id
-     * @return pids pid String
-     * @throws Exception exception
-     */
-    public static String getPidsStr(int processId) throws Exception {
-        List<String> pidList = new ArrayList<>();
-        Matcher mat = null;
-        // pstree pid get sub pids
-        if (SystemUtils.IS_OS_MAC) {
-            String pids = OSUtils.exeCmd(String.format("%s -sp %d", Constants.PSTREE, processId));
-            if (null != pids) {
-                mat = MACPATTERN.matcher(pids);
-            }
-        } else {
-            String pids = OSUtils.exeCmd(String.format("%s -p %d", Constants.PSTREE, processId));
-            if (null != pids) {
-                mat = WINDOWSATTERN.matcher(pids);
-            }
-        }
-
-        if (null != mat) {
-            while (mat.find()) {
-                pidList.add(mat.group(1));
-            }
-        }
-
-        if (OSUtils.isSudoEnable() && !pidList.isEmpty()) {
-            pidList = pidList.subList(1, pidList.size());
-        }
-        return String.join(" ", pidList).trim();
-    }
-
     /**
      * find logs and kill yarn tasks.
      *

diff --git a/...ler-service/src/test/java/org/apache/dolphinscheduler/service/utils/ProcessUtilsTest.java b/...ler-service/src/test/java/org/apache/dolphinscheduler/service/utils/ProcessUtilsTest.java