commit
6130c11481
|
@ -326,7 +326,6 @@ func (h *Handle) set(ordinal, start, end uint64, any bool, release bool, serial
|
||||||
}
|
}
|
||||||
h.Lock() // Acquire the lock back
|
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 {
|
if serial {
|
||||||
curr = h.curr
|
curr = h.curr
|
||||||
}
|
}
|
||||||
|
@ -466,8 +465,8 @@ func (h *Handle) Unselected() uint64 {
|
||||||
func (h *Handle) String() string {
|
func (h *Handle) String() string {
|
||||||
h.Lock()
|
h.Lock()
|
||||||
defer h.Unlock()
|
defer h.Unlock()
|
||||||
return fmt.Sprintf("App: %s, ID: %s, DBIndex: 0x%x, bits: %d, unselected: %d, sequence: %s",
|
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.app, h.id, h.dbIndex, h.bits, h.unselected, h.head.toString(), h.curr)
|
||||||
}
|
}
|
||||||
|
|
||||||
// MarshalJSON encodes Handle into json message
|
// MarshalJSON encodes Handle into json message
|
||||||
|
|
|
@ -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",
|
return types.InternalErrorf("could not find bitmask in datastore for %s on address %v release from pool %s: %v",
|
||||||
k.String(), address, poolID, err)
|
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))
|
return bm.Unset(ipToUint64(h))
|
||||||
}
|
}
|
||||||
|
@ -537,6 +538,7 @@ func (a *Allocator) getAddress(nw *net.IPNet, bitmask *bitseq.Handle, prefAddres
|
||||||
base *net.IPNet
|
base *net.IPNet
|
||||||
)
|
)
|
||||||
|
|
||||||
|
logrus.Debugf("Request address PoolID:%v %s Serial:%v PrefAddress:%v ", nw, bitmask.String(), serial, prefAddress)
|
||||||
base = types.GetIPNetCopy(nw)
|
base = types.GetIPNetCopy(nw)
|
||||||
|
|
||||||
if bitmask.Unselected() <= 0 {
|
if bitmask.Unselected() <= 0 {
|
||||||
|
|
Loading…
Reference in New Issue