Squashed commit of the following:

commit 2f1e553 Author: Zhiguo Wu <[email protected]> Date: Thu Oct 31 10:10:06 2024 +0800 BIGTOP-4253: Refactor APIs for Stack (#96)
apache · Oct 31, 2024 · c36b1fe · c36b1fe
1 parent 123cf31
commit c36b1fe
Show file tree

Hide file tree

Showing 33 changed files with 160 additions and 959 deletions.
diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ClusterPO.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ClusterPO.java
@@ -60,9 +60,6 @@ public class ClusterPO extends BasePO implements Serializable {
     @Column(name = "selected")
     private Boolean selected;
 
-    @Column(name = "stack_id")
-    private Long stackId;
-
     @Transient
     @Column(name = "stack_name")
     private String stackName;

diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/StackPO.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/StackPO.java
diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/StackDao.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/StackDao.java
diff --git a/bigtop-manager-dao/src/main/resources/mapper/mysql/StackMapper.xml b/bigtop-manager-dao/src/main/resources/mapper/mysql/StackMapper.xml
diff --git a/bigtop-manager-dao/src/main/resources/mapper/postgresql/StackMapper.xml b/bigtop-manager-dao/src/main/resources/mapper/postgresql/StackMapper.xml
diff --git a/...anager-server/src/main/java/org/apache/bigtop/manager/server/command/job/AbstractJob.java b/...anager-server/src/main/java/org/apache/bigtop/manager/server/command/job/AbstractJob.java
@@ -26,7 +26,6 @@
 import org.apache.bigtop.manager.dao.po.TaskPO;
 import org.apache.bigtop.manager.dao.repository.ClusterDao;
 import org.apache.bigtop.manager.dao.repository.JobDao;
-import org.apache.bigtop.manager.dao.repository.StackDao;
 import org.apache.bigtop.manager.dao.repository.StageDao;
 import org.apache.bigtop.manager.dao.repository.TaskDao;
 import org.apache.bigtop.manager.server.command.stage.Stage;
@@ -42,7 +41,6 @@
 @Slf4j
 public abstract class AbstractJob implements Job {
 
-    protected StackDao stackDao;
     protected ClusterDao clusterDao;
     protected JobDao jobDao;
     protected StageDao stageDao;
@@ -70,7 +68,6 @@ public AbstractJob(JobContext jobContext) {
     }
 
     protected void injectBeans() {
-        this.stackDao = SpringContextHolder.getBean(StackDao.class);
         this.clusterDao = SpringContextHolder.getBean(ClusterDao.class);
 
         this.jobDao = SpringContextHolder.getBean(JobDao.class);

diff --git a/...server/src/main/java/org/apache/bigtop/manager/server/command/job/AbstractServiceJob.java b/...server/src/main/java/org/apache/bigtop/manager/server/command/job/AbstractServiceJob.java
@@ -24,7 +24,6 @@
 import org.apache.bigtop.manager.dao.po.ComponentPO;
 import org.apache.bigtop.manager.dao.po.HostComponentPO;
 import org.apache.bigtop.manager.dao.po.HostPO;
-import org.apache.bigtop.manager.dao.po.StackPO;
 import org.apache.bigtop.manager.dao.repository.ComponentDao;
 import org.apache.bigtop.manager.dao.repository.HostComponentDao;
 import org.apache.bigtop.manager.dao.repository.HostDao;
@@ -40,6 +39,7 @@
 import org.apache.bigtop.manager.server.model.dto.ComponentDTO;
 import org.apache.bigtop.manager.server.model.dto.ComponentHostDTO;
 import org.apache.bigtop.manager.server.model.dto.ServiceDTO;
+import org.apache.bigtop.manager.server.model.dto.StackDTO;
 import org.apache.bigtop.manager.server.model.dto.command.ServiceCommandDTO;
 import org.apache.bigtop.manager.server.stack.dag.ComponentCommandWrapper;
 import org.apache.bigtop.manager.server.stack.dag.DAG;
@@ -57,9 +57,10 @@ public abstract class AbstractServiceJob extends AbstractJob {
     protected HostComponentDao hostComponentDao;
     protected HostDao hostDao;
 
-    protected String stackName;
-    protected String stackVersion;
-    protected DAG<String, ComponentCommandWrapper, DagGraphEdge> dag;
+    // TODO: temp code
+    protected String stackName = "bigtop";
+    protected String stackVersion = "3.3.0";
+    protected DAG<String, ComponentCommandWrapper, DagGraphEdge> dag = StackUtils.DAG;
 
     public AbstractServiceJob(JobContext jobContext) {
         super(jobContext);
@@ -77,18 +78,13 @@ protected void injectBeans() {
     @Override
     protected void beforeCreateStages() {
         super.beforeCreateStages();
-        StackPO stackPO = stackDao.findById(clusterPO.getStackId());
-
-        stackName = stackPO.getStackName();
-        stackVersion = stackPO.getStackVersion();
-        dag = StackUtils.getStackDagMap().get(StackUtils.fullStackName(stackName, stackVersion));
     }
 
     protected StageContext createStageContext(String serviceName, String componentName, List<String> hostnames) {
         StageContext stageContext = StageContext.fromCommandDTO(jobContext.getCommandDTO());
 
-        ServiceDTO serviceDTO = StackUtils.getServiceDTO(stackName, stackVersion, serviceName);
-        ComponentDTO componentDTO = StackUtils.getComponentDTO(stackName, stackVersion, componentName);
+        ServiceDTO serviceDTO = StackUtils.getServiceDTO(serviceName);
+        ComponentDTO componentDTO = StackUtils.getComponentDTO(componentName);
 
         stageContext.setServiceDTO(serviceDTO);
         stageContext.setComponentDTO(componentDTO);
@@ -126,7 +122,7 @@ protected List<String> getComponentNames() {
     }
 
     protected String findServiceNameByComponentName(String componentName) {
-        for (ServiceDTO serviceDTO : StackUtils.getServiceDTOList(stackName, stackVersion)) {
+        for (ServiceDTO serviceDTO : StackUtils.getServiceDTOList(new StackDTO(stackName, stackVersion))) {
             for (ComponentDTO componentDTO : serviceDTO.getComponents()) {
                 if (componentDTO.getComponentName().equals(componentName)) {
                     return serviceDTO.getServiceName();
@@ -138,17 +134,17 @@ protected String findServiceNameByComponentName(String componentName) {
     }
 
     protected Boolean isMasterComponent(String componentName) {
-        ComponentDTO componentDTO = StackUtils.getComponentDTO(stackName, stackVersion, componentName);
+        ComponentDTO componentDTO = StackUtils.getComponentDTO(componentName);
         return componentDTO.getCategory().equalsIgnoreCase(ComponentCategories.MASTER);
     }
 
     protected Boolean isSlaveComponent(String componentName) {
-        ComponentDTO componentDTO = StackUtils.getComponentDTO(stackName, stackVersion, componentName);
+        ComponentDTO componentDTO = StackUtils.getComponentDTO(componentName);
         return componentDTO.getCategory().equalsIgnoreCase(ComponentCategories.SLAVE);
     }
 
     protected Boolean isClientComponent(String componentName) {
-        ComponentDTO componentDTO = StackUtils.getComponentDTO(stackName, stackVersion, componentName);
+        ComponentDTO componentDTO = StackUtils.getComponentDTO(componentName);
         return componentDTO.getCategory().equalsIgnoreCase(ComponentCategories.CLIENT);
     }
 

diff --git a/...-server/src/main/java/org/apache/bigtop/manager/server/command/job/ServiceInstallJob.java b/...-server/src/main/java/org/apache/bigtop/manager/server/command/job/ServiceInstallJob.java
@@ -144,7 +144,7 @@ private void upsertService(ServicePO servicePO, ServiceCommandDTO serviceCommand
 
         // 1. Persist service and components
         if (servicePO == null) {
-            ServiceDTO serviceDTO = StackUtils.getServiceDTO(stackName, stackVersion, serviceName);
+            ServiceDTO serviceDTO = StackUtils.getServiceDTO(serviceName);
             servicePO = ServiceConverter.INSTANCE.fromDTO2PO(serviceDTO, clusterPO);
             serviceDao.save(servicePO);
         }
@@ -158,7 +158,7 @@ private void upsertService(ServicePO servicePO, ServiceCommandDTO serviceCommand
             // 3. Persist component
             ComponentPO componentPO = componentDao.findByClusterIdAndComponentName(clusterId, componentName);
             if (componentPO == null) {
-                ComponentDTO componentDTO = StackUtils.getComponentDTO(stackName, stackVersion, componentName);
+                ComponentDTO componentDTO = StackUtils.getComponentDTO(componentName);
                 componentPO = ComponentConverter.INSTANCE.fromDTO2PO(componentDTO, servicePO, clusterPO);
                 componentDao.save(componentPO);
             }

diff --git a/...rver/src/main/java/org/apache/bigtop/manager/server/command/task/CacheFileUpdateTask.java b/...rver/src/main/java/org/apache/bigtop/manager/server/command/task/CacheFileUpdateTask.java
@@ -48,12 +48,7 @@
 import org.apache.bigtop.manager.server.model.converter.RepoConverter;
 import org.apache.bigtop.manager.server.model.dto.PropertyDTO;
 import org.apache.bigtop.manager.server.model.dto.RepoDTO;
-import org.apache.bigtop.manager.server.model.dto.ServiceDTO;
-import org.apache.bigtop.manager.server.model.dto.StackDTO;
 import org.apache.bigtop.manager.server.utils.StackConfigUtils;
-import org.apache.bigtop.manager.server.utils.StackUtils;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 
@@ -213,22 +208,13 @@ private void genEmptyCaches() {
         userMap = new HashMap<>();
         settingsMap = new HashMap<>();
 
-        String fullStackName = StackUtils.fullStackName(taskContext.getStackName(), taskContext.getStackVersion());
-        ImmutablePair<StackDTO, List<ServiceDTO>> immutablePair =
-                StackUtils.getStackKeyMap().get(fullStackName);
-        StackDTO stackDTO = immutablePair.getLeft();
-
         Map<String, Object> properties = taskContext.getProperties();
 
         repoList = RepoConverter.INSTANCE.fromDTO2Message((List<RepoDTO>) properties.get("repoInfoList"));
         clusterInfo = new ClusterInfo();
         clusterInfo.setClusterName(taskContext.getClusterName());
         clusterInfo.setStackName(taskContext.getStackName());
         clusterInfo.setStackVersion(taskContext.getStackVersion());
-        clusterInfo.setUserGroup(stackDTO.getUserGroup());
-        clusterInfo.setRepoTemplate(stackDTO.getRepoTemplate());
-        clusterInfo.setRoot(stackDTO.getRoot());
-        clusterInfo.setPackages(List.of(stackDTO.getPackages().split(",")));
 
         List<String> hostnames = (List<String>) properties.get("hostnames");
         hostMap.put(Constants.ALL_HOST_KEY, new HashSet<>(hostnames));

diff --git a/...in/java/org/apache/bigtop/manager/server/command/validator/RequiredServicesValidator.java b/...in/java/org/apache/bigtop/manager/server/command/validator/RequiredServicesValidator.java
@@ -19,7 +19,6 @@
 package org.apache.bigtop.manager.server.command.validator;
 
 import org.apache.bigtop.manager.common.enums.Command;
-import org.apache.bigtop.manager.dao.po.ClusterPO;
 import org.apache.bigtop.manager.dao.po.ServicePO;
 import org.apache.bigtop.manager.dao.repository.ClusterDao;
 import org.apache.bigtop.manager.dao.repository.ServiceDao;
@@ -37,6 +36,7 @@
 import org.springframework.stereotype.Component;
 
 import jakarta.annotation.Resource;
+import java.util.HashSet;
 import java.util.List;
 
 @Component
@@ -59,15 +59,12 @@ public void validate(ValidatorContext context) {
         List<ServiceCommandDTO> serviceCommands = commandDTO.getServiceCommands();
 
         Long clusterId = commandDTO.getClusterId();
-        ClusterPO clusterPO = clusterDao.findByIdJoin(clusterId);
-        String stackName = clusterPO.getStackName();
-        String stackVersion = clusterPO.getStackVersion();
 
         List<String> serviceNames =
                 serviceCommands.stream().map(ServiceCommandDTO::getServiceName).toList();
         for (ServiceCommandDTO serviceCommand : serviceCommands) {
             String serviceName = serviceCommand.getServiceName();
-            ServiceDTO serviceDTO = StackUtils.getServiceDTO(stackName, stackVersion, serviceName);
+            ServiceDTO serviceDTO = StackUtils.getServiceDTO(serviceName);
             List<String> requiredServices = serviceDTO.getRequiredServices();
             if (CollectionUtils.isEmpty(requiredServices)) {
                 return;
@@ -79,7 +76,7 @@ public void validate(ValidatorContext context) {
 
             requiredServices.removeAll(list);
 
-            if (!serviceNames.containsAll(requiredServices)) {
+            if (!new HashSet<>(serviceNames).containsAll(requiredServices)) {
                 throw new ApiException(ApiExceptionEnum.SERVICE_REQUIRED_NOT_FOUND, String.join(",", requiredServices));
             }
         }