(inlong) branch master updated: [INLONG-11402][Manager] Download the installer to a temporary directory (#11403)

[aloyszhang]

This is an automated email from the ASF dual-hosted git repository.

aloyszhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 23b148eb7f [INLONG-11402][Manager] Download the installer to a 
temporary directory (#11403)
23b148eb7f is described below

commit 23b148eb7fd02d4c15d51d659b8c7c5013c0c312
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Thu Oct 24 16:04:23 2024 +0800

    [INLONG-11402][Manager] Download the installer to a temporary directory 
(#11403)
---
 .../service/cluster/node/AgentClusterNodeInstallOperator.java  | 10 +++++++---
 .../org/apache/inlong/manager/service/cmd/CommandExecutor.java |  4 ++--
 .../apache/inlong/manager/service/cmd/CommandExecutorImpl.java |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/node/AgentClusterNodeInstallOperator.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/node/AgentClusterNodeInstallOperator.java
index 9853735193..49ee5dd669 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/node/AgentClusterNodeInstallOperator.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/node/AgentClusterNodeInstallOperator.java
@@ -108,6 +108,10 @@ public class AgentClusterNodeInstallOperator implements 
InlongClusterNodeInstall
             
clusterNodeEntityMapper.updateOperateLogById(clusterNodeRequest.getId(), 
NodeStatus.INSTALLING.getStatus(),
                     currentTime + InlongConstants.BLANK + "begin to install");
             AgentClusterNodeRequest request = (AgentClusterNodeRequest) 
clusterNodeRequest;
+            commandExecutor.mkdir(request, agentInstallTempPath);
+            String downLoadUrl = getInstallerDownLoadUrl(request);
+            commandExecutor.downLoadPackage(request, agentInstallTempPath, 
downLoadUrl);
+
             deployInstaller(request, operator);
             String startCmd = agentInstallPath + INSTALLER_START_CMD;
             commandExecutor.execRemote(request, startCmd);
@@ -137,7 +141,8 @@ public class AgentClusterNodeInstallOperator implements 
InlongClusterNodeInstall
             commandExecutor.rmDir(request, agentInstallTempPath);
             commandExecutor.mkdir(request, agentInstallTempPath);
             commandExecutor.cpDir(request, agentInstallPath + 
"/conf/modules.json", agentInstallTempPath);
-
+            String downLoadUrl = getInstallerDownLoadUrl(request);
+            commandExecutor.downLoadPackage(request, agentInstallTempPath, 
downLoadUrl);
             commandExecutor.rmDir(request, agentInstallPath.substring(0, 
agentInstallPath.lastIndexOf(File.separator)));
             deployInstaller(request, operator);
 
@@ -201,8 +206,7 @@ public class AgentClusterNodeInstallOperator implements 
InlongClusterNodeInstall
         commandExecutor.mkdir(request, agentInstallPath);
         String downLoadUrl = getInstallerDownLoadUrl(request);
         String fileName = downLoadUrl.substring(downLoadUrl.lastIndexOf('/') + 
1);
-        commandExecutor.downLoadPackage(request, agentInstallPath, 
downLoadUrl);
-        commandExecutor.tarPackage(request, fileName, agentInstallPath);
+        commandExecutor.tarPackage(request, fileName, agentInstallTempPath, 
agentInstallPath);
         String confFile = agentInstallPath + INSTALLER_CONF_PATH;
         Map<String, String> configMap = new HashMap<>();
         configMap.put(AGENT_LOCAL_IP, request.getIp());
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cmd/CommandExecutor.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cmd/CommandExecutor.java
index 6f882ab018..7f4ff79a9f 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cmd/CommandExecutor.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cmd/CommandExecutor.java
@@ -32,8 +32,8 @@ public interface CommandExecutor {
     CommandResult modifyConfig(AgentClusterNodeRequest clusterNodeRequest, 
Map<String, String> configMap,
             String confPath) throws Exception;
 
-    CommandResult tarPackage(AgentClusterNodeRequest clusterNodeRequest, 
String fileName, String tarPath)
-            throws Exception;
+    CommandResult tarPackage(AgentClusterNodeRequest clusterNodeRequest, 
String fileName, String sourcePath,
+            String tarPath) throws Exception;
 
     CommandResult downLoadPackage(AgentClusterNodeRequest clusterNodeRequest, 
String downLoadPath, String downLoadUrl)
             throws Exception;
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cmd/CommandExecutorImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cmd/CommandExecutorImpl.java
index dba4169058..cb44988bbf 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cmd/CommandExecutorImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cmd/CommandExecutorImpl.java
@@ -122,9 +122,9 @@ public class CommandExecutorImpl implements CommandExecutor 
{
     }
 
     @Override
-    public CommandResult tarPackage(AgentClusterNodeRequest 
clusterNodeRequest, String fileName,
+    public CommandResult tarPackage(AgentClusterNodeRequest 
clusterNodeRequest, String fileName, String sourcePath,
             String tarPath) throws Exception {
-        String tarCmd = "tar -zxvf " + tarPath + fileName + " -C " + tarPath;
+        String tarCmd = "tar -zxvf " + sourcePath + fileName + " -C " + 
tarPath;
         return execRemote(clusterNodeRequest, tarCmd);
     }