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
2019-12-04 19:07:38 +08:00
parent ea5ce278ca
commit ade9ee7fb0
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/job_manager.go
View File

@@ -99,6 +99,16 @@ func (jm *JobManager) start() {
/* save logs etc. */ /* save logs etc. */
/* remove exited containers */
//v := url.Values{}
//v.Set("id", res.Status[i].Id)
//
//_, err := doRequest("POST", "http://"+res.Status[i].Node+":8000/remove", strings.NewReader(v.Encode()), "application/x-www-form-urlencoded", "")
//if err != nil {
// log.Warn(err.Error())
// continue
//}
/* return resource */ /* return resource */
jm.scheduler.ReleaseResource(jm.job, jm.resources[i]) jm.scheduler.ReleaseResource(jm.job, jm.resources[i])
fmt.Println("return resource ", jm.resources[i].ClientID) fmt.Println("return resource ", jm.resources[i].ClientID)
@@ -112,8 +122,10 @@ func (jm *JobManager) start() {
jm.scheduler.ReleaseNetwork(network) jm.scheduler.ReleaseNetwork(network)
jm.scheduler.UpdateProgress(jm.job.Name, Finished) if !jm.killedFlag {
log.Info("finish job", jm.job.Name) jm.scheduler.UpdateProgress(jm.job.Name, Finished)
log.Info("finish job", jm.job.Name)
}
} }
func (jm *JobManager) logs(taskName string) MsgLog { func (jm *JobManager) logs(taskName string) MsgLog {
@@ -178,21 +190,21 @@ func (jm *JobManager) status() MsgJobStatus {
} }
func (jm *JobManager) stop() MsgStop { func (jm *JobManager) stop() MsgStop {
for _, taskStatus := range jm.jobStatus.tasks { jm.killedFlag = true
go func() { /* kill at background */
for _, taskStatus := range jm.jobStatus.tasks {
v := url.Values{}
v.Set("id", taskStatus.Id)
v := url.Values{} _, err := doRequest("POST", "http://"+taskStatus.Node+":8000/stop", strings.NewReader(v.Encode()), "application/x-www-form-urlencoded", "")
v.Set("id", taskStatus.Id) if err != nil {
log.Warn(err.Error())
_, err := doRequest("POST", "http://"+taskStatus.Node+":8000/stop", strings.NewReader(v.Encode()), "application/x-www-form-urlencoded", "") continue
if err != nil { }
log.Warn(err.Error())
continue
} }
} }()
for i := range jm.resources {
jm.scheduler.ReleaseResource(jm.job, jm.resources[i])
}
jm.scheduler.UpdateProgress(jm.job.Name, Stopped) jm.scheduler.UpdateProgress(jm.job.Name, Stopped)
log.Info("kill job", jm.job.Name)
return MsgStop{Code: 0} return MsgStop{Code: 0}
} }