resolve issue 416 (#417)

Co-authored-by: 李鹏 <lipeng@cgt.com.cn>
datavane · Oct 13, 2023 · d7616ee · d7616ee
1 parent 2841f98
commit d7616ee
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/...ervice/src/main/java/com/datasophon/api/master/handler/service/ServiceInstallHandler.java b/...ervice/src/main/java/com/datasophon/api/master/handler/service/ServiceInstallHandler.java
@@ -65,22 +65,25 @@ public ExecResult handlerRequest(ServiceRoleInfo serviceRoleInfo) throws Excepti
         installServiceRoleCommand.setServiceName(serviceRoleInfo.getParentName());
         installServiceRoleCommand.setServiceRoleName(serviceRoleInfo.getName());
         installServiceRoleCommand.setServiceRoleType(serviceRoleInfo.getRoleType());
-        installServiceRoleCommand.setPackageName(serviceRoleInfo.getPackageName());
         installServiceRoleCommand.setDecompressPackageName(serviceRoleInfo.getDecompressPackageName());
         installServiceRoleCommand.setRunAs(serviceRoleInfo.getRunAs());
         installServiceRoleCommand.setServiceRoleType(serviceRoleInfo.getRoleType());
-        String md5 = FileUtil.readString(
-                Constants.MASTER_MANAGE_PACKAGE_PATH + Constants.SLASH + serviceRoleInfo.getPackageName() + ".md5",
-                Charset.defaultCharset());
-        installServiceRoleCommand.setPackageMd5(md5);
+
+        String md5 ;
         if ("aarch64".equals(hostEntity.getCpuArchitecture()) && FileUtil.exist(Constants.MASTER_MANAGE_PACKAGE_PATH
                 + Constants.SLASH + serviceRoleInfo.getDecompressPackageName() + "-arm.tar.gz")) {
             installServiceRoleCommand.setPackageName(serviceRoleInfo.getDecompressPackageName() + "-arm.tar.gz");
             logger.info("find arm package {}", installServiceRoleCommand.getPackageName());
-            String armMd5 = FileUtil.readString(Constants.MASTER_MANAGE_PACKAGE_PATH + Constants.SLASH
+            md5 = FileUtil.readString(Constants.MASTER_MANAGE_PACKAGE_PATH + Constants.SLASH
                     + serviceRoleInfo.getDecompressPackageName() + "-arm.tar.gz.md5", Charset.defaultCharset());
-            installServiceRoleCommand.setPackageMd5(armMd5);
+        }else {
+            installServiceRoleCommand.setPackageName(serviceRoleInfo.getPackageName());
+            md5 = FileUtil.readString(
+                    Constants.MASTER_MANAGE_PACKAGE_PATH + Constants.SLASH + serviceRoleInfo.getPackageName() + ".md5",
+                    Charset.defaultCharset());
         }
+        installServiceRoleCommand.setPackageMd5(md5);
+
         ActorSelection actorSelection = ActorUtils.actorSystem.actorSelection(
                 "akka.tcp://datasophon@" + serviceRoleInfo.getHostname() + ":2552/user/worker/installServiceActor");
         Timeout timeout = new Timeout(Duration.create(180, TimeUnit.SECONDS));