Merge pull request #1502 from stgraber/ovn

Fix duplicate OVN load-balancer entries

Author: hallyn

internal/server/network/ovn/errors.go

@@ -12,5 +12,8 @@ var ErrExists = fmt.Errorf("object already exists")
 // ErrNotFound indicates that a DB record doesn't exist.
 var ErrNotFound = ovsdbClient.ErrNotFound
 
+// ErrTooMany is returned when one match is expected but multiple are found.
+var ErrTooMany = fmt.Errorf("too many objects found")
+
 // ErrNotManaged indicates that a DB record wasn't created by Incus.
 var ErrNotManaged = fmt.Errorf("object not incus-managed")

internal/server/network/ovn/ovn_nb.go

@@ -207,10 +207,14 @@ func (o *NB) get(ctx context.Context, m ovsdbModel.Model) error {
 		return fmt.Errorf("Bad collection type")
 	}
 
-	if rVal.Len() != 1 {
+	if rVal.Len() == 0 {
 		return ovsdbClient.ErrNotFound
 	}
 
+	if rVal.Len() > 1 {
+		return ErrTooMany
+	}
+
 	reflect.ValueOf(m).Elem().Set(rVal.Index(0))
 	return nil
 }

internal/server/network/ovn/ovn_nb_actions.go

@@ -2975,8 +2975,12 @@ func (o *NB) CreateLoadBalancer(ctx context.Context, loadBalancerName OVNLoadBal
 		}
 
 		err := o.get(ctx, &lb)
-		if err == nil {
-			// Delete the load balancer.
+		if err == nil || err == ErrTooMany {
+			// Delete the load balancer (by name in case there are duplicates).
+			lb := ovnNB.LoadBalancer{
+				Name: name,
+			}
+
 			deleteOps, err := o.client.Where(&lb).Delete()
 			if err != nil {
 				return err