1
0
mirror of https://github.com/newnius/YAO-scheduler.git synced 2025-12-12 23:36:44 +00:00
This commit is contained in:
2020-05-03 00:16:28 +08:00
parent d8c6e4c9be
commit 95249bc659
4 changed files with 12 additions and 12 deletions

View File

@@ -80,7 +80,7 @@ func (jm *JobManager) start() {
}
}
jm.scheduler.UpdateProgress(jm.job.Name, Running)
jm.scheduler.UpdateProgress(jm.job, Running)
log.Info("ready to run job ", jm.job.Name, time.Now())
@@ -206,7 +206,7 @@ func (jm *JobManager) start() {
jm.scheduler.ReleaseNetwork(network)
if !jm.killedFlag {
jm.scheduler.UpdateProgress(jm.job.Name, Finished)
jm.scheduler.UpdateProgress(jm.job, Finished)
log.Info("finish job ", jm.job.Name)
}
}
@@ -293,7 +293,7 @@ func (jm *JobManager) stop() MsgStop {
}
}()
jm.scheduler.UpdateProgress(jm.job.Name, Stopped)
jm.scheduler.UpdateProgress(jm.job, Stopped)
log.Info("kill job, ", jm.job.Name)
return MsgStop{Code: 0}
}

View File

@@ -5,7 +5,7 @@ type Scheduler interface {
Schedule(Job)
UpdateProgress(jobName string, state State)
UpdateProgress(job Job, state State)
AcquireResource(Job, Task, []NodeStatus) NodeStatus

View File

@@ -51,27 +51,27 @@ func (scheduler *SchedulerFCFS) Start() {
}()
}
func (scheduler *SchedulerFCFS) UpdateProgress(jobName string, state State) {
func (scheduler *SchedulerFCFS) UpdateProgress(job Job, state State) {
switch state {
case Running:
scheduler.scheduling.Unlock()
for i := range scheduler.history {
if scheduler.history[i].Name == jobName {
if scheduler.history[i].Name == job.Name {
scheduler.history[i].Status = Running
}
}
break
case Finished:
for i := range scheduler.history {
if scheduler.history[i].Name == jobName {
if scheduler.history[i].Name == job.Name {
scheduler.history[i].Status = Finished
}
}
break
case Stopped:
for i := range scheduler.history {
if scheduler.history[i].Name == jobName {
if scheduler.history[i].Name == job.Name {
scheduler.history[i].Status = Stopped
}
}

View File

@@ -51,27 +51,27 @@ func (scheduler *SchedulerPriority) Start() {
}()
}
func (scheduler *SchedulerPriority) UpdateProgress(jobName string, state State) {
func (scheduler *SchedulerPriority) UpdateProgress(job Job, state State) {
switch state {
case Running:
scheduler.scheduling.Unlock()
for i := range scheduler.history {
if scheduler.history[i].Name == jobName {
if scheduler.history[i].Name == job.Name {
scheduler.history[i].Status = Running
}
}
break
case Finished:
for i := range scheduler.history {
if scheduler.history[i].Name == jobName {
if scheduler.history[i].Name == job.Name {
scheduler.history[i].Status = Finished
}
}
break
case Stopped:
for i := range scheduler.history {
if scheduler.history[i].Name == jobName {
if scheduler.history[i].Name == job.Name {
scheduler.history[i].Status = Stopped
}
}