mirror of
https://github.com/newnius/YAO-scheduler.git
synced 2025-06-07 14:21:55 +00:00
update
This commit is contained in:
parent
da33e1bffd
commit
6f4e4ba77b
@ -101,3 +101,8 @@ GPU is occupied by which job(s)
|
|||||||
```
|
```
|
||||||
?action=pool_disable_batch
|
?action=pool_disable_batch
|
||||||
```
|
```
|
||||||
|
|
||||||
|
**PoolDump**
|
||||||
|
```
|
||||||
|
?action=debug_pool_dump
|
||||||
|
```
|
@ -309,6 +309,13 @@ func serverAPI(w http.ResponseWriter, r *http.Request) {
|
|||||||
w.Write(js)
|
w.Write(js)
|
||||||
break
|
break
|
||||||
|
|
||||||
|
case "debug_pool_dump":
|
||||||
|
log.Debug("debug_pool_dump")
|
||||||
|
js, _ := json.Marshal(InstanceOfResourcePool().DebugDump())
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.Write(js)
|
||||||
|
break
|
||||||
|
|
||||||
default:
|
default:
|
||||||
http.Error(w, "Not Found", http.StatusNotFound)
|
http.Error(w, "Not Found", http.StatusNotFound)
|
||||||
break
|
break
|
||||||
|
@ -150,6 +150,7 @@ func (pool *ResourcePool) init(conf Configuration) {
|
|||||||
if len(nodes) == 0 {
|
if len(nodes) == 0 {
|
||||||
left = append(left, pool.batchJobs[0])
|
left = append(left, pool.batchJobs[0])
|
||||||
pool.batchJobs = pool.batchJobs[1:]
|
pool.batchJobs = pool.batchJobs[1:]
|
||||||
|
log.Info("cannot find a valid allocation, remove a job randomly")
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
for i, task := range job.Tasks {
|
for i, task := range job.Tasks {
|
||||||
@ -688,6 +689,9 @@ func (pool *ResourcePool) acquireResource(job Job) []NodeStatus {
|
|||||||
}
|
}
|
||||||
return pool.doAcquireResource(job)
|
return pool.doAcquireResource(job)
|
||||||
}
|
}
|
||||||
|
pool.batchMu.Lock()
|
||||||
|
pool.batchJobs = append(pool.batchJobs, job)
|
||||||
|
pool.batchMu.Unlock()
|
||||||
for {
|
for {
|
||||||
if _, ok := pool.batchAllocations[job.Name]; ok {
|
if _, ok := pool.batchAllocations[job.Name]; ok {
|
||||||
break
|
break
|
||||||
@ -1030,3 +1034,10 @@ func (pool *ResourcePool) SetPreScheduleRatio(ratio float64) bool {
|
|||||||
log.Info("enablePreScheduleRatio is updated to ", ratio)
|
log.Info("enablePreScheduleRatio is updated to ", ratio)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (pool *ResourcePool) DebugDump() map[string]interface{} {
|
||||||
|
res := map[string]interface{}{}
|
||||||
|
res["batchJobs"] = pool.batchJobs
|
||||||
|
res["pools"] = pool.pools
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
@ -261,8 +261,8 @@ func (scheduler *SchedulerFair) Start() {
|
|||||||
Memorytmp += task.Memory
|
Memorytmp += task.Memory
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Info("schedulingJobs are ", scheduler.schedulingJobs)
|
log.Debug("schedulingJobs are ", scheduler.schedulingJobs)
|
||||||
log.Info("Before ")
|
log.Debug("Before ")
|
||||||
for queue, quota := range scheduler.queuesQuota {
|
for queue, quota := range scheduler.queuesQuota {
|
||||||
log.Info("Queue<->", queue)
|
log.Info("Queue<->", queue)
|
||||||
log.Info("GPU:", quota.NumberGPU)
|
log.Info("GPU:", quota.NumberGPU)
|
||||||
|
Loading…
Reference in New Issue
Block a user