Run every 10 mins, use doTick

coder · mtojek · Dec 1, 2023 · Nov 30, 2023 · Nov 30, 2023 · Nov 30, 2023
commit f4b83ad229384cde74e06043af4f697600174279
diff --git a/coderd/database/dbpurge/dbpurge.go b/coderd/database/dbpurge/dbpurge.go
@@ -14,7 +14,7 @@ import (
 )
 
 const (
-	delay = 24 * time.Hour
+	delay = 10 * time.Minute
 )
 
 // New creates a new periodically purging database instance.
@@ -23,40 +23,47 @@ const (
 // This is for cleaning up old, unused resources from the database that take up space.
 func New(ctx context.Context, logger slog.Logger, db database.Store) io.Closer {
 	closed := make(chan struct{})
+
 	ctx, cancelFunc := context.WithCancel(ctx)
 	//nolint:gocritic // The system purges old db records without user input.
 	ctx = dbauthz.AsSystemRestricted(ctx)
+
+	// Use time.Nanosecond to force an initial tick. It will be reset to the
+	// correct duration after executing once.
+	ticker := time.NewTicker(time.Nanosecond)
+	doTick := func() {
+		defer ticker.Reset(delay)
+
+		var eg errgroup.Group
+		eg.Go(func() error {
+			return db.DeleteOldWorkspaceAgentLogs(ctx)
+		})
+		eg.Go(func() error {
+			return db.DeleteOldWorkspaceAgentStats(ctx)
+		})
+		eg.Go(func() error {
+			return db.DeleteOldProvisionerDaemons(ctx)
+		})
+		err := eg.Wait()
+		if err != nil {
+			if errors.Is(err, context.Canceled) {
+				return
+			}
+			logger.Error(ctx, "failed to purge old database entries", slog.Error(err))
+		}
+	}
+
 	go func() {
 		defer close(closed)
-
-		ticker := time.NewTicker(delay)
 		defer ticker.Stop()
 		for {
 			select {
 			case <-ctx.Done():
 				return
 			case <-ticker.C:
+				ticker.Stop()
+				doTick()
 			}
-
-			var eg errgroup.Group
-			eg.Go(func() error {
-				return db.DeleteOldWorkspaceAgentLogs(ctx)
-			})
-			eg.Go(func() error {
-				return db.DeleteOldWorkspaceAgentStats(ctx)
-			})
-			eg.Go(func() error {
-				return db.DeleteOldProvisionerDaemons(ctx)
-			})
-			err := eg.Wait()
-			if err != nil {
-				if errors.Is(err, context.Canceled) {
-					return
-				}
-				logger.Error(ctx, "failed to purge old database entries", slog.Error(err))
-			}
-
-			ticker.Reset(delay)
 		}
 	}()
 	return &instance{