Skip to content

feat: purge old provisioner daemons #10949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Dec 1, 2023
Merged

feat: purge old provisioner daemons #10949

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e320d5b
feat: purge old provisioner daemons
mtojek Nov 30, 2023
6bf64d3
fix: q
mtojek Nov 30, 2023
f44b62b
fix: ctx
mtojek Nov 30, 2023
e83da41
implement DeleteOldProvisionerDaemons
mtojek Nov 30, 2023
29a8ead
add to purge
mtojek Nov 30, 2023
f4b83ad
Run every 10 mins, use doTick
mtojek Nov 30, 2023
5a74cf9
Merge branch 'main' into 10676-prune-inactive
mtojek Dec 1, 2023
13b7a99
purge tests
mtojek Dec 1, 2023
142f2e2
fmt
mtojek Dec 1, 2023
fe84029
Fix
mtojek Dec 1, 2023
c489c4a
Fix: ID
mtojek Dec 1, 2023
a31dbe9
Fix: import
mtojek Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
purge tests
  • Loading branch information
@mtojek
mtojek committed Dec 1, 2023
commit 13b7a9937b718ca5ebc48fd88fc6f9a2c8c8180d
4 changes: 3 additions & 1 deletion coderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,10 +1118,11 @@ func (q *FakeQuerier) DeleteOldProvisionerDaemons(_ context.Context) error {

now := dbtime.Now()
weekInterval := 7 * 24 * time.Hour
weekAgo := now.Add(-weekInterval)

var validDaemons []database.ProvisionerDaemon
for _, p := range q.provisionerDaemons {
if !(p.CreatedAt.Before(now.Add(-weekInterval)) && p.UpdatedAt.Valid && p.UpdatedAt.Time.Before(now.Add(-weekInterval))) {
if p.CreatedAt.Before(weekAgo) && p.UpdatedAt.Valid && p.UpdatedAt.Time.Before(weekAgo) {
continue
}
validDaemons = append(validDaemons, p)
Expand Down Expand Up @@ -4863,6 +4864,7 @@ func (q *FakeQuerier) InsertProvisionerDaemon(_ context.Context, arg database.In
Name: arg.Name,
Provisioners: arg.Provisioners,
Tags: arg.Tags,
UpdatedAt: arg.UpdatedAt,
}
q.provisionerDaemons = append(q.provisionerDaemons, daemon)
return daemon, nil
Expand Down
58 changes: 58 additions & 0 deletions coderd/database/dbpurge/dbpurge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,21 @@ package dbpurge_test

import (
"context"
"database/sql"
"testing"
"time"

"go.uber.org/goleak"

"github.com/stretchr/testify/require"

"cdr.dev/slog/sloggers/slogtest"
"github.com/coder/coder/v2/coderd/database"
"github.com/coder/coder/v2/coderd/database/dbmem"
"github.com/coder/coder/v2/coderd/database/dbpurge"
"github.com/coder/coder/v2/coderd/database/dbtestutil"
"github.com/coder/coder/v2/coderd/database/dbtime"
"github.com/coder/coder/v2/testutil"
)

func TestMain(m *testing.M) {
Expand All @@ -24,3 +30,55 @@ func TestPurge(t *testing.T) {
err := purger.Close()
require.NoError(t, err)
}

func TestDeleteOldProvisionerDaemons(t *testing.T) {
t.Parallel()

db, _ := dbtestutil.NewDB(t)
logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true})

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
defer cancel()

now := dbtime.Now()

// 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)},
})
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)},
})
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)},
})
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)},
})
require.NoError(t, err)

// when
closer := dbpurge.New(ctx, logger, db)
defer closer.Close()

// then
require.Eventually(t, func() bool {
daemons, err := db.GetProvisionerDaemons(ctx)
if err != nil {
return false
}
return len(daemons) == 2
}, testutil.WaitShort, testutil.IntervalFast)

}
7 changes: 5 additions & 2 deletions coderd/database/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions coderd/database/queries/provisionerdaemons.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ INSERT INTO
created_at,
"name",
provisioners,
tags
tags,
updated_at
)
VALUES
($1, $2, $3, $4, $5) RETURNING *;
($1, $2, $3, $4, $5, $6) RETURNING *;

-- name: DeleteOldProvisionerDaemons :exec
-- Delete provisioner daemons that have been created at least a week ago
Expand Down