You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2023/10/18 06:17:05 UTC
[inlong] branch master updated: [INLONG-9066][Manager] Renaming group related states (#9068)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang 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 9b35481b2c [INLONG-9066][Manager] Renaming group related states (#9068)
9b35481b2c is described below
commit 9b35481b2c912db5d4f9cff6dbf6d30fbe04c58f
Author: fuweng11 <76...@users.noreply.github.com>
AuthorDate: Wed Oct 18 14:17:00 2023 +0800
[INLONG-9066][Manager] Renaming group related states (#9068)
---
.../manager/client/api/impl/InlongGroupImpl.java | 4 +-
.../inlong/manager/common/enums/GroupStatus.java | 56 +++++++++++-----------
.../manager/common/enums/SimpleGroupStatus.java | 22 ++++-----
.../service/cluster/InlongClusterServiceImpl.java | 2 +-
.../service/core/impl/AgentServiceImpl.java | 6 +--
.../service/group/InlongGroupProcessService.java | 23 +++++----
.../service/group/InlongGroupServiceImpl.java | 4 +-
.../group/UpdateGroupCompleteListener.java | 4 +-
.../listener/group/UpdateGroupListener.java | 6 +--
.../listener/queue/QueueResourceListener.java | 2 +-
.../service/listener/sort/SortConfigListener.java | 2 +-
.../service/stream/InlongStreamProcessService.java | 6 +--
.../service/tenant/InlongTenantServiceImpl.java | 2 +-
.../service/core/impl/AgentServiceTest.java | 4 +-
.../group/InlongGroupProcessServiceTest.java | 4 +-
.../source/listener/StreamSourceListenerTest.java | 4 +-
inlong-manager/manager-web/sql/changes-1.10.0.sql | 1 +
17 files changed, 74 insertions(+), 78 deletions(-)
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongGroupImpl.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongGroupImpl.java
index 23bc3e3f75..9316760874 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongGroupImpl.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongGroupImpl.java
@@ -242,7 +242,7 @@ public class InlongGroupImpl implements InlongGroup {
}
boolean isDeleted = groupClient.deleteInlongGroup(groupInfo.getInlongGroupId(), async);
if (isDeleted) {
- groupInfo.setStatus(GroupStatus.DELETED.getCode());
+ groupInfo.setStatus(GroupStatus.CONFIG_DELETED.getCode());
}
return generateSnapshot();
}
@@ -277,7 +277,7 @@ public class InlongGroupImpl implements InlongGroup {
// if current group is not exists, set its status to deleted
if (groupInfo == null) {
groupInfo = groupContext.getGroupInfo();
- groupInfo.setStatus(GroupStatus.DELETED.getCode());
+ groupInfo.setStatus(GroupStatus.CONFIG_DELETED.getCode());
return new InlongGroupContext(groupContext);
}
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupStatus.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupStatus.java
index 7b22b1bd23..d0bb62f7bf 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupStatus.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupStatus.java
@@ -41,14 +41,13 @@ public enum GroupStatus {
CONFIG_FAILED(120, "configuration failed"),
CONFIG_SUCCESSFUL(130, "configuration successful"),
- SUSPENDING(141, "suspending"),
- SUSPENDED(140, "suspended"),
+ CONFIG_OFFLINE_ING(141, "in configure offline"),
+ CONFIGURATION_OFFLINE(140, "configure offline successful"),
- RESTARTING(151, "restarting"),
- RESTARTED(150, "restarted"),
+ CONFIG_ONLINE_ING(151, "in configure online"),
- DELETING(41, "deleting"),
- DELETED(40, "deleted"),
+ CONFIG_DELETING(41, "configure deleting"),
+ CONFIG_DELETED(40, "configure deleted"),
// FINISH is used for batch task.
FINISH(131, "finish");
@@ -59,28 +58,29 @@ public enum GroupStatus {
* Init group finite status automaton
*/
static {
- GROUP_STATE_AUTOMATON.put(TO_BE_SUBMIT, Sets.newHashSet(TO_BE_SUBMIT, TO_BE_APPROVAL, DELETING));
+ GROUP_STATE_AUTOMATON.put(TO_BE_SUBMIT, Sets.newHashSet(TO_BE_SUBMIT, TO_BE_APPROVAL, CONFIG_DELETING));
GROUP_STATE_AUTOMATON.put(TO_BE_APPROVAL, Sets.newHashSet(APPROVE_REJECTED, APPROVE_PASSED));
- GROUP_STATE_AUTOMATON.put(APPROVE_REJECTED, Sets.newHashSet(APPROVE_REJECTED, TO_BE_APPROVAL, DELETING));
- GROUP_STATE_AUTOMATON.put(APPROVE_PASSED, Sets.newHashSet(APPROVE_PASSED, CONFIG_ING, DELETING));
+ GROUP_STATE_AUTOMATON.put(APPROVE_REJECTED, Sets.newHashSet(APPROVE_REJECTED, TO_BE_APPROVAL, CONFIG_DELETING));
+ GROUP_STATE_AUTOMATON.put(APPROVE_PASSED, Sets.newHashSet(APPROVE_PASSED, CONFIG_ING, CONFIG_DELETING));
GROUP_STATE_AUTOMATON.put(CONFIG_ING, Sets.newHashSet(CONFIG_ING, CONFIG_FAILED, CONFIG_SUCCESSFUL, FINISH));
GROUP_STATE_AUTOMATON.put(CONFIG_FAILED,
- Sets.newHashSet(CONFIG_FAILED, CONFIG_ING, CONFIG_SUCCESSFUL, TO_BE_APPROVAL, DELETING));
+ Sets.newHashSet(CONFIG_FAILED, CONFIG_ING, CONFIG_SUCCESSFUL, TO_BE_APPROVAL, CONFIG_DELETING));
GROUP_STATE_AUTOMATON.put(CONFIG_SUCCESSFUL,
- Sets.newHashSet(CONFIG_SUCCESSFUL, TO_BE_APPROVAL, CONFIG_ING, SUSPENDING, DELETING));
+ Sets.newHashSet(CONFIG_SUCCESSFUL, TO_BE_APPROVAL, CONFIG_ING, CONFIG_OFFLINE_ING, CONFIG_DELETING));
- GROUP_STATE_AUTOMATON.put(SUSPENDING, Sets.newHashSet(SUSPENDING, SUSPENDED, CONFIG_FAILED));
- GROUP_STATE_AUTOMATON.put(SUSPENDED, Sets.newHashSet(SUSPENDED, RESTARTING, DELETING));
+ GROUP_STATE_AUTOMATON.put(
+ CONFIG_OFFLINE_ING, Sets.newHashSet(CONFIG_OFFLINE_ING, CONFIGURATION_OFFLINE, CONFIG_FAILED));
+ GROUP_STATE_AUTOMATON.put(CONFIGURATION_OFFLINE, Sets.newHashSet(CONFIGURATION_OFFLINE, CONFIG_ONLINE_ING,
+ CONFIG_DELETING));
- GROUP_STATE_AUTOMATON.put(RESTARTING, Sets.newHashSet(RESTARTING, RESTARTED, CONFIG_FAILED));
- GROUP_STATE_AUTOMATON.put(RESTARTED, Sets.newHashSet(RESTARTED, SUSPENDING, TO_BE_APPROVAL, DELETING));
+ GROUP_STATE_AUTOMATON.put(CONFIG_ONLINE_ING, Sets.newHashSet(CONFIG_ONLINE_ING, CONFIG_FAILED));
- GROUP_STATE_AUTOMATON.put(DELETING, Sets.newHashSet(DELETING, DELETED, CONFIG_FAILED));
- GROUP_STATE_AUTOMATON.put(DELETED, Sets.newHashSet(DELETED));
+ GROUP_STATE_AUTOMATON.put(CONFIG_DELETING, Sets.newHashSet(CONFIG_DELETING, CONFIG_DELETED, CONFIG_FAILED));
+ GROUP_STATE_AUTOMATON.put(CONFIG_DELETED, Sets.newHashSet(CONFIG_DELETED));
- GROUP_STATE_AUTOMATON.put(FINISH, Sets.newHashSet(FINISH, DELETING));
+ GROUP_STATE_AUTOMATON.put(FINISH, Sets.newHashSet(FINISH, CONFIG_DELETING));
}
private final Integer code;
@@ -112,9 +112,9 @@ public enum GroupStatus {
public static boolean notAllowedUpdate(GroupStatus status) {
return status == GroupStatus.TO_BE_APPROVAL
|| status == GroupStatus.CONFIG_ING
- || status == GroupStatus.SUSPENDING
- || status == GroupStatus.RESTARTING
- || status == GroupStatus.DELETING;
+ || status == GroupStatus.CONFIG_OFFLINE_ING
+ || status == GroupStatus.CONFIG_ONLINE_ING
+ || status == GroupStatus.CONFIG_DELETING;
}
/**
@@ -142,8 +142,7 @@ public enum GroupStatus {
return status == GroupStatus.APPROVE_PASSED
|| status == GroupStatus.CONFIG_FAILED
|| status == GroupStatus.CONFIG_SUCCESSFUL
- || status == GroupStatus.SUSPENDED
- || status == GroupStatus.RESTARTED
+ || status == GroupStatus.CONFIGURATION_OFFLINE
|| status == GroupStatus.FINISH;
}
@@ -155,7 +154,7 @@ public enum GroupStatus {
public static boolean allowedDeleteSubInfos(GroupStatus status) {
return status == GroupStatus.TO_BE_SUBMIT
|| status == GroupStatus.APPROVE_REJECTED
- || status == GroupStatus.DELETED;
+ || status == GroupStatus.CONFIG_DELETED;
}
/**
@@ -163,8 +162,7 @@ public enum GroupStatus {
*/
public static boolean allowedSuspend(GroupStatus status) {
return status == GroupStatus.CONFIG_SUCCESSFUL
- || status == GroupStatus.RESTARTED
- || status == GroupStatus.SUSPENDED
+ || status == GroupStatus.CONFIGURATION_OFFLINE
|| status == GroupStatus.FINISH;
}
@@ -174,9 +172,9 @@ public enum GroupStatus {
public static boolean isTempStatus(GroupStatus status) {
return status == TO_BE_APPROVAL
|| status == CONFIG_ING
- || status == SUSPENDING
- || status == RESTARTING
- || status == DELETING;
+ || status == CONFIG_OFFLINE_ING
+ || status == CONFIG_ONLINE_ING
+ || status == CONFIG_DELETING;
}
public Integer getCode() {
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/SimpleGroupStatus.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/SimpleGroupStatus.java
index 88437f3d66..d9f6bdc98d 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/SimpleGroupStatus.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/SimpleGroupStatus.java
@@ -39,9 +39,9 @@ public enum SimpleGroupStatus {
case TO_BE_SUBMIT:
case TO_BE_APPROVAL:
return CREATE;
- case DELETING:
- case SUSPENDING:
- case RESTARTING:
+ case CONFIG_DELETING:
+ case CONFIG_OFFLINE_ING:
+ case CONFIG_ONLINE_ING:
return OPERATING;
case APPROVE_REJECTED:
return REJECTED;
@@ -51,13 +51,12 @@ public enum SimpleGroupStatus {
case CONFIG_FAILED:
return FAILED;
case CONFIG_SUCCESSFUL:
- case RESTARTED:
return STARTED;
- case SUSPENDED:
+ case CONFIGURATION_OFFLINE:
return STOPPED;
case FINISH:
return FINISHED;
- case DELETED:
+ case CONFIG_DELETED:
return DELETED;
default:
throw new IllegalArgumentException(String.format("Unsupported status %s for group", code));
@@ -83,9 +82,9 @@ public enum SimpleGroupStatus {
statusList.add(GroupStatus.TO_BE_SUBMIT.getCode());
return statusList;
case OPERATING:
- statusList.add(GroupStatus.DELETING.getCode());
- statusList.add(GroupStatus.SUSPENDING.getCode());
- statusList.add(GroupStatus.RESTARTING.getCode());
+ statusList.add(GroupStatus.CONFIG_DELETING.getCode());
+ statusList.add(GroupStatus.CONFIG_OFFLINE_ING.getCode());
+ statusList.add(GroupStatus.CONFIG_ONLINE_ING.getCode());
return statusList;
case REJECTED:
statusList.add(GroupStatus.APPROVE_REJECTED.getCode());
@@ -99,17 +98,16 @@ public enum SimpleGroupStatus {
statusList.add(GroupStatus.CONFIG_FAILED.getCode());
return statusList;
case STARTED:
- statusList.add(GroupStatus.RESTARTED.getCode());
statusList.add(GroupStatus.CONFIG_SUCCESSFUL.getCode());
return statusList;
case STOPPED:
- statusList.add(GroupStatus.SUSPENDED.getCode());
+ statusList.add(GroupStatus.CONFIGURATION_OFFLINE.getCode());
return statusList;
case FINISHED:
statusList.add(GroupStatus.FINISH.getCode());
return statusList;
case DELETED:
- statusList.add(GroupStatus.DELETED.getCode());
+ statusList.add(GroupStatus.CONFIG_DELETED.getCode());
return statusList;
default:
throw new IllegalArgumentException(String.format("Unsupported status %s for inlong group", status));
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
index a2cbad20f2..123221ff93 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
@@ -1226,7 +1226,7 @@ public class InlongClusterServiceImpl implements InlongClusterService {
clusterEntityList.forEach(e -> tagSet.addAll(Arrays.asList(e.getClusterTags().split(InlongConstants.COMMA))));
List<String> clusterTagList = new ArrayList<>(tagSet);
InlongGroupPageRequest groupRequest = InlongGroupPageRequest.builder()
- .statusList(Arrays.asList(GroupStatus.CONFIG_SUCCESSFUL.getCode(), GroupStatus.RESTARTED.getCode()))
+ .statusList(Collections.singletonList(GroupStatus.CONFIG_SUCCESSFUL.getCode()))
.clusterTagList(clusterTagList)
.build();
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
index f8724045ac..0d4ff83a37 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
@@ -449,7 +449,8 @@ public class AgentServiceImpl implements AgentService {
List<StreamSourceEntity> sourceEntities = sourceMapper.selectTemplateSourceByCluster(needCopiedStatusList,
Lists.newArrayList(SourceType.FILE), agentClusterName);
Set<GroupStatus> noNeedAddTask = Sets.newHashSet(
- GroupStatus.SUSPENDED, GroupStatus.SUSPENDING, GroupStatus.DELETING, GroupStatus.DELETED);
+ GroupStatus.CONFIGURATION_OFFLINE, GroupStatus.CONFIG_OFFLINE_ING, GroupStatus.CONFIG_DELETING,
+ GroupStatus.CONFIG_DELETED);
sourceEntities.stream()
.forEach(sourceEntity -> {
InlongGroupEntity groupEntity = groupMapper.selectByGroupId(sourceEntity.getInlongGroupId());
@@ -523,8 +524,7 @@ public class AgentServiceImpl implements AgentService {
SourceStatus.SOURCE_NORMAL,
SourceStatus.TO_BE_ISSUED_ADD,
SourceStatus.TO_BE_ISSUED_ACTIVE);
- Set<GroupStatus> matchedGroupStatus = Sets.newHashSet(
- GroupStatus.CONFIG_SUCCESSFUL, GroupStatus.RESTARTED);
+ Set<GroupStatus> matchedGroupStatus = Sets.newHashSet(GroupStatus.CONFIG_SUCCESSFUL);
if (matchGroup(sourceEntity, clusterNodeEntity)
&& groupEntity != null
&& !exceptedMatchedSourceStatus.contains(SourceStatus.forCode(sourceEntity.getStatus()))
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupProcessService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupProcessService.java
index 339f10b01c..b974e5f7ca 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupProcessService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupProcessService.java
@@ -128,7 +128,7 @@ public class InlongGroupProcessService {
public String suspendProcessAsync(String groupId, String operator) {
LOGGER.info("begin to suspend process asynchronously for groupId={} by operator={}", groupId, operator);
- groupService.updateStatus(groupId, GroupStatus.SUSPENDING.getCode(), operator);
+ groupService.updateStatus(groupId, GroupStatus.CONFIG_OFFLINE_ING.getCode(), operator);
InlongGroupInfo groupInfo = groupService.get(groupId);
GroupResourceProcessForm form = genGroupResourceProcessForm(groupInfo, GroupOperateType.SUSPEND);
UserInfo userInfo = LoginUserUtils.getLoginUser();
@@ -151,7 +151,7 @@ public class InlongGroupProcessService {
public WorkflowResult suspendProcess(String groupId, String operator) {
LOGGER.info("begin to suspend process for groupId={} by operator={}", groupId, operator);
- groupService.updateStatus(groupId, GroupStatus.SUSPENDING.getCode(), operator);
+ groupService.updateStatus(groupId, GroupStatus.CONFIG_OFFLINE_ING.getCode(), operator);
InlongGroupInfo groupInfo = groupService.get(groupId);
GroupResourceProcessForm form = genGroupResourceProcessForm(groupInfo, GroupOperateType.SUSPEND);
WorkflowResult result = workflowService.start(ProcessName.SUSPEND_GROUP_PROCESS, operator, form);
@@ -175,7 +175,7 @@ public class InlongGroupProcessService {
public String restartProcessAsync(String groupId, String operator) {
LOGGER.info("begin to restart process asynchronously for groupId={} by operator={}", groupId, operator);
- groupService.updateStatus(groupId, GroupStatus.RESTARTING.getCode(), operator);
+ groupService.updateStatus(groupId, GroupStatus.CONFIG_ONLINE_ING.getCode(), operator);
InlongGroupInfo groupInfo = groupService.get(groupId);
GroupResourceProcessForm form = genGroupResourceProcessForm(groupInfo, GroupOperateType.RESTART);
UserInfo userInfo = LoginUserUtils.getLoginUser();
@@ -196,7 +196,7 @@ public class InlongGroupProcessService {
public WorkflowResult restartProcess(String groupId, String operator) {
LOGGER.info("begin to restart process for groupId={} by operator={}", groupId, operator);
- groupService.updateStatus(groupId, GroupStatus.RESTARTING.getCode(), operator);
+ groupService.updateStatus(groupId, GroupStatus.CONFIG_ONLINE_ING.getCode(), operator);
InlongGroupInfo groupInfo = groupService.get(groupId);
GroupResourceProcessForm form = genGroupResourceProcessForm(groupInfo, GroupOperateType.RESTART);
WorkflowResult result = workflowService.start(ProcessName.RESTART_GROUP_PROCESS, operator, form);
@@ -292,9 +292,9 @@ public class InlongGroupProcessService {
boolean result;
switch (status) {
case CONFIG_ING:
- case SUSPENDING:
- case RESTARTING:
- case DELETING:
+ case CONFIG_OFFLINE_ING:
+ case CONFIG_ONLINE_ING:
+ case CONFIG_DELETING:
final int rerunProcess = request.getRerunProcess();
final int resetFinalStatus = request.getResetFinalStatus();
result = pendingGroupOpt(groupInfo, operator, status, rerunProcess, resetFinalStatus);
@@ -333,13 +333,12 @@ public class InlongGroupProcessService {
private GroupStatus getFinalStatus(GroupStatus pendingStatus) {
switch (pendingStatus) {
case CONFIG_ING:
+ case CONFIG_ONLINE_ING:
return GroupStatus.CONFIG_SUCCESSFUL;
- case SUSPENDING:
- return GroupStatus.SUSPENDED;
- case RESTARTING:
- return GroupStatus.RESTARTED;
+ case CONFIG_OFFLINE_ING:
+ return GroupStatus.CONFIGURATION_OFFLINE;
default:
- return GroupStatus.DELETED;
+ return GroupStatus.CONFIG_DELETED;
}
}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
index ed4e122296..4e994f8be1 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
@@ -549,7 +549,7 @@ public class InlongGroupServiceImpl implements InlongGroupService {
}
// determine whether the current status can be deleted
GroupStatus curState = GroupStatus.forCode(groupInfo.getStatus());
- if (GroupStatus.notAllowedTransition(curState, GroupStatus.DELETING)) {
+ if (GroupStatus.notAllowedTransition(curState, GroupStatus.CONFIG_DELETING)) {
throw new BusinessException(ErrorCodeEnum.GROUP_DELETE_NOT_ALLOWED,
String.format("current group status=%s was not allowed to delete", curState));
}
@@ -580,7 +580,7 @@ public class InlongGroupServiceImpl implements InlongGroupService {
}
entity.setIsDeleted(entity.getId());
- entity.setStatus(GroupStatus.DELETED.getCode());
+ entity.setStatus(GroupStatus.CONFIG_DELETED.getCode());
entity.setModifier(operator);
int rowCount = groupMapper.updateByIdentifierSelective(entity);
if (rowCount != InlongConstants.AFFECTED_ONE_ROW) {
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupCompleteListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupCompleteListener.java
index d1a7624141..d21ca83c92 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupCompleteListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupCompleteListener.java
@@ -65,11 +65,11 @@ public class UpdateGroupCompleteListener implements ProcessEventListener {
String operator = context.getOperator();
switch (operateType) {
case SUSPEND:
- groupService.updateStatus(groupId, GroupStatus.SUSPENDED.getCode(), operator);
+ groupService.updateStatus(groupId, GroupStatus.CONFIGURATION_OFFLINE.getCode(), operator);
groupService.update(groupRequest, operator);
break;
case RESTART:
- groupService.updateStatus(groupId, GroupStatus.RESTARTED.getCode(), operator);
+ groupService.updateStatus(groupId, GroupStatus.CONFIG_SUCCESSFUL.getCode(), operator);
groupService.update(groupRequest, operator);
break;
case DELETE:
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupListener.java
index bc7b685787..295d5c7421 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupListener.java
@@ -62,13 +62,13 @@ public class UpdateGroupListener implements ProcessEventListener {
String operator = context.getOperator();
switch (operateType) {
case SUSPEND:
- groupService.updateStatus(groupId, GroupStatus.SUSPENDING.getCode(), operator);
+ groupService.updateStatus(groupId, GroupStatus.CONFIG_OFFLINE_ING.getCode(), operator);
break;
case RESTART:
- groupService.updateStatus(groupId, GroupStatus.RESTARTING.getCode(), operator);
+ groupService.updateStatus(groupId, GroupStatus.CONFIG_ONLINE_ING.getCode(), operator);
break;
case DELETE:
- groupService.updateStatus(groupId, GroupStatus.DELETING.getCode(), operator);
+ groupService.updateStatus(groupId, GroupStatus.CONFIG_DELETING.getCode(), operator);
break;
default:
break;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/queue/QueueResourceListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/queue/QueueResourceListener.java
index b80763d1db..79eb6638cc 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/queue/QueueResourceListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/queue/QueueResourceListener.java
@@ -138,7 +138,7 @@ public class QueueResourceListener implements QueueOperateListener {
this.createQueueForStreams(groupInfo, groupProcessForm.getStreamInfos(), operator);
break;
case DELETE:
- groupService.updateStatus(groupId, GroupStatus.DELETING.getCode(), operator);
+ groupService.updateStatus(groupId, GroupStatus.CONFIG_DELETING.getCode(), operator);
queueOperator.deleteQueueForGroup(groupInfo, operator);
break;
default:
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/sort/SortConfigListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/sort/SortConfigListener.java
index 213bfed07e..b8d776c6e7 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/sort/SortConfigListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/sort/SortConfigListener.java
@@ -94,7 +94,7 @@ public class SortConfigListener implements SortOperateListener {
groupService.updateStatus(groupId, GroupStatus.CONFIG_ING.getCode(), context.getOperator());
break;
case RESTART:
- groupService.updateStatus(groupId, GroupStatus.RESTARTING.getCode(), context.getOperator());
+ groupService.updateStatus(groupId, GroupStatus.CONFIG_ONLINE_ING.getCode(), context.getOperator());
break;
}
InlongGroupInfo groupInfo = groupService.get(groupId);
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/stream/InlongStreamProcessService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/stream/InlongStreamProcessService.java
index 12c00cd7db..367e82d718 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/stream/InlongStreamProcessService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/stream/InlongStreamProcessService.java
@@ -82,7 +82,7 @@ public class InlongStreamProcessService {
InlongGroupInfo groupInfo = groupService.get(groupId);
Preconditions.expectNotNull(groupInfo, ErrorCodeEnum.GROUP_NOT_FOUND.getMessage());
GroupStatus groupStatus = GroupStatus.forCode(groupInfo.getStatus());
- if (groupStatus != GroupStatus.CONFIG_SUCCESSFUL && groupStatus != GroupStatus.RESTARTED) {
+ if (groupStatus != GroupStatus.CONFIG_SUCCESSFUL) {
throw new BusinessException(String.format("group status=%s not support start stream"
+ " for groupId=%s", groupStatus, groupId));
}
@@ -168,7 +168,7 @@ public class InlongStreamProcessService {
InlongGroupInfo groupInfo = groupService.get(groupId);
Preconditions.expectNotNull(groupInfo, ErrorCodeEnum.GROUP_NOT_FOUND.getMessage());
GroupStatus groupStatus = GroupStatus.forCode(groupInfo.getStatus());
- if (groupStatus != GroupStatus.CONFIG_SUCCESSFUL && groupStatus != GroupStatus.RESTARTED) {
+ if (groupStatus != GroupStatus.CONFIG_SUCCESSFUL) {
throw new BusinessException(
String.format("group status=%s not support restart stream for groupId=%s", groupStatus, groupId));
}
@@ -214,7 +214,7 @@ public class InlongStreamProcessService {
}
GroupStatus groupStatus = GroupStatus.forCode(groupInfo.getStatus());
- if (GroupStatus.notAllowedTransition(groupStatus, GroupStatus.DELETING)) {
+ if (GroupStatus.notAllowedTransition(groupStatus, GroupStatus.CONFIG_DELETING)) {
throw new BusinessException(ErrorCodeEnum.GROUP_DELETE_NOT_ALLOWED,
String.format("group status=%s not support delete stream for groupId=%s", groupStatus, groupId));
}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/tenant/InlongTenantServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/tenant/InlongTenantServiceImpl.java
index 4b0ac38b71..751c79c82b 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/tenant/InlongTenantServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/tenant/InlongTenantServiceImpl.java
@@ -188,7 +188,7 @@ public class InlongTenantServiceImpl implements InlongTenantService {
List<InlongGroupEntity> groups = groupMapper.selectAllGroupsByTenant(name);
List<InlongGroupEntity> notStopGroups =
groups.stream().filter(
- group -> !GroupStatus.DELETED.getCode().equals(group.getStatus()))
+ group -> !GroupStatus.CONFIG_DELETED.getCode().equals(group.getStatus()))
.collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(notStopGroups)) {
List<String> notStopGroupNames =
diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/AgentServiceTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/AgentServiceTest.java
index 0806c603d4..4cdd5b9c66 100644
--- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/AgentServiceTest.java
+++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/AgentServiceTest.java
@@ -142,7 +142,7 @@ class AgentServiceTest extends ServiceBaseTest {
sources.stream()
.filter(source -> source.getTemplateId() != null)
.forEach(source -> sourceService.stop(source.getId(), GLOBAL_OPERATOR));
- groupMapper.updateStatus(groupId, GroupStatus.SUSPENDED.getCode(), GLOBAL_OPERATOR);
+ groupMapper.updateStatus(groupId, GroupStatus.CONFIGURATION_OFFLINE.getCode(), GLOBAL_OPERATOR);
streamMapper.updateStatusByIdentifier(groupId, streamId, StreamStatus.SUSPENDED.getCode(), GLOBAL_OPERATOR);
}
@@ -154,7 +154,7 @@ class AgentServiceTest extends ServiceBaseTest {
sources.stream()
.filter(source -> source.getTemplateId() != null)
.forEach(source -> sourceService.restart(source.getId(), GLOBAL_OPERATOR));
- groupMapper.updateStatus(groupId, GroupStatus.RESTARTED.getCode(), GLOBAL_OPERATOR);
+ groupMapper.updateStatus(groupId, GroupStatus.CONFIG_SUCCESSFUL.getCode(), GLOBAL_OPERATOR);
streamMapper.updateStatusByIdentifier(groupId, streamId, StreamStatus.RESTARTED.getCode(), GLOBAL_OPERATOR);
}
diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/group/InlongGroupProcessServiceTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/group/InlongGroupProcessServiceTest.java
index 84a6479973..96bbef6a7a 100644
--- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/group/InlongGroupProcessServiceTest.java
+++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/group/InlongGroupProcessServiceTest.java
@@ -96,7 +96,7 @@ public class InlongGroupProcessServiceTest extends ServiceBaseTest {
ProcessResponse response = result.getProcessInfo();
Assertions.assertSame(response.getStatus(), ProcessStatus.COMPLETED);
InlongGroupInfo groupInfo = groupService.get(GROUP_ID);
- Assertions.assertEquals(groupInfo.getStatus(), GroupStatus.SUSPENDED.getCode());
+ Assertions.assertEquals(groupInfo.getStatus(), GroupStatus.CONFIGURATION_OFFLINE.getCode());
}
private void testRestartProcess() {
@@ -104,7 +104,7 @@ public class InlongGroupProcessServiceTest extends ServiceBaseTest {
ProcessResponse response = result.getProcessInfo();
Assertions.assertSame(response.getStatus(), ProcessStatus.COMPLETED);
InlongGroupInfo groupInfo = groupService.get(GROUP_ID);
- Assertions.assertEquals(groupInfo.getStatus(), GroupStatus.RESTARTED.getCode());
+ Assertions.assertEquals(groupInfo.getStatus(), GroupStatus.CONFIG_SUCCESSFUL.getCode());
}
}
diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/source/listener/StreamSourceListenerTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/source/listener/StreamSourceListenerTest.java
index 8aff987b4a..42df6bfc65 100644
--- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/source/listener/StreamSourceListenerTest.java
+++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/source/listener/StreamSourceListenerTest.java
@@ -101,9 +101,9 @@ public class StreamSourceListenerTest extends ServiceBaseTest {
}
private void testRestartSource(Integer sourceId) {
- groupService.updateStatus(GROUP_ID, GroupStatus.SUSPENDING.getCode(), GLOBAL_OPERATOR);
+ groupService.updateStatus(GROUP_ID, GroupStatus.CONFIG_OFFLINE_ING.getCode(), GLOBAL_OPERATOR);
groupService.update(groupInfo.genRequest(), GLOBAL_OPERATOR);
- groupService.updateStatus(GROUP_ID, GroupStatus.SUSPENDED.getCode(), GLOBAL_OPERATOR);
+ groupService.updateStatus(GROUP_ID, GroupStatus.CONFIGURATION_OFFLINE.getCode(), GLOBAL_OPERATOR);
groupService.update(groupInfo.genRequest(), GLOBAL_OPERATOR);
sourceService.updateStatus(GROUP_ID, null, SourceStatus.SOURCE_NORMAL.getCode(), GLOBAL_OPERATOR);
diff --git a/inlong-manager/manager-web/sql/changes-1.10.0.sql b/inlong-manager/manager-web/sql/changes-1.10.0.sql
index 1893852050..a9e906f81e 100644
--- a/inlong-manager/manager-web/sql/changes-1.10.0.sql
+++ b/inlong-manager/manager-web/sql/changes-1.10.0.sql
@@ -26,6 +26,7 @@ USE `apache_inlong_manager`;
ALTER TABLE `inlong_stream`
ADD COLUMN `wrap_type` varchar(256) DEFAULT 'INLONG_MSG_V0' COMMENT 'The message body wrap type, including: RAW, INLONG_MSG_V0, INLONG_MSG_V1, etc';
+UPDATE inlong_group SET status = 130 where status = 150;