opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-22 05:05:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(coderd/database): remove column updated_at from provisioner_daemons table (#11108)

Browse Source
This commit is contained in:
Cian Johnston
2023-12-12 11:19:28 +00:00
committed by GitHub
parent 197cd935cf
commit b02796655e
17 changed files with 21 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coderd/apidoc/docs.go
Generated
-4
View File
@@ -9669,10 +9669,6 @@ const docTemplate = `{
"type": "string"
}
},
"updated_at": {
"type": "string",
"format": "date-time"
},
"version": {
"type": "string"
}
coderd/apidoc/swagger.json
Generated
-4
View File
@@ -8696,10 +8696,6 @@
"type": "string"
}
},
"updated_at": {
"type": "string",
"format": "date-time"
},
"version": {
"type": "string"
}
coderd/database/dbmem/dbmem.go
+2 -3
View File
@@ -1145,7 +1145,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.Valid && p.UpdatedAt.Time.Before(weekAgo)) {
if (p.CreatedAt.Before(weekAgo) && !p.LastSeenAt.Valid) || (p.LastSeenAt.Valid && p.LastSeenAt.Time.Before(weekAgo)) {
continue
}
validDaemons = append(validDaemons, p)
@@ -4950,11 +4950,10 @@ func (q *FakeQuerier) InsertProvisionerDaemon(_ context.Context, arg database.In
daemon := database.ProvisionerDaemon{
ID: arg.ID,
CreatedAt: arg.CreatedAt,
Name: arg.Name,
Provisioners: arg.Provisioners,
Tags: arg.Tags,
UpdatedAt: arg.UpdatedAt,
LastSeenAt: arg.LastSeenAt,
}
q.provisionerDaemons = append(q.provisionerDaemons, daemon)
return daemon, nil
coderd/database/dbpurge/dbpurge_test.go
+3 -3
View File
@@ -215,7 +215,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
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)},
LastSeenAt: sql.NullTime{Valid: true, Time: now.Add(-7 * 24 * time.Hour).Add(time.Minute)},
})
require.NoError(t, err)
_, err = db.InsertProvisionerDaemon(ctx, database.InsertProvisionerDaemonParams{
@@ -224,7 +224,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
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)},
LastSeenAt: sql.NullTime{Valid: true, Time: now.Add(-8 * 24 * time.Hour).Add(time.Hour)},
})
require.NoError(t, err)
_, err = db.InsertProvisionerDaemon(ctx, database.InsertProvisionerDaemonParams{
@@ -241,7 +241,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
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)},
LastSeenAt: sql.NullTime{Valid: true, Time: now.Add(-6 * 24 * time.Hour)},
})
require.NoError(t, err)
coderd/database/dump.sql
Generated
-1
View File
@@ -509,7 +509,6 @@ CREATE TABLE parameter_values (
CREATE TABLE provisioner_daemons (
id uuid NOT NULL,
created_at timestamp with time zone NOT NULL,
updated_at timestamp with time zone,
name character varying(64) NOT NULL,
provisioners provisioner_type[] NOT NULL,
replica_id uuid,
coderd/database/migrations/000177_drop_provisioner_updated_at.down.sql
+2
View File
@@ -0,0 +1,2 @@
ALTER TABLE provisioner_daemons
ADD COLUMN updated_at timestamp with time zone;
coderd/database/migrations/000177_drop_provisioner_updated_at.up.sql
+1
View File
@@ -0,0 +1 @@
ALTER TABLE provisioner_daemons DROP COLUMN updated_at;
coderd/database/models.go
-1
View File
@@ -1839,7 +1839,6 @@ type ParameterValue struct {
type ProvisionerDaemon struct {
ID uuid.UUID `db:"id" json:"id"`
CreatedAt time.Time `db:"created_at" json:"created_at"`
UpdatedAt sql.NullTime `db:"updated_at" json:"updated_at"`
Name string `db:"name" json:"name"`
Provisioners []ProvisionerType `db:"provisioners" json:"provisioners"`
ReplicaID uuid.NullUUID `db:"replica_id" json:"replica_id"`
coderd/database/querier.go
+1 -1
View File
@@ -59,7 +59,7 @@ type sqlcQuerier interface {
DeleteLicense(ctx context.Context, id int32) (int32, error)
// Delete provisioner daemons that have been created at least a week ago
// and have not connected to coderd since a week.
// A provisioner daemon with "zeroed" updated_at column indicates possible
// A provisioner daemon with "zeroed" last_seen_at column indicates possible
// connectivity issues (no provisioner daemon activity since registration).
DeleteOldProvisionerDaemons(ctx context.Context) error
// If an agent hasn't connected in the last 7 days, we purge it's logs.
coderd/database/queries.sql.go
+8 -10
View File
@@ -3003,14 +3003,14 @@ func (q *sqlQuerier) GetParameterSchemasByJobID(ctx context.Context, jobID uuid.
const deleteOldProvisionerDaemons = `-- name: DeleteOldProvisionerDaemons :exec
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'))
(created_at < (NOW() - INTERVAL '7 days') AND last_seen_at IS NULL) OR
(last_seen_at IS NOT NULL AND last_seen_at < (NOW() - INTERVAL '7 days'))
)
`
// Delete provisioner daemons that have been created at least a week ago
// and have not connected to coderd since a week.
// A provisioner daemon with "zeroed" updated_at column indicates possible
// A provisioner daemon with "zeroed" last_seen_at column indicates possible
// connectivity issues (no provisioner daemon activity since registration).
func (q *sqlQuerier) DeleteOldProvisionerDaemons(ctx context.Context) error {
_, err := q.db.ExecContext(ctx, deleteOldProvisionerDaemons)
@@ -3019,7 +3019,7 @@ func (q *sqlQuerier) DeleteOldProvisionerDaemons(ctx context.Context) error {
const getProvisionerDaemons = `-- name: GetProvisionerDaemons :many
SELECT
id, created_at, updated_at, name, provisioners, replica_id, tags, last_seen_at, version
id, created_at, name, provisioners, replica_id, tags, last_seen_at, version
FROM
provisioner_daemons
`
@@ -3036,7 +3036,6 @@ func (q *sqlQuerier) GetProvisionerDaemons(ctx context.Context) ([]ProvisionerDa
if err := rows.Scan(
&i.ID,
&i.CreatedAt,
&i.UpdatedAt,
&i.Name,
pq.Array(&i.Provisioners),
&i.ReplicaID,
@@ -3065,10 +3064,10 @@ INSERT INTO
"name",
provisioners,
tags,
updated_at
last_seen_at
)
VALUES
($1, $2, $3, $4, $5, $6) RETURNING id, created_at, updated_at, name, provisioners, replica_id, tags, last_seen_at, version
($1, $2, $3, $4, $5, $6) RETURNING id, created_at, name, provisioners, replica_id, tags, last_seen_at, version
`
type InsertProvisionerDaemonParams struct {
@@ -3077,7 +3076,7 @@ type InsertProvisionerDaemonParams struct {
Name string `db:"name" json:"name"`
Provisioners []ProvisionerType `db:"provisioners" json:"provisioners"`
Tags StringMap `db:"tags" json:"tags"`
UpdatedAt sql.NullTime `db:"updated_at" json:"updated_at"`
LastSeenAt sql.NullTime `db:"last_seen_at" json:"last_seen_at"`
}
func (q *sqlQuerier) InsertProvisionerDaemon(ctx context.Context, arg InsertProvisionerDaemonParams) (ProvisionerDaemon, error) {
@@ -3087,13 +3086,12 @@ func (q *sqlQuerier) InsertProvisionerDaemon(ctx context.Context, arg InsertProv
arg.Name,
pq.Array(arg.Provisioners),
arg.Tags,
arg.UpdatedAt,
arg.LastSeenAt,
)
var i ProvisionerDaemon
err := row.Scan(
&i.ID,
&i.CreatedAt,
&i.UpdatedAt,
&i.Name,
pq.Array(&i.Provisioners),
&i.ReplicaID,
coderd/database/queries/provisionerdaemons.sql
+4 -4
View File
@@ -12,7 +12,7 @@ INSERT INTO
"name",
provisioners,
tags,
updated_at
last_seen_at
)
VALUES
($1, $2, $3, $4, $5, $6) RETURNING *;
@@ -20,9 +20,9 @@ VALUES
-- name: DeleteOldProvisionerDaemons :exec
-- Delete provisioner daemons that have been created at least a week ago
-- and have not connected to coderd since a week.
-- A provisioner daemon with "zeroed" updated_at column indicates possible
-- A provisioner daemon with "zeroed" last_seen_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 IS NULL) OR
(updated_at IS NOT NULL AND updated_at < (NOW() - INTERVAL '7 days'))
(created_at < (NOW() - INTERVAL '7 days') AND last_seen_at IS NULL) OR
(last_seen_at IS NOT NULL AND last_seen_at < (NOW() - INTERVAL '7 days'))
);