Merge pull request #158 from EvanSung/perf_20230824_optimize_ad_ci_re…

…lation perf(ad_ci_relation): optimize ad_ci relation
veops · Aug 24, 2023 · 4d36d44 · 4d36d44
2 parents 7e06713 + 0f1cb01
commit 4d36d44
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/cmdb-api/api/lib/cmdb/auto_discovery/auto_discovery.py b/cmdb-api/api/lib/cmdb/auto_discovery/auto_discovery.py
@@ -453,10 +453,12 @@ def accept(cls, adc, adc_id=None, nickname=None):
 
         relation_adts = AutoDiscoveryCIType.get_by(type_id=adt.type_id, adr_id=None, to_dict=False)
         for r_adt in relation_adts:
-            if r_adt.relation and ci_id is not None:
-                ad_key, cmdb_key = None, {}
-                for ad_key in r_adt.relation:
-                    cmdb_key = r_adt.relation[ad_key]
+            if not r_adt.relation or ci_id is None:
+                continue
+            for ad_key in r_adt.relation:
+                if not adc.instance.get(ad_key):
+                    continue
+                cmdb_key = r_adt.relation[ad_key]
                 query = "_type:{},{}:{}".format(cmdb_key.get('type_name'), cmdb_key.get('attr_name'),
                                                 adc.instance.get(ad_key))
                 s = search(query)