Merge pull request #1228 from weaveworks/1030-150-connect-forget

Don't init the ring if the address is not in range.

Fixes #1030.

ipam/allocate.go

@@ -35,6 +35,8 @@ func (g *allocate) Try(alloc *Allocator) bool {
 		return true
 	}
 
+	alloc.establishRing()
+
 	if ok, addr := alloc.space.Allocate(g.r); ok {
 		alloc.debugln("Allocated", addr, "for", g.ident, "in", g.r)
 		alloc.addOwned(g.ident, addr)

ipam/allocator.go

@@ -95,7 +95,6 @@ func (alloc *Allocator) doOperation(op operation, ops *[]operation) {
 			op.Cancel()
 			return
 		}
-		alloc.establishRing()
 		if !op.Try(alloc) {
 			*ops = append(*ops, op)
 		}

ipam/claim.go

@@ -38,6 +38,8 @@ func (c *claim) Try(alloc *Allocator) bool {
 		return true
 	}
 
+	alloc.establishRing()
+
 	switch owner := alloc.ring.Owner(c.addr); owner {
 	case alloc.ourName:
 		// success