Skip to content

Commit 71e110f

Browse files
iSecloudzhangzhw8
authored andcommitted
fix(backend): 修复mysql部署版本错传的问题 #7464
1 parent 553c0fb commit 71e110f

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

dbm-ui/backend/ticket/builders/mysql/mysql_ha_apply.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,12 @@ def post_callback(self):
137137
@BuilderFactory.register(
138138
TicketType.MYSQL_HA_APPLY, is_apply=True, cluster_type=ClusterType.TenDBHA, iam=ActionEnum.MYSQL_APPLY
139139
)
140-
class MysqlHAApplyFlowBuilder(BaseMySQLHATicketFlowBuilder, MysqlSingleApplyFlowBuilder):
140+
class MysqlHAApplyFlowBuilder(BaseMySQLHATicketFlowBuilder):
141141
serializer = MysqlHAApplyDetailSerializer
142142
inner_flow_builder = MysqlHAApplyFlowParamBuilder
143143
inner_flow_name = _("MySQL高可用部署执行")
144144
resource_apply_builder = MysqlHaApplyResourceParamBuilder
145145

146146
def patch_ticket_detail(self):
147-
super().patch_dbconfig(cluster_type=ClusterType.TenDBHA)
147+
MysqlSingleApplyFlowBuilder.patch_dbconfig(ticket=self.ticket, cluster_type=ClusterType.TenDBHA)
148148
super().patch_ticket_detail()

dbm-ui/backend/ticket/builders/mysql/mysql_single_apply.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,14 @@ class MysqlSingleApplyFlowBuilder(BaseMySQLSingleTicketFlowBuilder):
208208
inner_flow_name = _("MySQL单节点部署执行")
209209
resource_apply_builder = MysqlSingleApplyResourceParamBuilder
210210

211-
def patch_dbconfig(self, cluster_type):
211+
@classmethod
212+
def patch_dbconfig(cls, ticket, cluster_type):
212213
# 补充数据库版本和字符集
213214
db_config = DBConfigApi.query_conf_item(
214215
{
215-
"bk_biz_id": str(self.ticket.bk_biz_id),
216+
"bk_biz_id": str(ticket.bk_biz_id),
216217
"level_name": dbconf_const.LevelName.MODULE,
217-
"level_value": str(self.ticket.details["db_module_id"]),
218+
"level_value": str(ticket.details["db_module_id"]),
218219
"conf_file": dbconf_const.DEPLOY_FILE_NAME,
219220
"conf_type": dbconf_const.ConfType.DEPLOY,
220221
"namespace": cluster_type,
@@ -226,8 +227,8 @@ def patch_dbconfig(self, cluster_type):
226227
if not db_config.get("db_version") or not db_config.get("charset"):
227228
raise TicketParamsVerifyException(_("获取数据库配置失败,请检查获取参数db_config: {}").format(db_config))
228229

229-
self.ticket.update_details(db_version=db_config.get("db_version"), charset=db_config.get("charset"))
230+
ticket.update_details(db_version=db_config.get("db_version"), charset=db_config.get("charset"))
230231

231232
def patch_ticket_detail(self):
232-
self.patch_dbconfig(cluster_type=ClusterType.TenDBSingle)
233+
self.patch_dbconfig(ticket=self.ticket, cluster_type=ClusterType.TenDBSingle)
233234
super().patch_ticket_detail()

0 commit comments

Comments
 (0)