kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-04 17:35:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Only set eligibility if the eval hasn't escaped

Browse Source
This commit is contained in:
Alex Dadgar
2016-02-11 09:45:27 -08:00
parent cc0ad87230
commit 13d1fd0730
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scheduler/generic_sched.go
View File

@@ -129,13 +129,16 @@ func (s *GenericScheduler) Process(eval *structs.Evaluation) error {
// createBlockedEval creates a blocked eval and stores it.
func (s *GenericScheduler) createBlockedEval() error {
if s.eval == nil {
return fmt.Errorf("eval must be set to create blocked eval")
e := s.ctx.Eligibility()
escaped := e.HasEscaped()
// Only store the eligible classes if the eval hasn't escaped.
var classEligibility map[string]bool
if !escaped {
classEligibility = e.GetClasses()
}
e := s.ctx.Eligibility()
classes := e.GetClasses()
s.blocked = s.eval.BlockedEval(classes, e.HasEscaped())
s.blocked = s.eval.BlockedEval(classEligibility, escaped)
return s.planner.CreateEval(s.blocked)
}