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

coadler · web-flow · commit 00b9a3ce58fb · 2023-07-19T16:40:57.000-05:00
diff --git a/coderd/database/errors.go b/coderd/database/errors.go
@@ -1,6 +1,7 @@
 package database
 
 import (
+	"context"
 	"errors"
 
 	"github.com/lib/pq"
@@ -40,7 +41,9 @@ func IsUniqueViolation(err error, uniqueConstraints ...UniqueConstraint) bool {
 func IsQueryCanceledError(err error) bool {
 	var pqErr *pq.Error
 	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
diff --git a/enterprise/tailnet/pgcoord.go b/enterprise/tailnet/pgcoord.go
@@ -424,7 +424,7 @@ func (b *binder) writeOne(bnd binding) error {
 	default:
 		panic("unhittable")
 	}
-	if err != nil {
+	if err != nil && !database.IsQueryCanceledError(err) {
 		b.logger.Error(b.ctx, "failed to write binding to database",
 			slog.F("client_id", bnd.client),
 			slog.F("agent_id", bnd.agent),

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ func (b *binder) writeOne(bnd binding) error {`
`424`	`424`	`default:`
`425`	`425`	`panic("unhittable")`
`426`	`426`	`}`
`427`		`- if err != nil {`
	`427`	`+ if err != nil && !database.IsQueryCanceledError(err) {`
`428`	`428`	`b.logger.Error(b.ctx, "failed to write binding to database",`
`429`	`429`	`slog.F("client_id", bnd.client),`
`430`	`430`	`slog.F("agent_id", bnd.agent),`