From fb72f20bb165a021242522d1d2ccdf8cb389f7a3 Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Fri, 12 May 2017 16:03:22 -0700 Subject: [PATCH] gc_max_allocs should include blocked & migrating --- client/client.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/client/client.go b/client/client.go index c9beebae4..a4b751b24 100644 --- a/client/client.go +++ b/client/client.go @@ -724,7 +724,13 @@ func (c *Client) getAllocRunners() map[string]*AllocRunner { // fulfill the AllocCounter interface for the GC. func (c *Client) NumAllocs() int { c.allocLock.RLock() + c.blockedAllocsLock.Lock() + c.migratingAllocsLock.Lock() n := len(c.allocs) + n += len(c.blockedAllocations) + n += len(c.migratingAllocs) + c.migratingAllocsLock.Unlock() + c.blockedAllocsLock.Unlock() c.allocLock.RUnlock() return n }