fix: stop logging errors on canceled cleanup queries (#11547)

spikecurtis · web-flow · commit cae095fdb617 · 2024-01-10T16:20:29.000+04:00
Fixes flake seen here: https://github.com/coder/coder/actions/runs/7474259128/job/20340051975
diff --git a/enterprise/tailnet/pgcoord.go b/enterprise/tailnet/pgcoord.go
@@ -1546,15 +1546,15 @@ func (h *heartbeats) cleanup() {
 	// the records we are attempting to clean up do no serious harm other than
 	// accumulating in the tables, so we don't bother retrying if it fails.
 	err := h.store.CleanTailnetCoordinators(h.ctx)
-	if err != nil {
+	if err != nil && !database.IsQueryCanceledError(err) {
 		h.logger.Error(h.ctx, "failed to cleanup old coordinators", slog.Error(err))
 	}
 	err = h.store.CleanTailnetLostPeers(h.ctx)
-	if err != nil {
+	if err != nil && !database.IsQueryCanceledError(err) {
 		h.logger.Error(h.ctx, "failed to cleanup lost peers", slog.Error(err))
 	}
 	err = h.store.CleanTailnetTunnels(h.ctx)
-	if err != nil {
+	if err != nil && !database.IsQueryCanceledError(err) {
 		h.logger.Error(h.ctx, "failed to cleanup abandoned tunnels", slog.Error(err))
 	}
 	h.logger.Debug(h.ctx, "completed cleanup")

Original file line number	Diff line number	Diff line change
`@@ -1546,15 +1546,15 @@ func (h *heartbeats) cleanup() {`
`1546`	`1546`	`// the records we are attempting to clean up do no serious harm other than`
`1547`	`1547`	`// accumulating in the tables, so we don't bother retrying if it fails.`
`1548`	`1548`	`err := h.store.CleanTailnetCoordinators(h.ctx)`
`1549`		`- if err != nil {`
	`1549`	`+ if err != nil && !database.IsQueryCanceledError(err) {`
`1550`	`1550`	`h.logger.Error(h.ctx, "failed to cleanup old coordinators", slog.Error(err))`
`1551`	`1551`	`}`
`1552`	`1552`	`err = h.store.CleanTailnetLostPeers(h.ctx)`
`1553`		`- if err != nil {`
	`1553`	`+ if err != nil && !database.IsQueryCanceledError(err) {`
`1554`	`1554`	`h.logger.Error(h.ctx, "failed to cleanup lost peers", slog.Error(err))`
`1555`	`1555`	`}`
`1556`	`1556`	`err = h.store.CleanTailnetTunnels(h.ctx)`
`1557`		`- if err != nil {`
	`1557`	`+ if err != nil && !database.IsQueryCanceledError(err) {`
`1558`	`1558`	`h.logger.Error(h.ctx, "failed to cleanup abandoned tunnels", slog.Error(err))`
`1559`	`1559`	`}`
`1560`	`1560`	`h.logger.Debug(h.ctx, "completed cleanup")`