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

tweak stack job manipulation

Browse Source 
To address review comments
This commit is contained in:
Mahmood Ali
2020-08-25 17:23:20 -04:00
parent cb038b1a8c
commit 92bb3728c9
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

@@ -497,15 +497,12 @@ func (s *GenericScheduler) computePlacements(destructive, place []placementResul
tg = job.LookupTaskGroup(tg.Name)
downgradedJob = job
deploymentID = jobDeploymentID
// ensure we are operating on the correct job
s.stack.SetJob(job)
} else {
jobVersion := -1
if job != nil {
jobVersion = int(job.Version)
}
s.logger.Warn("failed to find appropriate job; using the latest", "expected_version", missing.MinJobVersion, "found_version", jobVersion)
s.logger.Debug("failed to find appropriate job; using the latest", "expected_version", missing.MinJobVersion, "found_version", jobVersion)
}
}
@@ -515,6 +512,12 @@ func (s *GenericScheduler) computePlacements(destructive, place []placementResul
continue
}
// Use downgraded job in scheduling stack to honor
// old job resources and constraints
if downgradedJob != nil {
s.stack.SetJob(downgradedJob)
}
// Find the preferred node
preferredNode, err := s.findPreferredNode(missing)
if err != nil {
@@ -541,7 +544,7 @@ func (s *GenericScheduler) computePlacements(destructive, place []placementResul
// Compute top K scoring node metadata
s.ctx.Metrics().PopulateScoreMetaData()
// restore stack to use the latest job version again
// Restore stack job now that placement is done, to use plan job version
if downgradedJob != nil {
s.stack.SetJob(s.job)
}