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

Commit3adcccb

Browse files
authored
fix(coderd/database): reduce db load via dbpurge advisory locking (#13021)
1 parent8a12162 commit3adcccb

File tree

2 files changed

+31
-16
lines changed

2 files changed

+31
-16
lines changed

‎coderd/database/dbpurge/dbpurge.go

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ package dbpurge
22

33
import (
44
"context"
5-
"errors"
65
"io"
76
"time"
87

9-
"golang.org/x/sync/errgroup"
8+
"golang.org/x/xerrors"
109

1110
"cdr.dev/slog"
1211

@@ -35,22 +34,37 @@ func New(ctx context.Context, logger slog.Logger, db database.Store) io.Closer {
3534
doTick:=func() {
3635
deferticker.Reset(delay)
3736

38-
vareg errgroup.Group
39-
eg.Go(func()error {
40-
returndb.DeleteOldWorkspaceAgentLogs(ctx)
41-
})
42-
eg.Go(func()error {
43-
returndb.DeleteOldWorkspaceAgentStats(ctx)
44-
})
45-
eg.Go(func()error {
46-
returndb.DeleteOldProvisionerDaemons(ctx)
47-
})
48-
err:=eg.Wait()
49-
iferr!=nil {
50-
iferrors.Is(err,context.Canceled) {
51-
return
37+
start:=time.Now()
38+
// Start a transaction to grab advisory lock, we don't want to run
39+
// multiple purges at the same time (multiple replicas).
40+
iferr:=db.InTx(func(tx database.Store)error {
41+
// Acquire a lock to ensure that only one instance of the
42+
// purge is running at a time.
43+
ok,err:=tx.TryAcquireLock(ctx,database.LockIDDBPurge)
44+
iferr!=nil {
45+
returnerr
46+
}
47+
if!ok {
48+
logger.Debug(ctx,"unable to acquire lock for purging old database entries, skipping")
49+
returnnil
50+
}
51+
52+
iferr:=tx.DeleteOldWorkspaceAgentLogs(ctx);err!=nil {
53+
returnxerrors.Errorf("failed to delete old workspace agent logs: %w",err)
5254
}
55+
iferr:=tx.DeleteOldWorkspaceAgentStats(ctx);err!=nil {
56+
returnxerrors.Errorf("failed to delete old workspace agent stats: %w",err)
57+
}
58+
iferr:=tx.DeleteOldProvisionerDaemons(ctx);err!=nil {
59+
returnxerrors.Errorf("failed to delete old provisioner daemons: %w",err)
60+
}
61+
62+
logger.Info(ctx,"purged old database entries",slog.F("duration",time.Since(start)))
63+
64+
returnnil
65+
},nil);err!=nil {
5366
logger.Error(ctx,"failed to purge old database entries",slog.Error(err))
67+
return
5468
}
5569
}
5670

‎coderd/database/lock.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const (
99
LockIDDeploymentSetup=iota+1
1010
LockIDEnterpriseDeploymentSetup
1111
LockIDDBRollup
12+
LockIDDBPurge
1213
)
1314

1415
// GenLockID generates a unique and consistent lock ID from a given string.

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp