BIGTOP-4181: Refactor factory/runner for job/stage (#36)

apache · Aug 5, 2024 · 4b3fa17 · 4b3fa17
1 parent 34694a5
commit 4b3fa17
Show file tree

Hide file tree

Showing 103 changed files with 1,805 additions and 2,148 deletions.
diff --git a/...agent/src/main/java/org/apache/bigtop/manager/agent/executor/AbstractCommandExecutor.java b/...agent/src/main/java/org/apache/bigtop/manager/agent/executor/AbstractCommandExecutor.java
@@ -52,11 +52,8 @@ public CommandReply execute(CommandRequest request) {
             log.error("Run command failed, {}", request, e);
         }
 
-        commandReplyBuilder.setType(request.getType());
         commandReplyBuilder.setHostname(request.getHostname());
         commandReplyBuilder.setTaskId(request.getTaskId());
-        commandReplyBuilder.setStageId(request.getStageId());
-        commandReplyBuilder.setJobId(request.getJobId());
         return commandReplyBuilder.build();
     }
 

diff --git a/...cutor/CacheDistributeCommandExecutor.java → ...cutor/CacheFileUpdateCommandExecutor.java b/...cutor/CacheDistributeCommandExecutor.java → ...cutor/CacheFileUpdateCommandExecutor.java
@@ -27,6 +27,7 @@
 
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -41,13 +42,13 @@
 import static org.apache.bigtop.manager.common.constants.CacheFiles.USERS_INFO;
 
 @Slf4j
-@org.springframework.stereotype.Component
+@Component
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class CacheDistributeCommandExecutor extends AbstractCommandExecutor {
+public class CacheFileUpdateCommandExecutor extends AbstractCommandExecutor {
 
     @Override
     public CommandType getCommandType() {
-        return CommandType.CACHE_DISTRIBUTE;
+        return CommandType.UPDATE_CACHE_FILES;
     }
 
     @Override

diff --git a/...gent/src/main/java/org/apache/bigtop/manager/agent/executor/ComponentCommandExecutor.java b/...gent/src/main/java/org/apache/bigtop/manager/agent/executor/ComponentCommandExecutor.java
@@ -26,11 +26,12 @@
 
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
 
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@org.springframework.stereotype.Component
+@Component
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class ComponentCommandExecutor extends AbstractCommandExecutor {
 

diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/TaskPO.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/TaskPO.java
@@ -61,8 +61,10 @@ public class TaskPO extends BasePO {
     @Column(name = "name")
     private String name;
 
-    @Column(name = "message_id")
-    private String messageId;
+    @Lob
+    @Basic(fetch = FetchType.LAZY)
+    @Column(name = "context", length = 16777216)
+    private String context;
 
     @Column(name = "state")
     private JobState state;
@@ -79,14 +81,6 @@ public class TaskPO extends BasePO {
     @Column(name = "custom_command")
     private String customCommand;
 
-    @Lob
-    @Basic(fetch = FetchType.LAZY)
-    @Column(name = "custom_commands", length = 16777216)
-    private String customCommands;
-
-    @Column(name = "command_script")
-    private String commandScript;
-
     @Column(name = "hostname")
     private String hostname;
 

diff --git a/bigtop-manager-grpc/src/main/java/org/apache/bigtop/manager/grpc/utils/ProtobufUtil.java b/bigtop-manager-grpc/src/main/java/org/apache/bigtop/manager/grpc/utils/ProtobufUtil.java
@@ -38,7 +38,7 @@ public static <T extends MessageOrBuilder> T fromJson(String json, Class<T> claz
 
     public static <T extends Message> String toJson(T message) {
         try {
-            return JsonFormat.printer().print(message);
+            return JsonFormat.printer().omittingInsignificantWhitespace().print(message);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

diff --git a/bigtop-manager-grpc/src/main/resources/proto/command.proto b/bigtop-manager-grpc/src/main/resources/proto/command.proto
@@ -29,24 +29,19 @@ service CommandService {
 enum CommandType {
   COMPONENT = 0;
   HOST_CHECK = 1;
-  CACHE_DISTRIBUTE = 2;
+  UPDATE_CACHE_FILES = 2;
 }
 
 message CommandRequest {
   string payload = 1;
   string hostname = 2;
-  int64 job_id = 3;
-  int64 stage_id = 4;
-  int64 task_id = 5;
-  CommandType type = 6;
+  int64 task_id = 3;
+  CommandType type = 4;
 }
 
 message CommandReply {
   int32 code = 1;
   string result = 2;
   string hostname = 3;
-  int64 job_id = 4;
-  int64 stage_id = 5;
-  int64 task_id = 6;
-  CommandType type = 7;
+  int64 task_id = 4;
 }
diff --git a/...manager/server/enums/JobStrategyType.java → ...r/command/factory/AbstractJobFactory.java b/...manager/server/enums/JobStrategyType.java → ...r/command/factory/AbstractJobFactory.java
@@ -16,10 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.enums;
+package org.apache.bigtop.manager.server.command.factory;
 
-public enum JobStrategyType {
-    OVER_ON_FAIL,
-
-    CONTINUE_ON_FAIL,
-}
+public abstract class AbstractJobFactory implements JobFactory {}
diff --git a/...ver/command/job/factory/JobFactories.java → .../server/command/factory/JobFactories.java b/...ver/command/job/factory/JobFactories.java → .../server/command/factory/JobFactories.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.command.job.factory;
+package org.apache.bigtop.manager.server.command.factory;
 
 import org.apache.bigtop.manager.server.command.CommandIdentifier;
 import org.apache.bigtop.manager.server.enums.ApiExceptionEnum;

diff --git a/...erver/command/job/factory/JobFactory.java → ...er/server/command/factory/JobFactory.java b/...erver/command/job/factory/JobFactory.java → ...er/server/command/factory/JobFactory.java
@@ -16,14 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.command.job.factory;
+package org.apache.bigtop.manager.server.command.factory;
 
-import org.apache.bigtop.manager.dao.po.JobPO;
 import org.apache.bigtop.manager.server.command.CommandIdentifier;
+import org.apache.bigtop.manager.server.command.job.Job;
+import org.apache.bigtop.manager.server.command.job.JobContext;
 
 public interface JobFactory {
 
     CommandIdentifier getCommandIdentifier();
 
-    JobPO createJob(JobContext jobContext);
+    Job createJob(JobContext jobContext);
 }
diff --git a/...ry/cluster/AbstractClusterJobFactory.java → ...ry/cluster/AbstractClusterJobFactory.java b/...ry/cluster/AbstractClusterJobFactory.java → ...ry/cluster/AbstractClusterJobFactory.java
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.command.job.factory.cluster;
+package org.apache.bigtop.manager.server.command.factory.cluster;
 
-import org.apache.bigtop.manager.server.command.job.factory.AbstractJobFactory;
+import org.apache.bigtop.manager.server.command.factory.AbstractJobFactory;
 
 public abstract class AbstractClusterJobFactory extends AbstractJobFactory {}
diff --git a/.../component/ComponentRestartJobRunner.java → ...tory/cluster/ClusterCreateJobFactory.java b/.../component/ComponentRestartJobRunner.java → ...tory/cluster/ClusterCreateJobFactory.java
@@ -16,25 +16,33 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.command.job.runner.component;
+package org.apache.bigtop.manager.server.command.factory.cluster;
 
 import org.apache.bigtop.manager.common.enums.Command;
 import org.apache.bigtop.manager.server.command.CommandIdentifier;
-import org.apache.bigtop.manager.server.command.job.runner.AbstractJobRunner;
+import org.apache.bigtop.manager.server.command.job.ClusterCreateJob;
+import org.apache.bigtop.manager.server.command.job.Job;
+import org.apache.bigtop.manager.server.command.job.JobContext;
 import org.apache.bigtop.manager.server.enums.CommandLevel;
 
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
 
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@org.springframework.stereotype.Component
+@Component
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class ComponentRestartJobRunner extends AbstractJobRunner {
+public class ClusterCreateJobFactory extends AbstractClusterJobFactory {
 
     @Override
     public CommandIdentifier getCommandIdentifier() {
-        return new CommandIdentifier(CommandLevel.COMPONENT, Command.RESTART);
+        return new CommandIdentifier(CommandLevel.CLUSTER, Command.CREATE);
+    }
+
+    @Override
+    public Job createJob(JobContext jobContext) {
+        return new ClusterCreateJob(jobContext);
     }
 }
diff --git a/...omponent/AbstractComponentJobFactory.java → ...omponent/AbstractComponentJobFactory.java b/...omponent/AbstractComponentJobFactory.java → ...omponent/AbstractComponentJobFactory.java
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.command.job.factory.component;
+package org.apache.bigtop.manager.server.command.factory.component;
 
-import org.apache.bigtop.manager.server.command.job.factory.AbstractJobFactory;
+import org.apache.bigtop.manager.server.command.factory.AbstractJobFactory;
 
 public abstract class AbstractComponentJobFactory extends AbstractJobFactory {}
diff --git a/...component/ComponentInstallJobFactory.java → ...component/ComponentInstallJobFactory.java b/...component/ComponentInstallJobFactory.java → ...component/ComponentInstallJobFactory.java
@@ -16,19 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.command.job.factory.component;
+package org.apache.bigtop.manager.server.command.factory.component;
 
 import org.apache.bigtop.manager.common.enums.Command;
 import org.apache.bigtop.manager.server.command.CommandIdentifier;
+import org.apache.bigtop.manager.server.command.job.Job;
+import org.apache.bigtop.manager.server.command.job.JobContext;
 import org.apache.bigtop.manager.server.enums.CommandLevel;
 
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
 
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@org.springframework.stereotype.Component
+@Component
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class ComponentInstallJobFactory extends AbstractComponentJobFactory {
 
@@ -38,5 +41,7 @@ public CommandIdentifier getCommandIdentifier() {
     }
 
     @Override
-    public void createStagesAndTasks() {}
+    public Job createJob(JobContext jobContext) {
+        return null;
+    }
 }
diff --git a/...component/ComponentRestartJobFactory.java → ...component/ComponentRestartJobFactory.java b/...component/ComponentRestartJobFactory.java → ...component/ComponentRestartJobFactory.java
@@ -16,19 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.command.job.factory.component;
+package org.apache.bigtop.manager.server.command.factory.component;
 
 import org.apache.bigtop.manager.common.enums.Command;
 import org.apache.bigtop.manager.server.command.CommandIdentifier;
+import org.apache.bigtop.manager.server.command.job.Job;
+import org.apache.bigtop.manager.server.command.job.JobContext;
 import org.apache.bigtop.manager.server.enums.CommandLevel;
 
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
 
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@org.springframework.stereotype.Component
+@Component
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class ComponentRestartJobFactory extends AbstractComponentJobFactory {
 
@@ -38,5 +41,7 @@ public CommandIdentifier getCommandIdentifier() {
     }
 
     @Override
-    public void createStagesAndTasks() {}
+    public Job createJob(JobContext jobContext) {
+        return null;
+    }
 }
diff --git a/...y/component/ComponentStartJobFactory.java → ...y/component/ComponentStartJobFactory.java b/...y/component/ComponentStartJobFactory.java → ...y/component/ComponentStartJobFactory.java
@@ -16,19 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.command.job.factory.component;
+package org.apache.bigtop.manager.server.command.factory.component;
 
 import org.apache.bigtop.manager.common.enums.Command;
 import org.apache.bigtop.manager.server.command.CommandIdentifier;
+import org.apache.bigtop.manager.server.command.job.Job;
+import org.apache.bigtop.manager.server.command.job.JobContext;
 import org.apache.bigtop.manager.server.enums.CommandLevel;
 
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
 
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@org.springframework.stereotype.Component
+@Component
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class ComponentStartJobFactory extends AbstractComponentJobFactory {
 
@@ -38,5 +41,7 @@ public CommandIdentifier getCommandIdentifier() {
     }
 
     @Override
-    public void createStagesAndTasks() {}
+    public Job createJob(JobContext jobContext) {
+        return null;
+    }
 }
diff --git a/...ry/component/ComponentStopJobFactory.java → ...ry/component/ComponentStopJobFactory.java b/...ry/component/ComponentStopJobFactory.java → ...ry/component/ComponentStopJobFactory.java
@@ -16,19 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.command.job.factory.component;
+package org.apache.bigtop.manager.server.command.factory.component;
 
 import org.apache.bigtop.manager.common.enums.Command;
 import org.apache.bigtop.manager.server.command.CommandIdentifier;
+import org.apache.bigtop.manager.server.command.job.Job;
+import org.apache.bigtop.manager.server.command.job.JobContext;
 import org.apache.bigtop.manager.server.enums.CommandLevel;
 
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
 
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@org.springframework.stereotype.Component
+@Component
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class ComponentStopJobFactory extends AbstractComponentJobFactory {
 
@@ -38,5 +41,7 @@ public CommandIdentifier getCommandIdentifier() {
     }
 
     @Override
-    public void createStagesAndTasks() {}
+    public Job createJob(JobContext jobContext) {
+        return null;
+    }
 }
diff --git a/.../factory/host/AbstractHostJobFactory.java → .../factory/host/AbstractHostJobFactory.java b/.../factory/host/AbstractHostJobFactory.java → .../factory/host/AbstractHostJobFactory.java
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.command.job.factory.host;
+package org.apache.bigtop.manager.server.command.factory.host;
 
-import org.apache.bigtop.manager.server.command.job.factory.AbstractJobFactory;
+import org.apache.bigtop.manager.server.command.factory.AbstractJobFactory;
 
 public abstract class AbstractHostJobFactory extends AbstractJobFactory {}