Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[INLONG-9066][Manager] Renaming group related states #9068

Merged
merged 2 commits into from
Oct 18, 2023
Merged

[INLONG-9066][Manager] Renaming group related states #9068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a808dc3
[INLONG-9066][Manager] Renaming group related states
fuweng11 Oct 18, 2023
1ca3d6f
[INLONG-9066][Manager] Add change sql
fuweng11 Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...nager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongGroupImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public InlongGroupContext delete(boolean async) throws Exception {
}
boolean isDeleted = groupClient.deleteInlongGroup(groupInfo.getInlongGroupId(), async);
if (isDeleted) {
groupInfo.setStatus(GroupStatus.DELETED.getCode());
groupInfo.setStatus(GroupStatus.CONFIG_DELETED.getCode());
}
return generateSnapshot();
}
Expand Down Expand Up @@ -277,7 +277,7 @@ private InlongGroupContext generateSnapshot() {
// 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);
}

Expand Down
56 changes: 27 additions & 29 deletions ...ager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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;
Expand Down Expand Up @@ -112,9 +112,9 @@ public static boolean notAllowedTransition(GroupStatus pre, GroupStatus now) {
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;
}

/**
Expand Down Expand Up @@ -142,8 +142,7 @@ public static boolean deleteStreamFirst(GroupStatus status) {
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;
}

Expand All @@ -155,16 +154,15 @@ public static boolean deleteStreamFirst(GroupStatus status) {
public static boolean allowedDeleteSubInfos(GroupStatus status) {
return status == GroupStatus.TO_BE_SUBMIT
|| status == GroupStatus.APPROVE_REJECTED
|| status == GroupStatus.DELETED;
|| status == GroupStatus.CONFIG_DELETED;
}

/**
* Checks whether the given status allows suspending operate.
*/
public static boolean allowedSuspend(GroupStatus status) {
return status == GroupStatus.CONFIG_SUCCESSFUL
|| status == GroupStatus.RESTARTED
|| status == GroupStatus.SUSPENDED
|| status == GroupStatus.CONFIGURATION_OFFLINE
|| status == GroupStatus.FINISH;
}

Expand All @@ -174,9 +172,9 @@ public static boolean allowedSuspend(GroupStatus status) {
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() {
Expand Down
22 changes: 10 additions & 12 deletions ...anager-common/src/main/java/org/apache/inlong/manager/common/enums/SimpleGroupStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ public static SimpleGroupStatus parseStatusByCode(int code) {
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;
Expand All @@ -51,13 +51,12 @@ public static SimpleGroupStatus parseStatusByCode(int code) {
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));
Expand All @@ -83,9 +82,9 @@ public static List<Integer> parseStatusCodeByStr(String status) {
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());
Expand All @@ -99,17 +98,16 @@ public static List<Integer> parseStatusCodeByStr(String status) {
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));
Expand Down
2 changes: 1 addition & 1 deletion ...ice/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1226,7 +1226,7 @@ public DataProxyConfig getDataProxyConfig(String clusterTag, String clusterName)
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();

Expand Down
6 changes: 3 additions & 3 deletions ...r-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,8 @@ private void preProcessTemplateFileTask(TaskRequest taskRequest) {
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());
Expand Down Expand Up @@ -523,8 +524,7 @@ private void preProcessLabelFileTasks(TaskRequest taskRequest) {
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()))
Expand Down
23 changes: 11 additions & 12 deletions ...vice/src/main/java/org/apache/inlong/manager/service/group/InlongGroupProcessService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public WorkflowResult startProcess(String groupId, String operator) {
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();
Expand All @@ -151,7 +151,7 @@ public String suspendProcessAsync(String groupId, String operator) {
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);
Expand All @@ -175,7 +175,7 @@ public WorkflowResult suspendProcess(String groupId, String operator) {
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();
Expand All @@ -196,7 +196,7 @@ public String restartProcessAsync(String groupId, String operator) {
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);
Expand Down Expand Up @@ -292,9 +292,9 @@ public boolean resetGroupStatus(InlongGroupResetRequest request, String operator
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);
Expand Down Expand Up @@ -333,13 +333,12 @@ private boolean pendingGroupOpt(InlongGroupInfo groupInfo, String operator, Grou
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;
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ public InlongGroupInfo doDeleteCheck(String groupId, String operator) {
}
// 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));
}
Expand Down Expand Up @@ -580,7 +580,7 @@ public Boolean delete(String groupId, String operator) {
}

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) {
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/org/apache/inlong/manager/service/listener/group/UpdateGroupCompleteListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ public ListenerResult listen(WorkflowContext context) {
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:
Expand Down
6 changes: 3 additions & 3 deletions ...e/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ public ListenerResult listen(WorkflowContext context) throws Exception {
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;
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/apache/inlong/manager/service/listener/queue/QueueResourceListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public ListenerResult listen(WorkflowContext context) throws WorkflowListenerExc
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:
Expand Down
2 changes: 1 addition & 1 deletion ...ice/src/main/java/org/apache/inlong/manager/service/listener/sort/SortConfigListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public ListenerResult listen(WorkflowContext context) throws WorkflowListenerExc
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);
Expand Down
Loading