YAO/YAO-scheduler
1
0
Fork 0
mirror of https://github.com/newnius/YAO-scheduler.git synced 2025-12-15 08:16:43 +00:00
Code Issues Releases Wiki Activity

update

Browse Source
This commit is contained in:
Newnius
2020-05-03 23:43:47 +08:00
parent 53bb900854
commit 3733aa626b
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/resource_pool.go
View File

@@ -344,11 +344,10 @@ func (pool *ResourcePool) list() MsgResource {
start := pool.pools[0].Next start := pool.pools[0].Next
for cur := start; ; { for cur := start; ; {
cur.Lock.Lock() cur.Lock.Lock()
cur.Lock.Unlock()
for k, node := range cur.Nodes { for k, node := range cur.Nodes {
nodes[k] = *node nodes[k] = *node
} }
cur.Lock.Unlock()
cur = cur.Next cur = cur.Next
if cur == start { if cur == start {
break break

4
src/scheduler_fair.go
View File

@@ -333,6 +333,7 @@ func (scheduler *SchedulerFair) Schedule(job Job) {
func (scheduler *SchedulerFair) AcquireResource(job Job, task Task, nodes []NodeStatus) NodeStatus { func (scheduler *SchedulerFair) AcquireResource(job Job, task Task, nodes []NodeStatus) NodeStatus {
segID := rand.Intn(pool.poolsCount) segID := rand.Intn(pool.poolsCount)
res := NodeStatus{} res := NodeStatus{}
start := pool.pools[segID].Next
locks := map[int]sync.Mutex{} locks := map[int]sync.Mutex{}
@@ -347,7 +348,6 @@ func (scheduler *SchedulerFair) AcquireResource(job Job, task Task, nodes []Node
allocationType = 1 allocationType = 1
if util, valid := InstanceOfOptimizer().predictUtilGPU(job.Name); valid { if util, valid := InstanceOfOptimizer().predictUtilGPU(job.Name); valid {
start := pool.pools[segID].Next
for cur := start; ; { for cur := start; ; {
if _, ok := locks[cur.ID]; !ok { if _, ok := locks[cur.ID]; !ok {
cur.Lock.Lock() cur.Lock.Lock()
@@ -397,7 +397,6 @@ func (scheduler *SchedulerFair) AcquireResource(job Job, task Task, nodes []Node
/* second round, find vacant gpu */ /* second round, find vacant gpu */
if len(candidates) == 0 { if len(candidates) == 0 {
allocationType = 2 allocationType = 2
start := pool.pools[segID].Next
for cur := start; ; { for cur := start; ; {
if _, ok := locks[cur.ID]; !ok { if _, ok := locks[cur.ID]; !ok {
cur.Lock.Lock() cur.Lock.Lock()
@@ -439,7 +438,6 @@ func (scheduler *SchedulerFair) AcquireResource(job Job, task Task, nodes []Node
if pool.TotalGPU != 0 && float64(scheduler.UsingGPU)/float64(pool.TotalGPU) >= scheduler.enablePreScheduleRatio && valid { if pool.TotalGPU != 0 && float64(scheduler.UsingGPU)/float64(pool.TotalGPU) >= scheduler.enablePreScheduleRatio && valid {
allocationType = 3 allocationType = 3
start := pool.pools[segID].Next
for cur := start; ; { for cur := start; ; {
if _, ok := locks[cur.ID]; !ok { if _, ok := locks[cur.ID]; !ok {
cur.Lock.Lock() cur.Lock.Lock()