Browse code

Adding logs for ipam state

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>

Abhinandan Prativadi authored on 2018/05/11 03:09:12
Showing 2 changed files
... ...
@@ -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 466
 func (h *Handle) String() string {
467 467
 	h.Lock()
468 468
 	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())
469
+	return fmt.Sprintf("App: %s, ID: %s, DBIndex: 0x%x, Bits: %d, Unselected: %d, Sequence: %s Curr:%d",
470
+		h.app, h.id, h.dbIndex, h.bits, h.unselected, h.head.toString(), h.curr)
471 471
 }
472 472
 
473 473
 // MarshalJSON encodes Handle into json message
... ...
@@ -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 537
 		base    *net.IPNet
538 538
 	)
539 539
 
540
+	logrus.Debugf("Request address PoolID:%v %s Serial:%v PrefAddress:%v ", nw, bitmask.String(), serial, prefAddress)
540 541
 	base = types.GetIPNetCopy(nw)
541 542
 
542 543
 	if bitmask.Unselected() <= 0 {