diff --git a/bigtop-manager-server/src/main/resources/stacks/extra/1.0.0/services/seatunnel/metainfo.xml b/bigtop-manager-server/src/main/resources/stacks/extra/1.0.0/services/seatunnel/metainfo.xml index bf9b85b6..4f7174fe 100644 --- a/bigtop-manager-server/src/main/resources/stacks/extra/1.0.0/services/seatunnel/metainfo.xml +++ b/bigtop-manager-server/src/main/resources/stacks/extra/1.0.0/services/seatunnel/metainfo.xml @@ -30,16 +30,9 @@ - seatunnel_master - SeaTunnel Master - master - 1+ - - - - seatunnel_worker - SeaTunnel Worker - worker + seatunnel_server + SeaTunnel Server + server 1+ diff --git a/bigtop-manager-server/src/main/resources/stacks/extra/1.0.0/services/seatunnel/order.json b/bigtop-manager-server/src/main/resources/stacks/extra/1.0.0/services/seatunnel/order.json index 7c143623..0967ef42 100644 --- a/bigtop-manager-server/src/main/resources/stacks/extra/1.0.0/services/seatunnel/order.json +++ b/bigtop-manager-server/src/main/resources/stacks/extra/1.0.0/services/seatunnel/order.json @@ -1,8 +1 @@ -{ - "SEATUNNEL_WORKER-START": [ - "SEATUNNEL_MASTER-START" - ], - "SEATUNNEL_MASTER-STOP": [ - "SEATUNNEL_WORKER-STOP" - ] -} +{} diff --git a/bigtop-manager-stack/bigtop-manager-stack-extra/src/main/java/org/apache/bigtop/manager/stack/extra/param/ExtraParams.java b/bigtop-manager-stack/bigtop-manager-stack-extra/src/main/java/org/apache/bigtop/manager/stack/extra/param/ExtraParams.java index 34c77e84..79c6c7d8 100644 --- a/bigtop-manager-stack/bigtop-manager-stack-extra/src/main/java/org/apache/bigtop/manager/stack/extra/param/ExtraParams.java +++ b/bigtop-manager-stack/bigtop-manager-stack-extra/src/main/java/org/apache/bigtop/manager/stack/extra/param/ExtraParams.java @@ -19,57 +19,14 @@ package org.apache.bigtop.manager.stack.extra.param; import org.apache.bigtop.manager.common.message.entity.payload.CommandPayload; -import org.apache.bigtop.manager.common.utils.Environments; import org.apache.bigtop.manager.stack.core.spi.param.BaseParams; -import org.apache.commons.lang3.SystemUtils; - import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -import java.io.File; -@Slf4j @NoArgsConstructor public abstract class ExtraParams extends BaseParams { protected ExtraParams(CommandPayload commandPayload) { super(commandPayload); } - - /** - * Extra stack do not belong to any cluster, so we need to override this and provide a group name - * - * @return group name - */ - @Override - public String group() { - return "extra"; - } - - /** - * Extra stack do not belong to any cluster, we cannot use stack home of cluster - * - * @return group name - */ - @Override - public String stackHome() { - // Parent path of agent dir, which is bigtop-manager-agent/../ - String parentPath; - if (Environments.isDevMode()) { - return SystemUtils.getUserDir().getParentFile().getPath(); - } else { - parentPath = new File(ExtraParams.class - .getProtectionDomain() - .getCodeSource() - .getLocation() - .getPath()) - .getParentFile() - .getParentFile() - .getParentFile() - .getPath(); - } - - return parentPath + "/extras"; - } }