Merge pull request #1152 from aboch/fi

Santhosh Manohar · Santhosh Manohar · commit 4033ff5df868 · 2016-05-04T17:16:58.000-07:00
Fix cleanup logic in case of ipv6 allocation failure
diff --git a/network.go b/network.go
@@ -1094,7 +1094,12 @@ func (n *network) ipamAllocate() error {
 		return nil
 	}
 
-	return n.ipamAllocateVersion(6, ipam)
+	err = n.ipamAllocateVersion(6, ipam)
+	if err != nil {
+		return err
+	}
+
+	return nil
 }
 
 func (n *network) requestPoolHelper(ipam ipamapi.Ipam, addressSpace, preferredPool, subPool string, options map[string]string, v6 bool) (string, *net.IPNet, map[string]string, error) {

Original file line number	Diff line number	Diff line change
`@@ -1094,7 +1094,12 @@ func (n *network) ipamAllocate() error {`
`1094`	`1094`	`return nil`
`1095`	`1095`	`}`
`1096`	`1096`
`1097`		`- return n.ipamAllocateVersion(6, ipam)`
	`1097`	`+ err = n.ipamAllocateVersion(6, ipam)`
	`1098`	`+ if err != nil {`
	`1099`	`+ return err`
	`1100`	`+ }`
	`1101`	`+`
	`1102`	`+ return nil`
`1098`	`1103`	`}`
`1099`	`1104`
`1100`	`1105`	`func (n network) requestPoolHelper(ipam ipamapi.Ipam, addressSpace, preferredPool, subPool string, options map[string]string, v6 bool) (string, net.IPNet, map[string]string, error) {`