Skip to content

Commit 473a1dc

Browse files
committed
Return err in functions of session.go if any error occurs
1 parent e7cac60 commit 473a1dc

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

pkg/scheduler/framework/session.go

+9
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,12 @@ func (ssn *Session) Pipeline(task *api.TaskInfo, hostname string) error {
193193
if err := job.UpdateTaskStatus(task, api.Pipelined); err != nil {
194194
glog.Errorf("Failed to update task <%v/%v> status to %v in Session <%v>: %v",
195195
task.Namespace, task.Name, api.Pipelined, ssn.UID, err)
196+
return err
196197
}
197198
} else {
198199
glog.Errorf("Failed to found Job <%s> in Session <%s> index when binding.",
199200
task.Job, ssn.UID)
201+
return fmt.Errorf("failed to find job %s when binding", task.Job)
200202
}
201203

202204
task.NodeName = hostname
@@ -205,12 +207,14 @@ func (ssn *Session) Pipeline(task *api.TaskInfo, hostname string) error {
205207
if err := node.AddTask(task); err != nil {
206208
glog.Errorf("Failed to add task <%v/%v> to node <%v> in Session <%v>: %v",
207209
task.Namespace, task.Name, hostname, ssn.UID, err)
210+
return err
208211
}
209212
glog.V(3).Infof("After added Task <%v/%v> to Node <%v>: idle <%v>, used <%v>, releasing <%v>",
210213
task.Namespace, task.Name, node.Name, node.Idle, node.Used, node.Releasing)
211214
} else {
212215
glog.Errorf("Failed to found Node <%s> in Session <%s> index when binding.",
213216
hostname, ssn.UID)
217+
return fmt.Errorf("failed to find node %s", hostname)
214218
}
215219

216220
for _, eh := range ssn.eventHandlers {
@@ -295,10 +299,12 @@ func (ssn *Session) dispatch(task *api.TaskInfo) error {
295299
if err := job.UpdateTaskStatus(task, api.Binding); err != nil {
296300
glog.Errorf("Failed to update task <%v/%v> status to %v in Session <%v>: %v",
297301
task.Namespace, task.Name, api.Binding, ssn.UID, err)
302+
return err
298303
}
299304
} else {
300305
glog.Errorf("Failed to found Job <%s> in Session <%s> index when binding.",
301306
task.Job, ssn.UID)
307+
return fmt.Errorf("failed to find job %s", task.Job)
302308
}
303309

304310
metrics.UpdateTaskScheduleDuration(metrics.Duration(task.Pod.CreationTimestamp.Time))
@@ -316,17 +322,20 @@ func (ssn *Session) Evict(reclaimee *api.TaskInfo, reason string) error {
316322
if err := job.UpdateTaskStatus(reclaimee, api.Releasing); err != nil {
317323
glog.Errorf("Failed to update task <%v/%v> status to %v in Session <%v>: %v",
318324
reclaimee.Namespace, reclaimee.Name, api.Releasing, ssn.UID, err)
325+
return err
319326
}
320327
} else {
321328
glog.Errorf("Failed to found Job <%s> in Session <%s> index when binding.",
322329
reclaimee.Job, ssn.UID)
330+
return fmt.Errorf("failed to find job %s", reclaimee.Job)
323331
}
324332

325333
// Update task in node.
326334
if node, found := ssn.Nodes[reclaimee.NodeName]; found {
327335
if err := node.UpdateTask(reclaimee); err != nil {
328336
glog.Errorf("Failed to update task <%v/%v> in Session <%v>: %v",
329337
reclaimee.Namespace, reclaimee.Name, ssn.UID, err)
338+
return err
330339
}
331340
}
332341

0 commit comments

Comments
 (0)