Skip to content

Commit b775178

Browse files
committed
fix(redis): name_api_error TencentBlueKing#10215
1 parent ee6fb3a commit b775178

File tree

4 files changed

+28
-19
lines changed

4 files changed

+28
-19
lines changed

dbm-ui/backend/flow/plugins/components/collections/common/clb_manage.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,6 @@ def _execute(self, data, parent_data) -> bool:
8585
else:
8686
self.log_error(_("无法适配到传入的域名处理类型,请联系系统管理员:{}").format(dns_op_type))
8787
return False
88-
89-
self.log_info(result)
90-
if "code" in result and result["code"] != 0:
91-
self.log_error(_("调用clb执行失败:{}").format(result))
92-
return False
93-
self.log_info("successfully")
9488
return result
9589

9690
def inputs_format(self) -> List:

dbm-ui/backend/flow/plugins/components/collections/common/polaris_manage.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,6 @@ def _execute(self, data, parent_data) -> bool:
7575
else:
7676
self.log_error(_("无法适配到传入的域名处理类型,请联系系统管理员:{}").format(dns_op_type))
7777
return False
78-
79-
self.log_info(result)
80-
if "code" in result and result["code"] != 0:
81-
self.log_error(_("调用polaris执行失败").format(result))
82-
return False
83-
self.log_info("successfully")
8478
return result
8579

8680
def inputs_format(self) -> List:

dbm-ui/backend/flow/utils/clb_manage.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def del_clb_rs(self, instance_list: list) -> bool:
3737
"""
3838
删除clb后端的rs记录;适用场景:proxy下架的时候需要删除
3939
"""
40-
NameServiceApi.clb_deregister_part_target(
40+
res = NameServiceApi.clb_deregister_part_target(
4141
{
4242
"region": self.clb_region,
4343
"loadbalancerid": self.clb_id,
@@ -46,13 +46,16 @@ def del_clb_rs(self, instance_list: list) -> bool:
4646
},
4747
raw=True,
4848
)
49+
if "code" in res and res["code"] != 0:
50+
logger.error(res)
51+
return False
4952
return True
5053

5154
def add_clb_rs(self, instance_list: list) -> bool:
5255
"""
5356
增加clb后端的rs记录;适用场景:proxy上架的时候需要新增
5457
"""
55-
NameServiceApi.clb_register_part_target(
58+
res = NameServiceApi.clb_register_part_target(
5659
{
5760
"region": self.clb_region,
5861
"loadbalancerid": self.clb_id,
@@ -61,28 +64,34 @@ def add_clb_rs(self, instance_list: list) -> bool:
6164
},
6265
raw=True,
6366
)
67+
if "code" in res and res["code"] != 0:
68+
logger.error(res)
69+
return False
6470
return True
6571

6672
def deregiste_clb(self) -> bool:
6773
"""
6874
删除clb后端的rs记录,并删除clb;
6975
适用场景:集群下架
7076
"""
71-
NameServiceApi.clb_deregister_target_and_del_lb(
77+
res = NameServiceApi.clb_deregister_target_and_del_lb(
7278
{
7379
"region": self.clb_region,
7480
"loadbalancerid": self.clb_id,
7581
"listenerid": self.listener_id,
7682
},
7783
raw=True,
7884
)
85+
if "code" in res and res["code"] != 0:
86+
logger.error(res)
87+
return False
7988
return True
8089

8190
def update_clb_rs_weight(self, instance_list: list, weight: int) -> bool:
8291
"""
8392
修改clb权重;适用场景:proxy缩容前置行为
8493
"""
85-
NameServiceApi.clb_change_target_weight(
94+
res = NameServiceApi.clb_change_target_weight(
8695
{
8796
"region": self.clb_region,
8897
"loadbalancerid": self.clb_id,
@@ -92,4 +101,7 @@ def update_clb_rs_weight(self, instance_list: list, weight: int) -> bool:
92101
},
93102
raw=True,
94103
)
104+
if "code" in res and res["code"] != 0:
105+
logger.error(res)
106+
return False
95107
return True

dbm-ui/backend/flow/utils/polaris_manage.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,27 +41,33 @@ def del_polaris_rs(self, instance_list: list) -> bool:
4141
"""
4242
删除polaris后端的rs记录;适用场景:proxy下架的时候需要删除
4343
"""
44-
NameServiceApi.polaris_unbind_part_targets(
44+
res = NameServiceApi.polaris_unbind_part_targets(
4545
{"servicename": self.servicename, "servicetoken": self.servicetoken, "ips": instance_list},
4646
raw=True,
4747
)
48+
if "code" in res and res["code"] != 0:
49+
logger.error(res)
50+
return False
4851
return True
4952

5053
def add_polaris_rs(self, instance_list: list) -> bool:
5154
"""
5255
增加polaris后端的rs记录;适用场景:proxy上架的时候需要新增
5356
"""
54-
NameServiceApi.polaris_bind_part_targets(
57+
res = NameServiceApi.polaris_bind_part_targets(
5558
{"servicename": self.servicename, "servicetoken": self.servicetoken, "ips": instance_list},
5659
raw=True,
5760
)
61+
if "code" in res and res["code"] != 0:
62+
logger.error(res)
63+
return False
5864
return True
5965

6066
def deregiste_polaris(self) -> bool:
6167
"""
6268
删除polaris后端rs记录,并删除polaris;适用场景:集群下架
6369
"""
64-
NameServiceApi.polaris_unbind_targets_and_delete_alias_service(
70+
res = NameServiceApi.polaris_unbind_targets_and_delete_alias_service(
6571
{
6672
"servicename": self.servicename,
6773
"servicetoken": self.servicetoken,
@@ -70,4 +76,7 @@ def deregiste_polaris(self) -> bool:
7076
},
7177
raw=True,
7278
)
79+
if "code" in res and res["code"] != 0:
80+
logger.error(res)
81+
return False
7382
return True

0 commit comments

Comments
 (0)