Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(backend): mysql 升级支持安全模式 #7126 #7127

Merged
merged 1 commit into from
Sep 25, 2024
Merged

feat(backend): mysql 升级支持安全模式 #7126 #7127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dbm-ui/backend/flow/utils/mysql/mysql_act_playload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2338,7 +2338,7 @@ def get_mysql_upgrade_payload(self, **kwargs) -> dict:
"extend": {
"host": kwargs["ip"],
"ports": self.cluster["ports"],
"force": False,
"force": self.ticket_data["force"],
"pkg": mysql_pkg.name,
"pkg_md5": mysql_pkg.md5,
"run": self.cluster["run"],
Expand Down
2 changes: 1 addition & 1 deletion dbm-ui/backend/flow/utils/mysql/proxy_act_payload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def get_proxy_upgrade_payload(self, **kwargs) -> dict:
"extend": {
"host": kwargs["ip"],
"ports": self.cluster["proxy_ports"],
"force": False,
"force": self.ticket_data["force"],
"pkg": proxy_pkg.name,
"pkg_md5": proxy_pkg.md5,
},
Expand Down
1 change: 1 addition & 0 deletions dbm-ui/backend/ticket/builders/mysql/mysql_local_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class InfoSerializer(DisplayInfoSerializer):
pkg_id = serializers.IntegerField(help_text=_("目标版本包ID"))

infos = serializers.ListField(help_text=_("单据信息"), child=InfoSerializer())
force = serializers.BooleanField(help_text=_("是否强制执行"), required=False, default=False)


class MysqlLocalUpgradeParamBuilder(builders.FlowParamBuilder):
Expand Down
1 change: 1 addition & 0 deletions dbm-ui/backend/ticket/builders/mysql/mysql_migrate_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class InfoSerializer(DisplayInfoSerializer):
)
backup_source = serializers.ChoiceField(help_text=_("备份源"), choices=MySQLBackupSource.get_choices())
infos = serializers.ListField(help_text=_("添加信息"), child=InfoSerializer())
force = serializers.BooleanField(help_text=_("是否强制执行"), required=False, default=False)

def validate(self, attrs):
# 校验集群是否可用，集群类型为高可用
Expand Down
1 change: 1 addition & 0 deletions dbm-ui/backend/ticket/builders/redis/redis_toolbox_proxy_scale_up.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class InfoSerializer(ClusterValidateMixin, serializers.Serializer):

ip_source = serializers.ChoiceField(help_text=_("主机来源"), choices=IpSource.get_choices())
infos = serializers.ListField(help_text=_("批量操作参数列表"), child=InfoSerializer())
force = serializers.BooleanField(help_text=_("是否强制执行"), required=False, default=False)


class ProxyScaleUpParamBuilder(builders.FlowParamBuilder):
Expand Down
Loading