From de766cc7e62082e8b12076276dc2d80160ab4fd4 Mon Sep 17 00:00:00 2001 From: Jana Radhakrishnan Date: Tue, 28 Jun 2016 13:46:22 -0700 Subject: [PATCH] ovmanager: Error out on vxlan id alloc failure Currently ovmanager simply logs an error when there is a vni allocation failure. Instead it should error out and free all the previously allocated vnis Signed-off-by: Jana Radhakrishnan --- libnetwork/drivers/overlay/ovmanager/ovmanager.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnetwork/drivers/overlay/ovmanager/ovmanager.go b/libnetwork/drivers/overlay/ovmanager/ovmanager.go index 72ea4aa955..78a586e08e 100644 --- a/libnetwork/drivers/overlay/ovmanager/ovmanager.go +++ b/libnetwork/drivers/overlay/ovmanager/ovmanager.go @@ -2,7 +2,6 @@ package ovmanager import ( "fmt" - "log" "net" "strconv" "strings" @@ -111,7 +110,8 @@ func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, } 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)