You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by GitBox <gi...@apache.org> on 2022/07/26 08:55:05 UTC

[GitHub] [inlong] fuweng11 opened a new pull request, #5221: [INLONG-5219][Manager] Adjust the status update order of inlong group

fuweng11 opened a new pull request, #5221:
URL: https://github.com/apache/inlong/pull/5221

   ### Prepare a Pull Request
   - Fixes #5219 
   
   ### Motivation
   
   Make sure the workflow can enter the configuration state normally
   
   ### Modifications
   
   Adjust the status update order of inlong group
   Find cluster entities in the database before  bind cluster tag for inlong group.
   ### Verifying this change
   
   
   - [ ] This change is a trivial rework/code cleanup without any test coverage.
   
   - [X] This change is already covered by existing tests, such as:
     *(please describe tests)*
   
   - [ ] This change added tests and can be verified as follows:
   
   ### Documentation
   
     - Does this pull request introduce a new feature? (no)
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [inlong] healchow commented on a diff in pull request #5221: [INLONG-5219][Manager] Adjust the status update order of inlong group

Posted by GitBox <gi...@apache.org>.
healchow commented on code in PR #5221:
URL: https://github.com/apache/inlong/pull/5221#discussion_r929709183


##########
inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java:
##########
@@ -372,20 +372,21 @@ public void updateAfterApprove(InlongGroupApproveRequest approveRequest, String
             throw new WorkflowListenerException("inlong group status is [wait_approval], not allowed to approve again");
         }
 
-        // update status to [GROUP_APPROVE_PASSED]
-        this.updateStatus(groupId, GroupStatus.APPROVE_PASSED.getCode(), operator);
-
         // update other info for inlong group after approve
         if (StringUtils.isNotBlank(approveRequest.getInlongClusterTag())) {
             entity.setInlongGroupId(approveRequest.getInlongGroupId());
             entity.setInlongClusterTag(approveRequest.getInlongClusterTag());
             entity.setModifier(operator);
+            entity.setStatus(GroupStatus.APPROVE_PASSED.getCode());
             int rowCount = groupMapper.updateByIdentifierSelective(entity);
             if (rowCount != InlongConstants.AFFECTED_ONE_ROW) {
                 LOGGER.error("inlong group has already updated with group id={}, curVersion={}",
                         entity.getInlongGroupId(), entity.getVersion());
                 throw new BusinessException(ErrorCodeEnum.CONFIG_EXPIRED);
             }
+        }else {

Review Comment:
   Please add one blank after `}`.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [inlong] healchow merged pull request #5221: [INLONG-5219][Manager] Adjust the status update order of inlong group

Posted by GitBox <gi...@apache.org>.
healchow merged PR #5221:
URL: https://github.com/apache/inlong/pull/5221


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org