From 1cb39fc65d0ef2ec21760c03df0d91830346c9c8 Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Thu, 20 Jul 2023 14:55:25 -0500 Subject: [PATCH] test: ignore more spurious pgcoord errors (#8628) --- enterprise/tailnet/pgcoord.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/enterprise/tailnet/pgcoord.go b/enterprise/tailnet/pgcoord.go index 7add7bb135..e73c3e29bf 100644 --- a/enterprise/tailnet/pgcoord.go +++ b/enterprise/tailnet/pgcoord.go @@ -14,6 +14,7 @@ import ( "github.com/cenkalti/backoff/v4" "github.com/google/uuid" "golang.org/x/xerrors" + "nhooyr.io/websocket" "cdr.dev/slog" @@ -262,7 +263,11 @@ func (c *connIO) recvLoop() { var node agpl.Node err := c.decoder.Decode(&node) if err != nil { - if xerrors.Is(err, io.EOF) || xerrors.Is(err, io.ErrClosedPipe) || xerrors.Is(err, context.Canceled) { + if xerrors.Is(err, io.EOF) || + xerrors.Is(err, io.ErrClosedPipe) || + xerrors.Is(err, context.Canceled) || + xerrors.Is(err, context.DeadlineExceeded) || + websocket.CloseStatus(err) > 0 { c.logger.Debug(c.ctx, "exiting recvLoop", slog.Error(err)) } else { c.logger.Error(c.ctx, "failed to decode Node update", slog.Error(err))