Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb027966

Browse files
authored
fix(coderd/database): remove column updated_at from provisioner_daemons table (#11108)
1 parent197cd93 commitb027966

File tree

17 files changed

+21
-39
lines changed

17 files changed

+21
-39
lines changed

‎coderd/apidoc/docs.go

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing 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 aboutcustomizing 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
varvalidDaemons []database.ProvisionerDaemon
11471147
for_,p:=rangeq.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)
@@ -4950,11 +4950,10 @@ func (q *FakeQuerier) InsertProvisionerDaemon(_ context.Context, arg database.In
49504950

49514951
daemon:= database.ProvisionerDaemon{
49524952
ID:arg.ID,
4953-
CreatedAt:arg.CreatedAt,
49544953
Name:arg.Name,
49554954
Provisioners:arg.Provisioners,
49564955
Tags:arg.Tags,
4957-
UpdatedAt:arg.UpdatedAt,
4956+
LastSeenAt:arg.LastSeenAt,
49584957
}
49594958
q.provisionerDaemons=append(q.provisionerDaemons,daemon)
49604959
returndaemon,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 aboutcustomizing how changed files appear on GitHub.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTERTABLE provisioner_daemons
2+
ADD COLUMN updated_attimestamp with time zone;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTERTABLE 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 aboutcustomizing how changed files appear on GitHub.

‎coderd/database/querier.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 8 additions & 10 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries/provisionerdaemons.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ 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*;
1919

2020
-- name: DeleteOldProvisionerDaemons :exec
2121
-- Delete provisioner daemons that have been created at least a week ago
2222
-- and have not connected to coderd since a week.
23-
-- A provisioner daemon with "zeroed"updated_at column indicates possible
23+
-- A provisioner daemon with "zeroed"last_seen_at column indicates possible
2424
-- connectivity issues (no provisioner daemon activity since registration).
2525
DELETEFROM provisioner_daemonsWHERE (
26-
(created_at< (NOW()- INTERVAL'7 days')ANDupdated_at ISNULL)OR
27-
(updated_atIS NOT NULLANDupdated_at< (NOW()- INTERVAL'7 days'))
26+
(created_at< (NOW()- INTERVAL'7 days')ANDlast_seen_at ISNULL)OR
27+
(last_seen_atIS NOT NULLANDlast_seen_at< (NOW()- INTERVAL'7 days'))
2828
);

‎codersdk/provisionerdaemons.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ const (
3838
typeProvisionerDaemonstruct {
3939
ID uuid.UUID`json:"id" format:"uuid"`
4040
CreatedAt time.Time`json:"created_at" format:"date-time"`
41-
UpdatedAtNullTime`json:"updated_at,omitempty" format:"date-time"`
4241
LastSeenAtNullTime`json:"last_seen_at,omitempty" format:"date-time"`
4342
Namestring`json:"name"`
4443
Versionstring`json:"version"`

‎docs/api/enterprise.md

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

‎docs/api/schemas.md

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

‎enterprise/coderd/provisionerdaemons.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,6 @@ func convertProvisionerDaemon(daemon database.ProvisionerDaemon) codersdk.Provis
320320
result:= codersdk.ProvisionerDaemon{
321321
ID:daemon.ID,
322322
CreatedAt:daemon.CreatedAt,
323-
UpdatedAt: codersdk.NullTime{NullTime:daemon.UpdatedAt},
324323
LastSeenAt: codersdk.NullTime{NullTime:daemon.LastSeenAt},
325324
Name:daemon.Name,
326325
Tags:daemon.Tags,

‎site/src/api/typesGenerated.ts

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

‎site/src/testHelpers/entities.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@ export const SuspendedMockUser: TypesGen.User = {
327327

328328
exportconstMockProvisioner:TypesGen.ProvisionerDaemon={
329329
created_at:"2022-05-17T17:39:01.382927298Z",
330-
updated_at:"2022-05-17T17:39:01.382927298Z",
331330
id:"test-provisioner",
332331
name:"Test Provisioner",
333332
provisioners:["echo"],

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp