Skip to content

feat(backend): 集群index-error兼容 #15649 #15650

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

Open
vlhwnliang wants to merge 1 commit into
base: v1.5.0
Choose a base branch
from
Open

feat(backend): 集群index-error兼容 #15649 #15650

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
40 changes: 40 additions & 0 deletions dbm-ui/backend/db_services/dbbase/resources/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,43 @@ class ResourceNodeType(StrStructuredEnum):
BIZ = EnumField("biz", _("业务"))
CLUSTER = EnumField("cluster", _("集群"))
MODULE = EnumField("module", _("模块"))


DEFAULT_CLUSTER_DATA = {
"id": 0,
"db_type": "",
"phase": "",
"phase_name": "",
"status": "",
"operations": [],
"dns_to_clb": False,
"cluster_time_zone": "",
"cluster_name": "",
"cluster_alias": "",
"cluster_access_port": 0,
"cluster_stats": {},
"cluster_type": "",
"cluster_type_name": "",
"cluster_subzones": [],
"cluster_subzone_ids": [],
"disaster_tolerance_level": "",
"master_domain": "",
"slave_domain": "",
"cluster_entry": [],
"bk_biz_id": 0,
"bk_biz_name": "",
"bk_cloud_id": 0,
"bk_cloud_name": "",
"major_version": "",
"region": "",
"city": "",
"db_module_name": "",
"db_module_id": 0,
"creator": "",
"updater": "",
"create_at": "",
"update_at": "",
"cluster_spec": {},
"tags": [],
"zone_list": [],
}
36 changes: 22 additions & 14 deletions dbm-ui/backend/db_services/dbbase/resources/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
)
from backend.db_meta.models.city_map import BKSubzone
from backend.db_services.dbbase.instances.handlers import InstanceHandler
from backend.db_services.dbbase.resources.constants import DEFAULT_CLUSTER_DATA
from backend.db_services.dbbase.resources.query_base import (
build_q_for_cluster_name_or_alias,
build_q_for_domain_by_cluster,
Expand Down Expand Up @@ -692,20 +693,27 @@ def _filter_cluster_hook(
):
dns_to_clb = True

cluster_info = cls._to_cluster_representation(
cluster=cluster,
cluster_entry=cluster_entry,
db_module_names_map=db_module_names_map,
cluster_entry_map=cluster_entry_map,
cluster_operate_records_map=cluster_operate_records_map,
cloud_info=cloud_info,
biz_info=biz_info,
cluster_stats_map=cluster_stats_map,
dns_to_clb=dns_to_clb,
cluster_zone_map=cluster_zone_map,
**kwargs,
)
clusters.append(cluster_info)
try:
cluster_info = cls._to_cluster_representation(
cluster=cluster,
cluster_entry=cluster_entry,
db_module_names_map=db_module_names_map,
cluster_entry_map=cluster_entry_map,
cluster_operate_records_map=cluster_operate_records_map,
cloud_info=cloud_info,
biz_info=biz_info,
cluster_stats_map=cluster_stats_map,
dns_to_clb=dns_to_clb,
cluster_zone_map=cluster_zone_map,
**kwargs,
)
clusters.append(cluster_info)
except Exception as e:
error_cluster = DEFAULT_CLUSTER_DATA.copy()
error_cluster["id"] = cluster.id
error_cluster["master_domain"] = cluster.immute_domain
error_cluster["error"] = str(e)
clusters.append(error_cluster)

return ResourceList(count=count, data=clusters)

Expand Down
Loading