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

rename skip->ignore and improve comment formatting

Browse Source
This commit is contained in:
Preetha Appan
2018-03-29 15:09:04 -05:00
parent 3809c53a2b
commit 2ba965fa7a
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scheduler/reconcile_util.go
View File

@@ -248,11 +248,11 @@ func (a allocSet) filterByRescheduleable(isBatch bool) (untainted, rescheduleNow
continue
}
isUntainted, skip := shouldFilter(alloc, isBatch)
isUntainted, ignore := shouldFilter(alloc, isBatch)
if isUntainted {
untainted[alloc.ID] = alloc
}
if isUntainted || skip {
if isUntainted || ignore {
continue
}
@@ -271,16 +271,17 @@ func (a allocSet) filterByRescheduleable(isBatch bool) (untainted, rescheduleNow
return
}
/* shouldFilter returns whether the alloc should be skipped or considered untainted
Filtering logic for batch jobs:
If complete, and ran successfully - don't skip, set untainted
If desired state is stop, skip
Filtering logic for service jobs
If desired state is stop/evict - skip
If client status is complete/lost - skip
*/
func shouldFilter(alloc *structs.Allocation, isBatch bool) (untainted, skip bool) {
// shouldFilter returns whether the alloc should be ignored or considered untainted
// Ignored allocs are filtered out.
// Untainted allocs count against the desired total.
// Filtering logic for batch jobs:
// If complete, and ran successfully - untainted
// If desired state is stop - ignore
//
// Filtering logic for service jobs:
// If desired state is stop/evict - ignore
// If client status is complete/lost - ignore
func shouldFilter(alloc *structs.Allocation, isBatch bool) (untainted, ignore bool) {
// Allocs from batch jobs should be filtered when the desired status
// is terminal and the client did not finish or when the client
// status is failed so that they will be replaced. If they are