From bf3b35b1e2a5680c447a1e78b553b1e7ff4a3f52 Mon Sep 17 00:00:00 2001 From: Spike Curtis Date: Wed, 13 Dec 2023 13:08:30 +0400 Subject: [PATCH] fix: stop logging context Canceled as error (#11177) fixes #11166 and a related log that could have the same problem --- enterprise/tailnet/pgcoord.go | 2 +- tailnet/coordinator.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/enterprise/tailnet/pgcoord.go b/enterprise/tailnet/pgcoord.go index 367df51976..b55868db8e 100644 --- a/enterprise/tailnet/pgcoord.go +++ b/enterprise/tailnet/pgcoord.go @@ -639,7 +639,7 @@ func (m *mapper) run() { m.logger.Debug(m.ctx, "skipping nil node update") continue } - if err := m.c.Enqueue(update); err != nil { + if err := m.c.Enqueue(update); err != nil && !xerrors.Is(err, context.Canceled) { m.logger.Error(m.ctx, "failed to enqueue node update", slog.Error(err)) } } diff --git a/tailnet/coordinator.go b/tailnet/coordinator.go index bd1441e3a3..c200c5b211 100644 --- a/tailnet/coordinator.go +++ b/tailnet/coordinator.go @@ -810,7 +810,7 @@ func v1RespLoop(ctx context.Context, cancel context.CancelFunc, logger slog.Logg continue } err = q.Enqueue(nodes) - if err != nil { + if err != nil && !xerrors.Is(err, context.Canceled) { logger.Error(ctx, "v1RespLoop failed to enqueue v1 update", slog.Error(err)) } }