From 2e7b3684c1b4ae4e629759bd466bc4e37a090eb0 Mon Sep 17 00:00:00 2001 From: lsx Date: Fri, 9 Dec 2022 15:57:44 +0800 Subject: [PATCH] [feature] Adapt to the new version of Doris & Fix issue of excute shell timeout exception. Simply fix these problems and expect a more functional version. --- .../manager/agent/service/heartbeat/DorisInstanceOperator.java | 2 +- .../java/org/apache/doris/manager/agent/util/ShellUtil.java | 2 +- .../doris/manager/common/util/ServerAndAgentConstant.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/service/heartbeat/DorisInstanceOperator.java b/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/service/heartbeat/DorisInstanceOperator.java index ecfb40c..ea50a5f 100644 --- a/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/service/heartbeat/DorisInstanceOperator.java +++ b/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/service/heartbeat/DorisInstanceOperator.java @@ -447,7 +447,7 @@ private void executePkgShellScriptWithBash(String scriptName, String runningDir, } private int executeShell(String shellCmd, Map environment) throws Exception { - return ShellUtil.executeShellWithoutOutput(shellCmd, new int[]{0}, 1, environment); + return ShellUtil.executeShellWithoutOutput(shellCmd, new int[]{0}, ServerAndAgentConstant.SHELL_TIME_OUT, environment); } private void createDataPath(String path) throws Exception { diff --git a/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/util/ShellUtil.java b/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/util/ShellUtil.java index c03b1be..f4128cb 100644 --- a/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/util/ShellUtil.java +++ b/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/util/ShellUtil.java @@ -64,7 +64,7 @@ public static int executeShellWithoutOutput(String shellCmd, int[] succExitValue CommandLine cmdLine = CommandLine.parse(shellCmd); DefaultExecutor executor = new DefaultExecutor(); - // If the running time exceeds 1 minute, it will be judged as execution failure + // If the running time exceeds shellTimeout minute, it will be judged as execution failure ExecuteWatchdog watchdog = new ExecuteWatchdog(shellTimeout * 60 * 1000); executor.setWatchdog(watchdog); executor.setExitValues(succExitValue); diff --git a/manager/dm-common/src/main/java/org/apache/doris/manager/common/util/ServerAndAgentConstant.java b/manager/dm-common/src/main/java/org/apache/doris/manager/common/util/ServerAndAgentConstant.java index eacfd4e..46f31a3 100644 --- a/manager/dm-common/src/main/java/org/apache/doris/manager/common/util/ServerAndAgentConstant.java +++ b/manager/dm-common/src/main/java/org/apache/doris/manager/common/util/ServerAndAgentConstant.java @@ -49,7 +49,7 @@ private ServerAndAgentConstant() { public static final String BAIDU_BROKER_PID_FILE = "baidu_doris_broker.pid"; public static final String FE_PID_NAME = "PaloFe"; - public static final String BE_PID_NAME = "palo_be"; + public static final String BE_PID_NAME = "doris_be"; public static final String BROKER_PID_NAME = "BrokerBootstrap"; public static final String FE_START_SCRIPT = "start_fe.sh"; @@ -66,6 +66,7 @@ private ServerAndAgentConstant() { public static final String BAIDU_BROKER_CONF_FILE = "baidu_doris_broker.conf"; public static final String PACKAGE_DOWNLOAD_SCRIPT = "download_doris.sh"; + public static final int SHELL_TIME_OUT = 2; // TODO:Later, it will be defined uniformly through the cluster module service template public static final String FE_JDBC_SERVICE = "fe_jdbc";