synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-13 21:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: prevent error log when pgcoord query is canceled (#8609)

Browse Source
This commit is contained in:
Colin Adler
2023-07-19 16:40:57 -05:00
committed by GitHub
parent aceedefce3
commit 00b9a3ce58
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coderd/database/errors.go
View File

@ -1,6 +1,7 @@
package database package database
import ( import (
"context"
"errors" "errors"
"github.com/lib/pq" "github.com/lib/pq"
@ -40,7 +41,9 @@ func IsUniqueViolation(err error, uniqueConstraints ...UniqueConstraint) bool {
func IsQueryCanceledError(err error) bool { func IsQueryCanceledError(err error) bool {
var pqErr *pq.Error var pqErr *pq.Error
if errors.As(err, &pqErr) { if errors.As(err, &pqErr) {
return pqErr.Code.Name() == "query_canceled" return pqErr.Code == "57014" // query_canceled
} else if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
return true
} }
return false return false

2
enterprise/tailnet/pgcoord.go
View File

@ -424,7 +424,7 @@ func (b *binder) writeOne(bnd binding) error {
default: default:
panic("unhittable") panic("unhittable")
} }
if err != nil { if err != nil && !database.IsQueryCanceledError(err) {
b.logger.Error(b.ctx, "failed to write binding to database", b.logger.Error(b.ctx, "failed to write binding to database",
slog.F("client_id", bnd.client), slog.F("client_id", bnd.client),
slog.F("agent_id", bnd.agent), slog.F("agent_id", bnd.agent),