Fix

mtojek · mtojek · commit fe84029b9283 · 2023-12-01T13:09:37.000+01:00
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -1122,7 +1122,7 @@ func (q *FakeQuerier) DeleteOldProvisionerDaemons(_ context.Context) error {
 
 	var validDaemons []database.ProvisionerDaemon
 	for _, p := range q.provisionerDaemons {
-		if p.CreatedAt.Before(weekAgo) && p.UpdatedAt.Valid && p.UpdatedAt.Time.Before(weekAgo) {
+		if (p.CreatedAt.Before(weekAgo) && !p.UpdatedAt.Valid) || (p.UpdatedAt.Valid && p.UpdatedAt.Time.Before(weekAgo)) {
 			continue
 		}
 		validDaemons = append(validDaemons, p)
diff --git a/coderd/database/dbpurge/dbpurge_test.go b/coderd/database/dbpurge/dbpurge_test.go
@@ -44,27 +44,34 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
 
 	// given
 	_, err := db.InsertProvisionerDaemon(ctx, database.InsertProvisionerDaemonParams{
-		Name:      "external-0",
-		CreatedAt: now.Add(-7 * 24 * time.Hour),
-		UpdatedAt: sql.NullTime{Valid: true, Time: now.Add(-7 * 24 * time.Hour).Add(time.Minute)},
+		// Provisioner daemon created 14 days ago, and checked in just before 7 days deadline.
+		Name:         "external-0",
+		Provisioners: []database.ProvisionerType{"echo"},
+		CreatedAt:    now.Add(-14 * 24 * time.Hour),
+		UpdatedAt:    sql.NullTime{Valid: true, Time: now.Add(-7 * 24 * time.Hour).Add(time.Minute)},
 	})
 	require.NoError(t, err)
 	_, err = db.InsertProvisionerDaemon(ctx, database.InsertProvisionerDaemonParams{
-		Name:      "external-1",
-		CreatedAt: now.Add(-8 * 24 * time.Hour),
-		UpdatedAt: sql.NullTime{Valid: true, Time: now.Add(-8 * 24 * time.Hour)},
+		// Provisioner daemon created 8 days ago, and checked in last time an hour after creation.
+		Name:         "external-1",
+		Provisioners: []database.ProvisionerType{"echo"},
+		CreatedAt:    now.Add(-8 * 24 * time.Hour),
+		UpdatedAt:    sql.NullTime{Valid: true, Time: now.Add(-8 * 24 * time.Hour).Add(time.Hour)},
 	})
 	require.NoError(t, err)
 	_, err = db.InsertProvisionerDaemon(ctx, database.InsertProvisionerDaemonParams{
-		Name:      "external-2",
-		CreatedAt: now.Add(-9 * 24 * time.Hour),
-		UpdatedAt: sql.NullTime{Valid: true, Time: now.Add(-9 * 24 * time.Hour)},
+		// Provisioner daemon created 9 days ago, and never checked in.
+		Name:         "external-2",
+		Provisioners: []database.ProvisionerType{"echo"},
+		CreatedAt:    now.Add(-9 * 24 * time.Hour),
 	})
 	require.NoError(t, err)
 	_, err = db.InsertProvisionerDaemon(ctx, database.InsertProvisionerDaemonParams{
-		Name:      "external-3",
-		CreatedAt: now.Add(-6 * 24 * time.Hour),
-		UpdatedAt: sql.NullTime{Valid: true, Time: now.Add(-6 * 24 * time.Hour)},
+		// Provisioner daemon created 6 days ago, and never checked in.
+		Name:         "external-3",
+		Provisioners: []database.ProvisionerType{"echo"},
+		CreatedAt:    now.Add(-6 * 24 * time.Hour),
+		UpdatedAt:    sql.NullTime{Valid: true, Time: now.Add(-6 * 24 * time.Hour)},
 	})
 	require.NoError(t, err)
 
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/provisionerdaemons.sql b/coderd/database/queries/provisionerdaemons.sql
@@ -22,4 +22,7 @@ VALUES
 -- and have not connected to coderd since a week.
 -- A provisioner daemon with "zeroed" updated_at column indicates possible
 -- connectivity issues (no provisioner daemon activity since registration).
-DELETE FROM provisioner_daemons WHERE created_at < (NOW() - INTERVAL '7 days') AND updated_at < (NOW() - INTERVAL '7 days');
+DELETE FROM provisioner_daemons WHERE (
+	(created_at < (NOW() - INTERVAL '7 days') AND updated_at IS NULL) OR
+	(updated_at IS NOT NULL AND updated_at < (NOW() - INTERVAL '7 days'))
+);

Original file line number	Diff line number	Diff line change
`@@ -1122,7 +1122,7 @@ func (q *FakeQuerier) DeleteOldProvisionerDaemons(_ context.Context) error {`
`1122`	`1122`
`1123`	`1123`	`var validDaemons []database.ProvisionerDaemon`
`1124`	`1124`	`for _, p := range q.provisionerDaemons {`
`1125`		`- if p.CreatedAt.Before(weekAgo) && p.UpdatedAt.Valid && p.UpdatedAt.Time.Before(weekAgo) {`
	`1125`	`+ if (p.CreatedAt.Before(weekAgo) && !p.UpdatedAt.Valid) \|\| (p.UpdatedAt.Valid && p.UpdatedAt.Time.Before(weekAgo)) {`
`1126`	`1126`	`continue`
`1127`	`1127`	`}`
`1128`	`1128`	`validDaemons = append(validDaemons, p)`