lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-05-06 21:52:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): optimized listener rule list (#24741)

Browse Source
This commit is contained in:
屈轩
2026-04-29 14:09:23 +08:00
committed by GitHub
parent 88caf1cd2b
commit caa1c9e458
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/compute/models/loadbalancerlistenerrules.go
View File

@@ -646,22 +646,6 @@ func (lbr *SLoadbalancerListenerRule) ValidateUpdateData(ctx context.Context, us
return region.GetDriver().ValidateUpdateLoadbalancerListenerRuleData(ctx, userCred, input)
}
func (lbr *SLoadbalancerListenerRule) getMoreDetails(out api.LoadbalancerListenerRuleDetails) (api.LoadbalancerListenerRuleDetails, error) {
if lbr.BackendGroupId == "" {
log.Errorf("loadbalancer listener rule %s(%s): empty backend group field", lbr.Name, lbr.Id)
return out, nil
}
lbbg, err := LoadbalancerBackendGroupManager.FetchById(lbr.BackendGroupId)
if err != nil {
log.Errorf("loadbalancer listener rule %s(%s): fetch backend group (%s) error: %s",
lbr.Name, lbr.Id, lbr.BackendGroupId, err)
return out, err
}
out.BackendGroup = lbbg.GetName()
return out, nil
}
func (man *SLoadbalancerListenerRuleManager) FetchCustomizeColumns(
ctx context.Context,
userCred mcclient.TokenCredential,
@@ -677,14 +661,16 @@ func (man *SLoadbalancerListenerRuleManager) FetchCustomizeColumns(
certificateRows := man.SLoadbalancerCertificateResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
lbIds := make([]string, len(objs))
lbbgIds := make([]string, len(objs))
for i := range rows {
rows[i] = api.LoadbalancerListenerRuleDetails{
StatusStandaloneResourceDetails: stdRows[i],
LoadbalancerListenerResourceInfo: listenerRows[i],
LoadbalancerCertificateResourceInfo: certificateRows[i],
}
rows[i], _ = objs[i].(*SLoadbalancerListenerRule).getMoreDetails(rows[i])
lbIds[i] = rows[i].LoadbalancerId
lbr := objs[i].(*SLoadbalancerListenerRule)
lbIds[i] = rows[i].ListenerId
lbbgIds[i] = lbr.BackendGroupId
}
lbs := map[string]SLoadbalancer{}
@@ -693,12 +679,21 @@ func (man *SLoadbalancerListenerRuleManager) FetchCustomizeColumns(
return rows
}
lbbgs := map[string]SLoadbalancerBackendGroup{}
err = db.FetchStandaloneObjectsByIds(LoadbalancerBackendGroupManager, lbbgIds, &lbbgs)
if err != nil {
return rows
}
virObjs := make([]interface{}, len(objs))
for i := range rows {
if lb, ok := lbs[lbIds[i]]; ok {
virObjs[i] = &lb
rows[i].ProjectId = lb.ProjectId
}
if lbbg, ok := lbbgs[lbbgIds[i]]; ok {
rows[i].BackendGroup = lbbg.GetName()
}
}
return rows