diff --git a/src/resource_pool.go b/src/resource_pool.go index df2bb66..54708e9 100644 --- a/src/resource_pool.go +++ b/src/resource_pool.go @@ -14,7 +14,7 @@ import ( type ResourcePool struct { poolsCount int - pools []PoolSeg + //pools []PoolSeg poolsMu sync.Mutex history []PoolStatus @@ -165,7 +165,7 @@ func (pool *ResourcePool) saveStatusHistory() { nodesCount += len(cur.Nodes) cur.Lock.Unlock() cur = cur.Next - if cur == start { + if cur.ID == start.ID { break } } @@ -249,6 +249,7 @@ func (pool *ResourcePool) update(node NodeStatus) { /* spilt seg */ func (pool *ResourcePool) scaleSeg(seg *PoolSeg) { + log.Info("Scaling seg ", seg.ID) go func() { pool.poolsMu.Lock() defer pool.poolsMu.Unlock() diff --git a/src/scheduler_fair.go b/src/scheduler_fair.go index 65d1006..bc2d16a 100644 --- a/src/scheduler_fair.go +++ b/src/scheduler_fair.go @@ -353,7 +353,7 @@ func (scheduler *SchedulerFair) AcquireResource(job Job, task Task, nodes []Node for cur := start; ; { if _, ok := locks[cur.ID]; !ok { - log.Info("lock", cur.ID) + log.Info("lock ", cur.ID) cur.Lock.Lock() locks[cur.ID] = cur.Lock } @@ -403,7 +403,7 @@ func (scheduler *SchedulerFair) AcquireResource(job Job, task Task, nodes []Node allocationType = 2 for cur := start; ; { if _, ok := locks[cur.ID]; !ok { - log.Info("lock", cur.ID) + log.Info("lock ", cur.ID) cur.Lock.Lock() locks[cur.ID] = cur.Lock } @@ -445,7 +445,7 @@ func (scheduler *SchedulerFair) AcquireResource(job Job, task Task, nodes []Node allocationType = 3 for cur := start; ; { if _, ok := locks[cur.ID]; !ok { - log.Info("lock", cur.ID) + log.Info("lock ", cur.ID) cur.Lock.Lock() locks[cur.ID] = cur.Lock }