You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by pa...@apache.org on 2022/11/17 11:39:29 UTC
[inlong] branch master updated: [INLONG-6563][Manager] It should throw error info when deleting an inlong group failed (#6564)
This is an automated email from the ASF dual-hosted git repository.
pacinogong 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 22e90d143 [INLONG-6563][Manager] It should throw error info when deleting an inlong group failed (#6564)
22e90d143 is described below
commit 22e90d14369a752689c0d59fc9a2c395e3da2233
Author: fuweng11 <76...@users.noreply.github.com>
AuthorDate: Thu Nov 17 19:39:23 2022 +0800
[INLONG-6563][Manager] It should throw error info when deleting an inlong group failed (#6564)
* Update InlongGroupProcessService.java
Co-authored-by: healchow <he...@gmail.com>
---
.../manager/service/group/InlongGroupProcessService.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
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 0109cdec1..5b7b9a345 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
@@ -22,6 +22,8 @@ import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
import org.apache.inlong.manager.common.enums.GroupOperateType;
import org.apache.inlong.manager.common.enums.GroupStatus;
import org.apache.inlong.manager.common.enums.ProcessName;
+import org.apache.inlong.manager.common.enums.TaskStatus;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.dao.entity.WorkflowProcessEntity;
import org.apache.inlong.manager.pojo.group.InlongGroupInfo;
@@ -29,6 +31,7 @@ import org.apache.inlong.manager.pojo.group.InlongGroupResetRequest;
import org.apache.inlong.manager.pojo.stream.InlongStreamBriefInfo;
import org.apache.inlong.manager.pojo.stream.InlongStreamInfo;
import org.apache.inlong.manager.pojo.workflow.ProcessRequest;
+import org.apache.inlong.manager.pojo.workflow.TaskResponse;
import org.apache.inlong.manager.pojo.workflow.WorkflowResult;
import org.apache.inlong.manager.pojo.workflow.form.process.ApplyGroupProcessForm;
import org.apache.inlong.manager.pojo.workflow.form.process.GroupResourceProcessForm;
@@ -289,7 +292,13 @@ public class InlongGroupProcessService {
InlongGroupInfo groupInfo = groupService.doDeleteCheck(groupId, operator);
// start to delete group process
GroupResourceProcessForm form = genGroupResourceProcessForm(groupInfo, GroupOperateType.DELETE);
- workflowService.start(ProcessName.DELETE_GROUP_PROCESS, operator, form);
+ WorkflowResult result = workflowService.start(ProcessName.DELETE_GROUP_PROCESS, operator, form);
+ List<TaskResponse> tasks = result.getNewTasks();
+ if (TaskStatus.FAILED == tasks.get(tasks.size() - 1).getStatus()) {
+ String errMsg = String.format("failed to delete inlong group for groupId=%s", groupId);
+ LOGGER.error(errMsg);
+ throw new WorkflowListenerException(errMsg);
+ }
}
/**