fix(backend): redis 补充整机替换亲和性 TencentBlueKing#9192

# Reviewed, transaction id: 29808
ygcyao · Jan 22, 2025 · 3e34b98 · 3e34b98
1 parent d50a6da
commit 3e34b98
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/dbm-ui/backend/ticket/builders/redis/redis_toolbox_cut_off.py b/dbm-ui/backend/ticket/builders/redis/redis_toolbox_cut_off.py
@@ -155,11 +155,24 @@ def patch_ticket_detail(self):
                             "count": 1,
                             "location_spec": {
                                 "city": cluster.region,
-                                "sub_zone_ids": [redis_master.machine.bk_sub_zone_id],
-                                "include_or_exclue": False,
+                                "sub_zone_ids": [],
                             },
+                            "affinity": cluster.disaster_tolerance_level,
                         }
 
+                        if resource_spec["affinity"] == AffinityEnum.CROS_SUBZONE:
+                            resource_spec[f"{role}_{role_host['ip']}"]["location_spec"].update(
+                                sub_zone_ids=[redis_master.machine.bk_sub_zone_id], include_or_exclue=False
+                            )
+
+                        elif resource_spec["affinity"] in [
+                            AffinityEnum.SAME_SUBZONE,
+                            AffinityEnum.SAME_SUBZONE_CROSS_SWTICH,
+                        ]:
+                            resource_spec[f"{role}_{role_host['ip']}"]["location_spec"].update(
+                                sub_zone_ids=[redis_master.machine.bk_sub_zone_id], include_or_exclue=True
+                            )
+
             info["resource_spec"] = resource_spec
 
         self.ticket.save(update_fields=["details"])