Adding logs for ipam state

abhi · abhi · commit 2f2811dd14ac · 2018-05-14T15:44:49.000-07:00
Signed-off-by: Abhinandan Prativadi &lt;abhi@docker.com&gt;
diff --git a/libnetwork/bitseq/sequence.go b/libnetwork/bitseq/sequence.go
@@ -326,7 +326,6 @@ func (h *Handle) set(ordinal, start, end uint64, any bool, release bool, serial
 			}
 			h.Lock() // Acquire the lock back
 		}
-		logrus.Debugf("Received set for ordinal %v, start %v, end %v, any %t, release %t, serial:%v curr:%d \n", ordinal, start, end, any, release, serial, h.curr)
 		if serial {
 			curr = h.curr
 		}
@@ -466,8 +465,8 @@ func (h *Handle) Unselected() uint64 {
 func (h *Handle) String() string {
 	h.Lock()
 	defer h.Unlock()
-	return fmt.Sprintf("App: %s, ID: %s, DBIndex: 0x%x, bits: %d, unselected: %d, sequence: %s",
-		h.app, h.id, h.dbIndex, h.bits, h.unselected, h.head.toString())
+	return fmt.Sprintf("App: %s, ID: %s, DBIndex: 0x%x, Bits: %d, Unselected: %d, Sequence: %s Curr:%d",
+		h.app, h.id, h.dbIndex, h.bits, h.unselected, h.head.toString(), h.curr)
 }
 
 // MarshalJSON encodes Handle into json message
diff --git a/libnetwork/ipam/allocator.go b/libnetwork/ipam/allocator.go
@@ -526,6 +526,7 @@ func (a *Allocator) ReleaseAddress(poolID string, address net.IP) error {
 		return types.InternalErrorf("could not find bitmask in datastore for %s on address %v release from pool %s: %v",
 			k.String(), address, poolID, err)
 	}
+	defer logrus.Debugf("Released address PoolID:%s, Address:%v Sequence:%s", poolID, address, bm.String())
 
 	return bm.Unset(ipToUint64(h))
 }
@@ -537,6 +538,7 @@ func (a *Allocator) getAddress(nw *net.IPNet, bitmask *bitseq.Handle, prefAddres
 		base    *net.IPNet
 	)
 
+	logrus.Debugf("Request address PoolID:%v %s Serial:%v PrefAddress:%v ", nw, bitmask.String(), serial, prefAddress)
 	base = types.GetIPNetCopy(nw)
 
 	if bitmask.Unselected() <= 0 {

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,6 @@ func (h *Handle) set(ordinal, start, end uint64, any bool, release bool, serial`
`326`	`326`	`}`
`327`	`327`	`h.Lock() // Acquire the lock back`
`328`	`328`	`}`
`329`		`- logrus.Debugf("Received set for ordinal %v, start %v, end %v, any %t, release %t, serial:%v curr:%d \n", ordinal, start, end, any, release, serial, h.curr)`
`330`	`329`	`if serial {`
`331`	`330`	`curr = h.curr`
`332`	`331`	`}`
`@@ -466,8 +465,8 @@ func (h *Handle) Unselected() uint64 {`
`466`	`465`	`func (h *Handle) String() string {`
`467`	`466`	`h.Lock()`
`468`	`467`	`defer h.Unlock()`
`469`		`- return fmt.Sprintf("App: %s, ID: %s, DBIndex: 0x%x, bits: %d, unselected: %d, sequence: %s",`
`470`		`- h.app, h.id, h.dbIndex, h.bits, h.unselected, h.head.toString())`
	`468`	`+ return fmt.Sprintf("App: %s, ID: %s, DBIndex: 0x%x, Bits: %d, Unselected: %d, Sequence: %s Curr:%d",`
	`469`	`+ h.app, h.id, h.dbIndex, h.bits, h.unselected, h.head.toString(), h.curr)`
`471`	`470`	`}`
`472`	`471`
`473`	`472`	`// MarshalJSON encodes Handle into json message`
Original file line number	Diff line number	Diff line change
`@@ -526,6 +526,7 @@ func (a *Allocator) ReleaseAddress(poolID string, address net.IP) error {`
`526`	`526`	`return types.InternalErrorf("could not find bitmask in datastore for %s on address %v release from pool %s: %v",`
`527`	`527`	`k.String(), address, poolID, err)`
`528`	`528`	`}`
	`529`	`+ defer logrus.Debugf("Released address PoolID:%s, Address:%v Sequence:%s", poolID, address, bm.String())`
`529`	`530`
`530`	`531`	`return bm.Unset(ipToUint64(h))`
`531`	`532`	`}`
`@@ -537,6 +538,7 @@ func (a Allocator) getAddress(nw net.IPNet, bitmask *bitseq.Handle, prefAddres`
`537`	`538`	`base *net.IPNet`
`538`	`539`	`)`
`539`	`540`
	`541`	`+ logrus.Debugf("Request address PoolID:%v %s Serial:%v PrefAddress:%v ", nw, bitmask.String(), serial, prefAddress)`
`540`	`542`	`base = types.GetIPNetCopy(nw)`
`541`	`543`
`542`	`544`	`if bitmask.Unselected() <= 0 {`