(inlong) branch master updated: [INLONG-9269][Manager] Fix get sort standalone cluster config empty (#9270)

[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 bdf63d50e1 [INLONG-9269][Manager]  Fix get sort standalone cluster 
config empty (#9270)
bdf63d50e1 is described below

commit bdf63d50e15df6847f83a68fe59dffb21b6a65ff
Author: castor <58140421+castor...@users.noreply.github.com>
AuthorDate: Mon Nov 13 14:06:59 2023 +0800

    [INLONG-9269][Manager]  Fix get sort standalone cluster config empty (#9270)
    
    Co-authored-by: castorqin <qhj00...@qq.com>
---
 .../manager/service/core/impl/SortSourceServiceImpl.java       |  2 +-
 .../inlong/manager/service/node/AbstractDataNodeOperator.java  | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortSourceServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortSourceServiceImpl.java
index 530ea89697..cafe428f37 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortSourceServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortSourceServiceImpl.java
@@ -393,7 +393,7 @@ public class SortSourceServiceImpl implements 
SortSourceService {
             boolean isBackupTag) {
         Map<String, String> param = cluster.getExtParamsMap();
         String tenant = 
Optional.ofNullable(param.get(KEY_NEW_TENANT)).orElse(param.get(KEY_OLD_TENANT));
-        String auth = param.get(KEY_AUTH);
+        String auth = param.getOrDefault(KEY_AUTH, StringUtils.EMPTY);
         List<Topic> sdkTopics = sinks.stream()
                 .map(sink -> {
                     String groupId = sink.getGroupId();
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/node/AbstractDataNodeOperator.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/node/AbstractDataNodeOperator.java
index c50207817a..9426b24b0b 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/node/AbstractDataNodeOperator.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/node/AbstractDataNodeOperator.java
@@ -97,7 +97,15 @@ public abstract class AbstractDataNodeOperator implements 
DataNodeOperator {
 
     @Override
     public Map<String, String> parse2SinkParams(DataNodeInfo info) {
-        return JsonUtils.parseObject(info.getExtParams(), HashMap.class);
+        HashMap<String, String> params = new HashMap<>();
+        HashMap<String, Object> streamInfoMap = 
JsonUtils.parseObject(info.getExtParams(), HashMap.class);
+        if (streamInfoMap == null) {
+            return params;
+        }
+        for (String key : streamInfoMap.keySet()) {
+            params.put(key, String.valueOf(streamInfoMap.get(key)));
+        }
+        return params;
     }
 
     @Override