Skip to content

Commit a1c2dbf

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

File tree

4 files changed

+21
-19
lines changed

4 files changed

+21
-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: 12 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,15 @@ def del_clb_rs(self, instance_list: list) -> bool:
4646
},
4747
raw=True,
4848
)
49+
if "code" in res and res["code"] != 0:
50+
return False
4951
return True
5052

5153
def add_clb_rs(self, instance_list: list) -> bool:
5254
"""
5355
增加clb后端的rs记录;适用场景:proxy上架的时候需要新增
5456
"""
55-
NameServiceApi.clb_register_part_target(
57+
res = NameServiceApi.clb_register_part_target(
5658
{
5759
"region": self.clb_region,
5860
"loadbalancerid": self.clb_id,
@@ -61,28 +63,32 @@ def add_clb_rs(self, instance_list: list) -> bool:
6163
},
6264
raw=True,
6365
)
66+
if "code" in res and res["code"] != 0:
67+
return False
6468
return True
6569

6670
def deregiste_clb(self) -> bool:
6771
"""
6872
删除clb后端的rs记录,并删除clb;
6973
适用场景:集群下架
7074
"""
71-
NameServiceApi.clb_deregister_target_and_del_lb(
75+
res = NameServiceApi.clb_deregister_target_and_del_lb(
7276
{
7377
"region": self.clb_region,
7478
"loadbalancerid": self.clb_id,
7579
"listenerid": self.listener_id,
7680
},
7781
raw=True,
7882
)
83+
if "code" in res and res["code"] != 0:
84+
return False
7985
return True
8086

8187
def update_clb_rs_weight(self, instance_list: list, weight: int) -> bool:
8288
"""
8389
修改clb权重;适用场景:proxy缩容前置行为
8490
"""
85-
NameServiceApi.clb_change_target_weight(
91+
res = NameServiceApi.clb_change_target_weight(
8692
{
8793
"region": self.clb_region,
8894
"loadbalancerid": self.clb_id,
@@ -92,4 +98,6 @@ def update_clb_rs_weight(self, instance_list: list, weight: int) -> bool:
9298
},
9399
raw=True,
94100
)
101+
if "code" in res and res["code"] != 0:
102+
return False
95103
return True

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,27 +41,31 @@ 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+
return False
4850
return True
4951

5052
def add_polaris_rs(self, instance_list: list) -> bool:
5153
"""
5254
增加polaris后端的rs记录;适用场景:proxy上架的时候需要新增
5355
"""
54-
NameServiceApi.polaris_bind_part_targets(
56+
res = NameServiceApi.polaris_bind_part_targets(
5557
{"servicename": self.servicename, "servicetoken": self.servicetoken, "ips": instance_list},
5658
raw=True,
5759
)
60+
if "code" in res and res["code"] != 0:
61+
return False
5862
return True
5963

6064
def deregiste_polaris(self) -> bool:
6165
"""
6266
删除polaris后端rs记录,并删除polaris;适用场景:集群下架
6367
"""
64-
NameServiceApi.polaris_unbind_targets_and_delete_alias_service(
68+
res = NameServiceApi.polaris_unbind_targets_and_delete_alias_service(
6569
{
6670
"servicename": self.servicename,
6771
"servicetoken": self.servicetoken,
@@ -70,4 +74,6 @@ def deregiste_polaris(self) -> bool:
7074
},
7175
raw=True,
7276
)
77+
if "code" in res and res["code"] != 0:
78+
return False
7379
return True

0 commit comments

Comments
 (0)