ensure that ticks from quartz are dbtimey

johnstcn · johnstcn · commit 12df09ce47f6 · 2024-08-29T22:25:13.000+01:00
diff --git a/coderd/database/dbpurge/dbpurge.go b/coderd/database/dbpurge/dbpurge.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
+	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/quartz"
 )
 
@@ -47,7 +48,8 @@ func New(ctx context.Context, logger slog.Logger, db database.Store, clk quartz.
 				return nil
 			}
 
-			if err := tx.DeleteOldWorkspaceAgentLogs(ctx, start.Add(-maxAgentLogAge)); err != nil {
+			deleteOldWorkspaceAgentLogsBefore := start.Add(-maxAgentLogAge)
+			if err := tx.DeleteOldWorkspaceAgentLogs(ctx, deleteOldWorkspaceAgentLogsBefore); err != nil {
 				return xerrors.Errorf("failed to delete old workspace agent logs: %w", err)
 			}
 			if err := tx.DeleteOldWorkspaceAgentStats(ctx); err != nil {
@@ -78,7 +80,7 @@ func New(ctx context.Context, logger slog.Logger, db database.Store, clk quartz.
 				return
 			case tick := <-ticker.C:
 				ticker.Stop()
-				doTick(tick)
+				doTick(dbtime.Time(tick).UTC())
 			}
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`
`12`	`12`	`"github.com/coder/coder/v2/coderd/database"`
`13`	`13`	`"github.com/coder/coder/v2/coderd/database/dbauthz"`
	`14`	`+ "github.com/coder/coder/v2/coderd/database/dbtime"`
`14`	`15`	`"github.com/coder/quartz"`
`15`	`16`	`)`
`16`	`17`
`@@ -47,7 +48,8 @@ func New(ctx context.Context, logger slog.Logger, db database.Store, clk quartz.`
`47`	`48`	`return nil`
`48`	`49`	`}`
`49`	`50`
`50`		`- if err := tx.DeleteOldWorkspaceAgentLogs(ctx, start.Add(-maxAgentLogAge)); err != nil {`
	`51`	`+ deleteOldWorkspaceAgentLogsBefore := start.Add(-maxAgentLogAge)`
	`52`	`+ if err := tx.DeleteOldWorkspaceAgentLogs(ctx, deleteOldWorkspaceAgentLogsBefore); err != nil {`
`51`	`53`	`return xerrors.Errorf("failed to delete old workspace agent logs: %w", err)`
`52`	`54`	`}`
`53`	`55`	`if err := tx.DeleteOldWorkspaceAgentStats(ctx); err != nil {`
`@@ -78,7 +80,7 @@ func New(ctx context.Context, logger slog.Logger, db database.Store, clk quartz.`
`78`	`80`	`return`
`79`	`81`	`case tick := <-ticker.C:`
`80`	`82`	`ticker.Stop()`
`81`		`- doTick(tick)`
	`83`	`+ doTick(dbtime.Time(tick).UTC())`
`82`	`84`	`}`
`83`	`85`	`}`
`84`	`86`	`}()`