opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

loadbalancer sync remove backend group

Browse Source
This commit is contained in:
tb365
2021-11-05 19:08:57 +08:00
parent 7eb2365595
commit 0fd3f99045
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/loadbalancerbackendgroups.go
+4
View File
@@ -977,6 +977,10 @@ func (lbbg *SLoadbalancerBackendGroup) syncRemoveCloudLoadbalancerBackendgroup(c
lockman.LockObject(ctx, lbbg)
defer lockman.ReleaseObject(ctx, lbbg)
if lbbg.GetProviderName() == api.CLOUD_PROVIDER_GOOGLE {
return nil
}
err := lbbg.ValidateDeleteCondition(ctx, nil)
if err != nil { // cannot delete
err = lbbg.SetStatus(userCred, api.LB_STATUS_UNKNOWN, "sync to delete")
pkg/compute/models/loadbalancerlisteners.go
+2 -1
View File
@@ -1134,7 +1134,8 @@ func (lblis *SLoadbalancerListener) constructFieldsFromCloudListener(userCred mc
lblis.BackendGroupId = lb.BackendGroupId
} else if group, err := db.FetchByExternalIdAndManagerId(LoadbalancerBackendGroupManager, groupId, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
sq := LoadbalancerManager.Query().SubQuery()
return q.Join(sq, sqlchemy.Equals(sq.Field("id"), q.Field("loadbalancer_id"))).Filter(sqlchemy.Equals(sq.Field("manager_id"), lb.ManagerId))
q = q.Join(sq, sqlchemy.Equals(sq.Field("id"), q.Field("loadbalancer_id"))).Filter(sqlchemy.Equals(sq.Field("manager_id"), lb.ManagerId))
return q.IsFalse("pending_deleted")
}); err == nil {
lblis.BackendGroupId = group.GetId()
}
pkg/multicloud/google/loadbalancer_components.go
+2 -3
View File
@@ -659,11 +659,10 @@ func (self *SLoadbalancer) GetInstanceGroups() ([]SInstanceGroup, error) {
if fs, ok := zonesFilter[zoneId]; ok {
f := fmt.Sprintf(`(selfLink="%s")`, ig)
if !utils.IsInStringArray(f, fs) {
fs = append(fs, f)
zonesFilter[zoneId] = append(fs, f)
}
} else {
fs = []string{fmt.Sprintf(`(selfLink="%s")`, ig)}
zonesFilter[zoneId] = fs
zonesFilter[zoneId] = []string{fmt.Sprintf(`(selfLink="%s")`, ig)}
}
}
}
pkg/multicloud/google/loadbalancer_listener.go
+4
View File
@@ -232,6 +232,10 @@ func (self *SLoadbalancerListener) GetStickySessionCookie() string {
}
func (self *SLoadbalancerListener) GetStickySessionCookieTimeout() int {
if len(self.backendService.ConsistentHash.HTTPCookie.TTL.Seconds) == 0 {
return 0
}
sec, err := strconv.Atoi(self.backendService.ConsistentHash.HTTPCookie.TTL.Seconds)
if err != nil {
log.Debugf("GetStickySessionCookieTimeout %s", err)