mirror of
https://github.com/newnius/YAO-scheduler.git
synced 2025-12-13 07:46:43 +00:00
update
This commit is contained in:
@@ -27,6 +27,10 @@ func (jm *JobManager) start() {
|
|||||||
InstanceJobHistoryLogger().submitJob(jm.job)
|
InstanceJobHistoryLogger().submitJob(jm.job)
|
||||||
|
|
||||||
/* request for resources */
|
/* request for resources */
|
||||||
|
for range jm.job.Tasks {
|
||||||
|
jm.resources = append(jm.resources, NodeStatus{})
|
||||||
|
}
|
||||||
|
|
||||||
for i := range jm.job.Tasks {
|
for i := range jm.job.Tasks {
|
||||||
var resource NodeStatus
|
var resource NodeStatus
|
||||||
for {
|
for {
|
||||||
@@ -40,7 +44,7 @@ func (jm *JobManager) start() {
|
|||||||
time.Sleep(time.Second * 1)
|
time.Sleep(time.Second * 1)
|
||||||
}
|
}
|
||||||
log.Info("Receive resource", resource)
|
log.Info("Receive resource", resource)
|
||||||
jm.resources = append(jm.resources, resource)
|
jm.resources[i] = resource
|
||||||
|
|
||||||
for _, t := range resource.Status {
|
for _, t := range resource.Status {
|
||||||
jm.scheduler.Attach(t.UUID, jm.job.Name)
|
jm.scheduler.Attach(t.UUID, jm.job.Name)
|
||||||
@@ -195,7 +199,12 @@ func (jm *JobManager) logs(taskName string) MsgLog {
|
|||||||
|
|
||||||
func (jm *JobManager) status() MsgJobStatus {
|
func (jm *JobManager) status() MsgJobStatus {
|
||||||
var tasksStatus []TaskStatus
|
var tasksStatus []TaskStatus
|
||||||
for _, taskStatus := range jm.jobStatus.tasks {
|
for range jm.jobStatus.tasks {
|
||||||
|
tasksStatus = append(tasksStatus, TaskStatus{})
|
||||||
|
}
|
||||||
|
|
||||||
|
for i, task := range jm.job.Tasks {
|
||||||
|
taskStatus := jm.jobStatus.tasks[task.Name]
|
||||||
spider := Spider{}
|
spider := Spider{}
|
||||||
spider.Method = "GET"
|
spider.Method = "GET"
|
||||||
spider.URL = "http://" + taskStatus.Node + ":8000/status?id=" + taskStatus.Id
|
spider.URL = "http://" + taskStatus.Node + ":8000/status?id=" + taskStatus.Id
|
||||||
@@ -218,7 +227,7 @@ func (jm *JobManager) status() MsgJobStatus {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
res.Status.Node = taskStatus.Node
|
res.Status.Node = taskStatus.Node
|
||||||
tasksStatus = append(tasksStatus, res.Status)
|
tasksStatus[i] = res.Status
|
||||||
}
|
}
|
||||||
|
|
||||||
return MsgJobStatus{Status: tasksStatus}
|
return MsgJobStatus{Status: tasksStatus}
|
||||||
|
|||||||
Reference in New Issue
Block a user