fix: stop logging error on canceled query (#11506)

spikecurtis · web-flow · commit 21093c00f0a7 · 2024-01-09T14:38:56.000+04:00
Fixes flake seen here: https://github.com/coder/coder/actions/runs/7447779208/job/20260756050
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -242,10 +242,8 @@ func (s *server) heartbeatLoop() {
 			}
 			start := s.timeNow()
 			hbCtx, hbCancel := context.WithTimeout(s.lifecycleCtx, s.heartbeatInterval)
-			if err := s.heartbeat(hbCtx); err != nil {
-				if !xerrors.Is(err, context.DeadlineExceeded) && !xerrors.Is(err, context.Canceled) {
-					s.Logger.Error(hbCtx, "heartbeat failed", slog.Error(err))
-				}
+			if err := s.heartbeat(hbCtx); err != nil && !database.IsQueryCanceledError(err) {
+				s.Logger.Error(hbCtx, "heartbeat failed", slog.Error(err))
 			}
 			hbCancel()
 			elapsed := s.timeNow().Sub(start)

Original file line number	Diff line number	Diff line change
`@@ -242,10 +242,8 @@ func (s *server) heartbeatLoop() {`
`242`	`242`	`}`
`243`	`243`	`start := s.timeNow()`
`244`	`244`	`hbCtx, hbCancel := context.WithTimeout(s.lifecycleCtx, s.heartbeatInterval)`
`245`		`- if err := s.heartbeat(hbCtx); err != nil {`
`246`		`- if !xerrors.Is(err, context.DeadlineExceeded) && !xerrors.Is(err, context.Canceled) {`
`247`		`- s.Logger.Error(hbCtx, "heartbeat failed", slog.Error(err))`
`248`		`- }`
	`245`	`+ if err := s.heartbeat(hbCtx); err != nil && !database.IsQueryCanceledError(err) {`
	`246`	`+ s.Logger.Error(hbCtx, "heartbeat failed", slog.Error(err))`
`249`	`247`	`}`
`250`	`248`	`hbCancel()`
`251`	`249`	`elapsed := s.timeNow().Sub(start)`