buildkitd: allow durations for gc config

Signed-off-by: Justin Chadwell <[email protected]>

Author: jedevc

cmd/buildkitd/config/config.go

@@ -116,7 +116,7 @@ type ContainerdConfig struct {
 type GCPolicy struct {
 	All          bool      `toml:"all"`
 	KeepBytes    DiskSpace `toml:"keepBytes"`
-	KeepDuration int64     `toml:"keepDuration"`
+	KeepDuration Duration  `toml:"keepDuration"`
 	Filters      []string  `toml:"filters"`
 }
 
@@ -127,6 +127,6 @@ type DNSConfig struct {
 }
 
 type HistoryConfig struct {
-	MaxAge     int64 `toml:"maxAge"`
-	MaxEntries int64 `toml:"maxEntries"`
+	MaxAge     Duration `toml:"maxAge"`
+	MaxEntries int64    `toml:"maxEntries"`
 }

cmd/buildkitd/config/gcpolicy.go

@@ -1,13 +1,40 @@
 package config
 
 import (
+	"encoding"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
 )
 
+type Duration struct {
+	time.Duration
+}
+
+func (d *Duration) UnmarshalText(textb []byte) error {
+	text := stripQuotes(string(textb))
+	if len(text) == 0 {
+		return nil
+	}
+
+	if duration, err := time.ParseDuration(text); err == nil {
+		d.Duration = duration
+		return nil
+	}
+
+	if i, err := strconv.ParseInt(text, 10, 64); err == nil {
+		d.Duration = time.Duration(i) * time.Second
+		return nil
+	}
+
+	return errors.Errorf("invalid duration %s", text)
+}
+
+var _ encoding.TextUnmarshaler = &Duration{}
+
 type DiskSpace struct {
 	Bytes      int64
 	Percentage int64
@@ -48,12 +75,12 @@ func DefaultGCPolicy(keep DiskSpace) []GCPolicy {
 		// if build cache uses more than 512MB delete the most easily reproducible data after it has not been used for 2 days
 		{
 			Filters:      []string{"type==source.local,type==exec.cachemount,type==source.git.checkout"},
-			KeepDuration: 48 * 3600,                   // 48h
-			KeepBytes:    DiskSpace{Bytes: 512 * 1e6}, // 512MB
+			KeepDuration: Duration{Duration: time.Duration(48) * time.Hour}, // 48h
+			KeepBytes:    DiskSpace{Bytes: 512 * 1e6},                       // 512MB
 		},
 		// remove any data not used for 60 days
 		{
-			KeepDuration: 60 * 24 * 3600, // 60d
+			KeepDuration: Duration{Duration: time.Duration(60) * 24 * time.Hour}, // 60d
 			KeepBytes:    keep,
 		},
 		// keep the unshared build cache under cap

cmd/buildkitd/config/load_test.go

@@ -3,6 +3,7 @@ package config
 import (
 	"bytes"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 )
@@ -48,6 +49,7 @@ keepBytes="40MB"
 keepDuration=7200
 [[worker.containerd.gcpolicy]]
 keepBytes="20%"
+keepDuration="24h"
 
 [registry."docker.io"]
 mirrors=["hub.docker.io"]
@@ -104,8 +106,9 @@ searchDomains=["example.com"]
 	require.Equal(t, int64(20), cfg.Workers.Containerd.GCPolicy[0].KeepBytes.Bytes)
 	require.Equal(t, int64(40*1024*1024), cfg.Workers.Containerd.GCPolicy[1].KeepBytes.Bytes)
 	require.Equal(t, int64(20), cfg.Workers.Containerd.GCPolicy[2].KeepBytes.Percentage)
-	require.Equal(t, int64(3600), cfg.Workers.Containerd.GCPolicy[0].KeepDuration)
-	require.Equal(t, int64(7200), cfg.Workers.Containerd.GCPolicy[1].KeepDuration)
+	require.Equal(t, time.Duration(3600), cfg.Workers.Containerd.GCPolicy[0].KeepDuration.Duration/time.Second)
+	require.Equal(t, time.Duration(7200), cfg.Workers.Containerd.GCPolicy[1].KeepDuration.Duration/time.Second)
+	require.Equal(t, time.Duration(86400), cfg.Workers.Containerd.GCPolicy[2].KeepDuration.Duration/time.Second)
 	require.Equal(t, 1, len(cfg.Workers.Containerd.GCPolicy[0].Filters))
 	require.Equal(t, 0, len(cfg.Workers.Containerd.GCPolicy[1].Filters))
 

cmd/buildkitd/main.go

@@ -12,7 +12,6 @@ import (
 	"sort"
 	"strconv"
 	"strings"
-	"time"
 
 	"github.com/containerd/containerd/pkg/seed" //nolint:staticcheck // SA1019 deprecated
 	"github.com/containerd/containerd/pkg/userns"
@@ -777,7 +776,7 @@ func getGCPolicy(cfg config.GCConfig, root string) []client.PruneInfo {
 			Filter:       rule.Filters,
 			All:          rule.All,
 			KeepBytes:    rule.KeepBytes.AsBytes(root),
-			KeepDuration: time.Duration(rule.KeepDuration) * time.Second,
+			KeepDuration: rule.KeepDuration.Duration,
 		})
 	}
 	return out

solver/llbsolver/history.go

@@ -54,7 +54,7 @@ type StatusImportResult struct {
 func NewHistoryQueue(opt HistoryQueueOpt) *HistoryQueue {
 	if opt.CleanConfig == nil {
 		opt.CleanConfig = &config.HistoryConfig{
-			MaxAge:     int64((48 * time.Hour).Seconds()),
+			MaxAge:     config.Duration{Duration: 48 * time.Hour},
 			MaxEntries: 50,
 		}
 	}
@@ -116,7 +116,7 @@ func (h *HistoryQueue) gc() error {
 
 	now := time.Now()
 	for _, r := range records[h.CleanConfig.MaxEntries:] {
-		if now.Add(time.Duration(h.CleanConfig.MaxAge) * -time.Second).After(*r.CompletedAt) {
+		if now.Add(0 - h.CleanConfig.MaxAge.Duration).After(*r.CompletedAt) {
 			if err := h.delete(r.Ref, false); err != nil {
 				return err
 			}