Merge pull request moby#3733 from tonistiigi/fix-history-sort

tonistiigi · web-flow · commit 1c6a500aee85 · 2023-03-23T08:02:08.000-07:00
llbsolver: fix sorting of history records
diff --git a/solver/llbsolver/history.go b/solver/llbsolver/history.go
@@ -102,13 +102,13 @@ func (h *HistoryQueue) gc() error {
 	}
 
 	// in order for record to get deleted by gc it exceed both maxentries and maxage criteria
-
 	if len(records) < int(h.CleanConfig.MaxEntries) {
 		return nil
 	}
 
+	// sort array by newest records first
 	sort.Slice(records, func(i, j int) bool {
-		return records[i].CompletedAt.Before(*records[j].CompletedAt)
+		return records[i].CompletedAt.After(*records[j].CompletedAt)
 	})
 
 	h.mu.Lock()

Original file line number	Diff line number	Diff line change
`@@ -102,13 +102,13 @@ func (h *HistoryQueue) gc() error {`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`// in order for record to get deleted by gc it exceed both maxentries and maxage criteria`
`105`		`-`
`106`	`105`	`if len(records) < int(h.CleanConfig.MaxEntries) {`
`107`	`106`	`return nil`
`108`	`107`	`}`
`109`	`108`
	`109`	`+ // sort array by newest records first`
`110`	`110`	`sort.Slice(records, func(i, j int) bool {`
`111`		`- return records[i].CompletedAt.Before(*records[j].CompletedAt)`
	`111`	`+ return records[i].CompletedAt.After(*records[j].CompletedAt)`
`112`	`112`	`})`
`113`	`113`
`114`	`114`	`h.mu.Lock()`