[inlong] branch master updated: [INLONG-6773][Manager] Fix the problem of sink cannot jump from the configuration to successful configuration (#6774)

[dockerzhang]

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 db8a69dd6 [INLONG-6773][Manager] Fix the problem of sink cannot jump 
from the configuration to successful configuration (#6774)
db8a69dd6 is described below

commit db8a69dd65859ece7f55e9811453821533c025ae
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Wed Dec 7 22:28:33 2022 +0800

    [INLONG-6773][Manager] Fix the problem of sink cannot jump from the 
configuration to successful configuration (#6774)
---
 .../apache/inlong/manager/service/sink/StreamSinkServiceImpl.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkServiceImpl.java
index 9c776748b..bd6332fd2 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkServiceImpl.java
@@ -120,7 +120,9 @@ public class StreamSinkServiceImpl implements 
StreamSinkService {
         int id = sinkOperator.saveOpt(request, operator);
         boolean streamSuccess = 
StreamStatus.CONFIG_SUCCESSFUL.getCode().equals(streamEntity.getStatus());
         if (streamSuccess || 
StreamStatus.CONFIG_FAILED.getCode().equals(streamEntity.getStatus())) {
-            SinkStatus nextStatus = SinkStatus.CONFIG_ING;
+            boolean enableCreateResource = 
InlongConstants.ENABLE_CREATE_RESOURCE.equals(
+                    request.getEnableCreateResource());
+            SinkStatus nextStatus = enableCreateResource ? 
SinkStatus.CONFIG_ING : SinkStatus.CONFIG_SUCCESSFUL;
             StreamSinkEntity sinkEntity = sinkMapper.selectByPrimaryKey(id);
             sinkEntity.setStatus(nextStatus.getCode());
             sinkMapper.updateStatus(sinkEntity);
@@ -246,7 +248,9 @@ public class StreamSinkServiceImpl implements 
StreamSinkService {
         SinkStatus nextStatus = null;
         boolean streamSuccess = 
StreamStatus.CONFIG_SUCCESSFUL.getCode().equals(streamEntity.getStatus());
         if (streamSuccess || 
StreamStatus.CONFIG_FAILED.getCode().equals(streamEntity.getStatus())) {
-            nextStatus = SinkStatus.CONFIG_ING;
+            boolean enableCreateResource = 
InlongConstants.ENABLE_CREATE_RESOURCE.equals(
+                    request.getEnableCreateResource());
+            nextStatus = enableCreateResource ? SinkStatus.CONFIG_ING : 
SinkStatus.CONFIG_SUCCESSFUL;
         }
         StreamSinkOperator sinkOperator = 
operatorFactory.getInstance(request.getSinkType());
         sinkOperator.updateOpt(request, nextStatus, operator);