From cae095fdb6175bad41e37068623a40b496f57cc0 Mon Sep 17 00:00:00 2001 From: Spike Curtis Date: Wed, 10 Jan 2024 16:20:29 +0400 Subject: [PATCH] fix: stop logging errors on canceled cleanup queries (#11547) Fixes flake seen here: https://github.com/coder/coder/actions/runs/7474259128/job/20340051975 --- enterprise/tailnet/pgcoord.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/enterprise/tailnet/pgcoord.go b/enterprise/tailnet/pgcoord.go index 3addbd65b6..75edd8c446 100644 --- 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")