Jelajahi Sumber

Merge pull request #1303 from mrjana/overlay

ovmanager: Error out on vxlan id alloc failure
Alessandro Boch 9 tahun lalu
induk
melakukan
3f6e3727e3
1 mengubah file dengan 2 tambahan dan 2 penghapusan
  1. 2 2
      libnetwork/drivers/overlay/ovmanager/ovmanager.go

+ 2 - 2
libnetwork/drivers/overlay/ovmanager/ovmanager.go

@@ -2,7 +2,6 @@ package ovmanager
 
 
 import (
 import (
 	"fmt"
 	"fmt"
-	"log"
 	"net"
 	"net"
 	"strconv"
 	"strconv"
 	"strings"
 	"strings"
@@ -111,7 +110,8 @@ func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data,
 		}
 		}
 
 
 		if err := n.obtainVxlanID(s); err != nil {
 		if err := n.obtainVxlanID(s); err != nil {
-			log.Printf("Could not obtain vxlan id for pool %s: %v", s.subnetIP, err)
+			n.releaseVxlanID()
+			return nil, fmt.Errorf("could not obtain vxlan id for pool %s: %v", s.subnetIP, err)
 		}
 		}
 
 
 		n.subnets = append(n.subnets, s)
 		n.subnets = append(n.subnets, s)