From ddbbb24fcf4bb95fa32eb4f33fd989d198a36ed8 Mon Sep 17 00:00:00 2001
From: Yousong Zhou <zhouyousong@yunionyun.com>
Date: Fri, 16 Nov 2018 14:51:07 +0000
Subject: [PATCH] loadbalancers: exclude pending_deleted when checking
 uniqueness

---
 pkg/compute/models/loadbalancerlistenerrules.go | 1 +
 pkg/compute/models/loadbalancerlisteners.go     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkg/compute/models/loadbalancerlistenerrules.go b/pkg/compute/models/loadbalancerlistenerrules.go
index e4f5455e0c..71be2e4b89 100644
--- a/pkg/compute/models/loadbalancerlistenerrules.go
+++ b/pkg/compute/models/loadbalancerlistenerrules.go
@@ -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)
diff --git a/pkg/compute/models/loadbalancerlisteners.go b/pkg/compute/models/loadbalancerlisteners.go
index 607fefa3f7..7ce180e9c1 100644
--- a/pkg/compute/models/loadbalancerlisteners.go
+++ b/pkg/compute/models/loadbalancerlisteners.go
@@ -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 {