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

loadbalancers: exclude pending_deleted when checking uniqueness

Browse Source
This commit is contained in:
Yousong Zhou
2018-11-16 14:51:07 +00:00
parent 97162f5965
commit ddbbb24fcf
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,7 @@ type SLoadbalancerListenerRule struct {
func loadbalancerListenerRuleCheckUniqueness(ctx context.Context, lbls *SLoadbalancerListener, domain, path string) error {
q := LoadbalancerListenerRuleManager.Query().
IsFalse("pending_deleted").
Equals("listener_id", lbls.Id).
Equals("domain", domain).
Equals("path", path)

1
pkg/compute/models/loadbalancerlisteners.go
View File

@@ -104,6 +104,7 @@ type SLoadbalancerListener struct {
func (man *SLoadbalancerListenerManager) checkListenerUniqueness(ctx context.Context, lb *SLoadbalancer, listenerType string, listenerPort int64) error {
q := man.Query().
IsFalse("pending_deleted").
Equals("loadbalancer_id", lb.Id).
Equals("listener_port", listenerPort)
switch listenerType {