github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 03:57:41 +00:00
Code Issues Projects Releases Wiki Activity

scheduler: simplify if-then-else handling in doSchedule

Browse Source
This commit is contained in:
Sergiusz Urbaniak 2015-10-20 15:04:36 -07:00
parent c3311744c5
commit 6fced095ce
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/mesos/pkg/scheduler/plugin.go
View File

@ -337,12 +337,14 @@ func (k *kubeScheduler) doSchedule(task *podtask.T) (string, error) {
} }
slaveId := details.GetSlaveId().GetValue() slaveId := details.GetSlaveId().GetValue()
if slaveHostName := k.api.slaveHostNameFor(slaveId); slaveHostName == "" { slaveHostName := k.api.slaveHostNameFor(slaveId)
if slaveHostName == "" {
// not much sense in Release()ing the offer here since its owner died // not much sense in Release()ing the offer here since its owner died
offer.Release() offer.Release()
k.api.offers().Invalidate(details.Id.GetValue()) k.api.offers().Invalidate(details.Id.GetValue())
return "", fmt.Errorf("Slave disappeared (%v) while scheduling task %v", slaveId, task.ID) return "", fmt.Errorf("Slave disappeared (%v) while scheduling task %v", slaveId, task.ID)
} else { }
if task.Offer != nil && task.Offer != offer { if task.Offer != nil && task.Offer != offer {
return "", fmt.Errorf("task.offer assignment must be idempotent, task %+v: offer %+v", task, offer) return "", fmt.Errorf("task.offer assignment must be idempotent, task %+v: offer %+v", task, offer)
} }
@ -358,8 +360,8 @@ func (k *kubeScheduler) doSchedule(task *podtask.T) (string, error) {
offer.Release() offer.Release()
return "", err return "", err
} }
return slaveHostName, nil return slaveHostName, nil
}
} }
type queuer struct { type queuer struct {