Merge pull request #1913 from jsonwan/3.7.x

bugfix: 在CMDB跨业务转移主机后从ESB接口立即使用报主机无效 #1909
TencentBlueKing · Apr 6, 2023 · d9194ee · d9194ee
2 parents dc3c191 + b02eaba
commit d9194ee
Showing 1 changed file with 84 additions and 3 deletions.
diff --git a/...job-manage/src/main/java/com/tencent/bk/job/manage/service/host/impl/HostServiceImpl.java b/...job-manage/src/main/java/com/tencent/bk/job/manage/service/host/impl/HostServiceImpl.java
@@ -1366,6 +1366,11 @@ public ServiceListAppHostResultDTO listAppHostsPreferCache(Long appId,
             }
         });
 
+        // 对于判定为其他业务下的主机，可能是缓存数据不准确导致，需要根据CMDB实时数据进行二次判定
+        if (CollectionUtils.isNotEmpty(notInAppHosts)) {
+            reConfirmNotInAppHostsByCmdb(notInAppHosts, notExistHosts, validHosts, appId, includeBizIds);
+        }
+
         if (CollectionUtils.isNotEmpty(notExistHosts) || CollectionUtils.isNotEmpty(notInAppHosts)) {
             log.info("Contains invalid hosts, appId: {}, notExistHosts: {}, hostsInOtherApp: {}",
                 appId, notExistHosts, notInAppHosts);
@@ -1378,6 +1383,47 @@ public ServiceListAppHostResultDTO listAppHostsPreferCache(Long appId,
         return result;
     }
 
+    /**
+     * 对于判定为其他业务下的主机，可能是缓存数据不准确导致，根据CMDB实时数据进行二次判定
+     *
+     * @param notInAppHosts 前期判定为在其他业务下的主机，在该方法中数据可能被修改
+     * @param notExistHosts 前期判定为不存在的主机，在该方法中数据可能被修改
+     * @param validHosts    前期判定为在业务下的主机，在该方法中数据可能被修改
+     * @param appId         Job内业务ID
+     * @param includeBizIds Job内业务ID可能对应的多个CMDB业务ID列表
+     */
+    private void reConfirmNotInAppHostsByCmdb(List<HostDTO> notInAppHosts,
+                                              List<HostDTO> notExistHosts,
+                                              List<HostDTO> validHosts,
+                                              Long appId,
+                                              List<Long> includeBizIds) {
+        Pair<List<HostDTO>, List<ApplicationHostDTO>> cmdbHostsPair = listHostsFromCmdb(notInAppHosts);
+        if (CollectionUtils.isNotEmpty(cmdbHostsPair.getLeft())) {
+            notExistHosts.addAll(cmdbHostsPair.getLeft());
+        }
+        List<ApplicationHostDTO> cmdbExistHosts = cmdbHostsPair.getRight();
+        if (CollectionUtils.isNotEmpty(cmdbExistHosts)) {
+            notInAppHosts.clear();
+            List<ApplicationHostDTO> cmdbValidHosts = new ArrayList<>();
+            cmdbExistHosts.forEach(existHost -> {
+                if (includeBizIds.contains(existHost.getBizId())) {
+                    validHosts.add(existHost.toHostDTO());
+                    cmdbValidHosts.add(existHost);
+                } else {
+                    notInAppHosts.add(existHost.toHostDTO());
+                }
+            });
+            if (!cmdbValidHosts.isEmpty()) {
+                log.info(
+                    "{} hosts belong to appId {} after check in cmdb, cmdbValidHosts={}",
+                    cmdbValidHosts.size(),
+                    appId,
+                    cmdbValidHosts
+                );
+            }
+        }
+    }
+
     private void refreshHostAgentIdIfNeed(boolean needRefreshAgentId, List<ApplicationHostDTO> hosts) {
         // 如果Job缓存的主机中没有agentId，那么需要从cmdb实时获取（解决一些特殊场景，比如节点管理Agent插件安装，bk_agent_id更新事件还没被处理的场景
         if (!needRefreshAgentId || CollectionUtils.isEmpty(hosts)) {
@@ -1409,19 +1455,54 @@ private void refreshHostAgentIdIfNeed(boolean needRefreshAgentId, List<Applicati
             missingAgentIdHostIds, hostIdAndAgentIdMap, System.currentTimeMillis() - start);
     }
 
-    private Pair<List<HostDTO>, List<ApplicationHostDTO>> listHostsFromCacheOrCmdb(Collection<HostDTO> hosts) {
-        List<ApplicationHostDTO> appHosts = new ArrayList<>();
+    private Pair<List<HostDTO>, List<ApplicationHostDTO>> listHostsFromCmdb(Collection<HostDTO> hosts) {
         List<HostDTO> notExistHosts = new ArrayList<>();
+        List<ApplicationHostDTO> appHosts = new ArrayList<>();
+        Pair<List<Long>, List<String>> pair = separateByHostIdOrCloudIp(hosts);
+        List<Long> hostIds = pair.getLeft();
+        List<String> cloudIps = pair.getRight();
+        if (CollectionUtils.isNotEmpty(hostIds)) {
+            Pair<List<Long>, List<ApplicationHostDTO>> result =
+                new ListHostByHostIdsStrategy().listHostsFromCmdb(hostIds);
+            appHosts.addAll(result.getRight());
+            if (CollectionUtils.isNotEmpty(result.getLeft())) {
+                result.getLeft().forEach(notExistHostId -> {
+                    notExistHosts.add(HostDTO.fromHostId(notExistHostId));
+                });
+            }
+        }
+        if (CollectionUtils.isNotEmpty(cloudIps)) {
+            Pair<List<String>, List<ApplicationHostDTO>> result =
+                new ListHostByIpsStrategy().listHostsFromCmdb(cloudIps);
+            appHosts.addAll(result.getRight());
+            if (CollectionUtils.isNotEmpty(result.getLeft())) {
+                result.getLeft().forEach(notExistCloudIp -> {
+                    notExistHosts.add(HostDTO.fromCloudIp(notExistCloudIp));
+                });
+            }
+        }
+        return Pair.of(notExistHosts, appHosts);
+    }
+
+    private Pair<List<Long>, List<String>> separateByHostIdOrCloudIp(Collection<HostDTO> hosts) {
         List<Long> hostIds = new ArrayList<>();
         List<String> cloudIps = new ArrayList<>();
         hosts.forEach(host -> {
             if (host.getHostId() != null) {
                 hostIds.add(host.getHostId());
             } else {
-                // 兼容使用云区域+ip来代表主机的场景
                 cloudIps.add(host.toCloudIp());
             }
         });
+        return Pair.of(hostIds, cloudIps);
+    }
+
+    private Pair<List<HostDTO>, List<ApplicationHostDTO>> listHostsFromCacheOrCmdb(Collection<HostDTO> hosts) {
+        List<ApplicationHostDTO> appHosts = new ArrayList<>();
+        List<HostDTO> notExistHosts = new ArrayList<>();
+        Pair<List<Long>, List<String>> pair = separateByHostIdOrCloudIp(hosts);
+        List<Long> hostIds = pair.getLeft();
+        List<String> cloudIps = pair.getRight();
         if (CollectionUtils.isNotEmpty(hostIds)) {
             Pair<List<Long>, List<ApplicationHostDTO>> result = listHostsByStrategy(hostIds,
                 new ListHostByHostIdsStrategy());