(inlong) branch master updated: [INLONG-10277][Manager] Fix the problem of migration failed when migrating multiple groups to the same tenant (#10285)

[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 af0cc8255a [INLONG-10277][Manager] Fix the problem of migration failed 
when migrating multiple groups to the same tenant (#10285)
af0cc8255a is described below

commit af0cc8255ab40161f6bf976ebd959bd728ac34c5
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Tue May 28 19:25:29 2024 +0800

    [INLONG-10277][Manager] Fix the problem of migration failed when migrating 
multiple groups to the same tenant (#10285)
---
 .../service/tenant/InlongTenantServiceImpl.java    | 31 ++++++++++++++++------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/tenant/InlongTenantServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/tenant/InlongTenantServiceImpl.java
index c19e981d33..ddc8a0fbd9 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/tenant/InlongTenantServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/tenant/InlongTenantServiceImpl.java
@@ -32,6 +32,7 @@ import 
org.apache.inlong.manager.dao.entity.InlongStreamEntity;
 import org.apache.inlong.manager.dao.entity.InlongTenantEntity;
 import org.apache.inlong.manager.dao.entity.StreamSinkEntity;
 import org.apache.inlong.manager.dao.entity.StreamSourceEntity;
+import org.apache.inlong.manager.dao.entity.TenantClusterTagEntity;
 import org.apache.inlong.manager.dao.mapper.DataNodeEntityMapper;
 import org.apache.inlong.manager.dao.mapper.InlongConsumeEntityMapper;
 import org.apache.inlong.manager.dao.mapper.InlongGroupEntityMapper;
@@ -236,14 +237,16 @@ public class InlongTenantServiceImpl implements 
InlongTenantService {
         // get related streams, consumes and tag;
         List<InlongStreamEntity> streamList = 
streamMapper.selectByGroupId(groupId);
         boolean streamMigrateResult = streamList.stream().allMatch(stream -> 
migrateStream(stream, from, to));
+        log.info("migrate stream from source tenant={} to target tenant={} for 
groupId={}, result={}", from, to,
+                groupId, streamMigrateResult);
         List<InlongConsumeEntity> consumeList = 
consumeEntityMapper.selectByGroupId(groupId);
         boolean consumeMigrateResult = this.migrateConsume(groupId, from, to, 
consumeList.size());
         boolean tagCopyResult = 
this.copyTenantTag(group.getInlongClusterTag(), from, to);
-
-        return streamMigrateResult
-                && consumeMigrateResult
-                && tagCopyResult
-                && this.migrateGroup(groupId, from, to);
+        boolean groupMigrateResult = this.migrateGroup(groupId, from, to);
+        boolean migrateResult = streamMigrateResult && consumeMigrateResult && 
tagCopyResult && groupMigrateResult;
+        log.info("migrate from source tenant={} to target tenant={} for 
groupId={}, result={}", from, to, groupId,
+                migrateResult);
+        return migrateResult;
     }
 
     public Boolean migrateStream(InlongStreamEntity stream, String from, 
String to) {
@@ -305,17 +308,29 @@ public class InlongTenantServiceImpl implements 
InlongTenantService {
     }
 
     public Boolean migrateConsume(String groupId, String from, String to, int 
size) {
-        return consumeEntityMapper.migrate(groupId, from, to) == size;
+        Boolean result = consumeEntityMapper.migrate(groupId, from, to) == 
size;
+        log.info("migrate consume from source tenant={} to target tenant={} 
for groupId={}, result={}", from, to,
+                groupId, result);
+        return result;
     }
 
     public Boolean migrateGroup(String groupId, String from, String to) {
-        return groupMapper.migrate(groupId, from, to) == 
InlongConstants.AFFECTED_ONE_ROW;
+        Boolean result = groupMapper.migrate(groupId, from, to) == 
InlongConstants.AFFECTED_ONE_ROW;
+        log.info("migrate group from source tenant={} to target tenant={} for 
groupId={}, result={}", from, to, groupId,
+                result);
+        return result;
     }
 
     public Boolean copyTenantTag(String clusterTag, String from, String to) {
         try {
+            TenantClusterTagEntity existEntity = 
tenantClusterTagMapper.selectByUniqueKey(clusterTag, to);
+            if (existEntity != null) {
+                log.debug("tag name={} in tenant={} already exist", 
clusterTag, to);
+                return true;
+            }
             // use displayName as the new name
-            return tenantClusterTagMapper.copy(clusterTag, from, to) == 
InlongConstants.AFFECTED_ONE_ROW;
+            tenantClusterTagMapper.copy(clusterTag, from, to);
+            return true;
         } catch (Exception e) {
             Throwable cause = e.getCause();
             if (cause instanceof SQLIntegrityConstraintViolationException) {