Skip to content

Commit 57f915d

Browse files
johnstcnjohnstcn
committed
fix(coderd/database): drop column provisioner_daemon.updated_at in favour of last_seen_at
1 parent 37f6b38 commit 57f915d

File tree

16 files changed

+18
-36
lines changed

16 files changed

+18
-36
lines changed

‎coderd/apidoc/docs.go

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbmem/dbmem.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,7 +1145,7 @@ func (q *FakeQuerier) DeleteOldProvisionerDaemons(_ context.Context) error {
11451145

11461146
var validDaemons []database.ProvisionerDaemon
11471147
for _, p := range q.provisionerDaemons {
1148-
if (p.CreatedAt.Before(weekAgo) && !p.UpdatedAt.Valid) || (p.UpdatedAt.Valid && p.UpdatedAt.Time.Before(weekAgo)) {
1148+
if (p.CreatedAt.Before(weekAgo) && !p.LastSeenAt.Valid) || (p.LastSeenAt.Valid && p.LastSeenAt.Time.Before(weekAgo)) {
11491149
continue
11501150
}
11511151
validDaemons = append(validDaemons, p)
@@ -4951,11 +4951,10 @@ func (q *FakeQuerier) InsertProvisionerDaemon(_ context.Context, arg database.In
49514951

49524952
daemon := database.ProvisionerDaemon{
49534953
ID: arg.ID,
4954-
CreatedAt: arg.CreatedAt,
49554954
Name: arg.Name,
49564955
Provisioners: arg.Provisioners,
49574956
Tags: arg.Tags,
4958-
UpdatedAt: arg.UpdatedAt,
4957+
LastSeenAt: arg.LastSeenAt,
49594958
}
49604959
q.provisionerDaemons = append(q.provisionerDaemons, daemon)
49614960
return daemon, nil

‎coderd/database/dbpurge/dbpurge_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
215215
Name: "external-0",
216216
Provisioners: []database.ProvisionerType{"echo"},
217217
CreatedAt: now.Add(-14 * 24 * time.Hour),
218-
UpdatedAt: sql.NullTime{Valid: true, Time: now.Add(-7 * 24 * time.Hour).Add(time.Minute)},
218+
LastSeenAt: sql.NullTime{Valid: true, Time: now.Add(-7 * 24 * time.Hour).Add(time.Minute)},
219219
})
220220
require.NoError(t, err)
221221
_, err = db.InsertProvisionerDaemon(ctx, database.InsertProvisionerDaemonParams{
@@ -224,7 +224,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
224224
Name: "external-1",
225225
Provisioners: []database.ProvisionerType{"echo"},
226226
CreatedAt: now.Add(-8 * 24 * time.Hour),
227-
UpdatedAt: sql.NullTime{Valid: true, Time: now.Add(-8 * 24 * time.Hour).Add(time.Hour)},
227+
LastSeenAt: sql.NullTime{Valid: true, Time: now.Add(-8 * 24 * time.Hour).Add(time.Hour)},
228228
})
229229
require.NoError(t, err)
230230
_, err = db.InsertProvisionerDaemon(ctx, database.InsertProvisionerDaemonParams{
@@ -241,7 +241,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
241241
Name: "external-3",
242242
Provisioners: []database.ProvisionerType{"echo"},
243243
CreatedAt: now.Add(-6 * 24 * time.Hour),
244-
UpdatedAt: sql.NullTime{Valid: true, Time: now.Add(-6 * 24 * time.Hour)},
244+
LastSeenAt: sql.NullTime{Valid: true, Time: now.Add(-6 * 24 * time.Hour)},
245245
})
246246
require.NoError(t, err)
247247

‎coderd/database/dump.sql

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/migrations/000176_drop_provisioner_updated_at.down.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTER TABLE provisioner_daemons
2+
ADD COLUMN updated_at timestamp with time zone;

‎coderd/database/migrations/000176_drop_provisioner_updated_at.up.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE provisioner_daemons DROP COLUMN updated_at;

‎coderd/database/models.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 7 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/provisionerdaemons.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ INSERT INTO
1212
"name",
1313
provisioners,
1414
tags,
15-
updated_at
15+
last_seen_at
1616
)
1717
VALUES
1818
($1, $2, $3, $4, $5, $6) RETURNING *;
@@ -23,6 +23,6 @@ VALUES
2323
-- A provisioner daemon with "zeroed" updated_at column indicates possible
2424
-- connectivity issues (no provisioner daemon activity since registration).
2525
DELETE FROM provisioner_daemons WHERE (
26-
(created_at < (NOW() - INTERVAL '7 days') AND updated_at IS NULL) OR
27-
(updated_at IS NOT NULL AND updated_at < (NOW() - INTERVAL '7 days'))
26+
(created_at < (NOW() - INTERVAL '7 days') AND last_seen_at IS NULL) OR
27+
(last_seen_at IS NOT NULL AND last_seen_at < (NOW() - INTERVAL '7 days'))
2828
);

0 commit comments

Comments
 (0)