From 3a03ed671e248b69a323e1cae17736c155158bcd Mon Sep 17 00:00:00 2001 From: Mukul Anand Date: Fri, 7 Feb 2025 09:52:08 +0000 Subject: [PATCH 1/3] backport of commit 30e66ab04629528e0f7bcf7fc3a8f90fea83bd78 --- agent/submatview/materializer.go | 9 ++++++++- agent/xds/delta.go | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/agent/submatview/materializer.go b/agent/submatview/materializer.go index 42754c914da0..70f0ef190ce7 100644 --- a/agent/submatview/materializer.go +++ b/agent/submatview/materializer.go @@ -5,11 +5,13 @@ package submatview import ( "context" + "errors" "sync" "time" "github.com/hashicorp/go-hclog" + "github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/lib/retry" "github.com/hashicorp/consul/proto/private/pbsubscribe" ) @@ -202,7 +204,12 @@ func (m *materializer) handleError(req *pbsubscribe.SubscribeRequest, err error) logger = logger.With("key", req.Key) // nolint:staticcheck // SA1019 intentional use of deprecated field } - logger.Error("subscribe call failed") + switch { + case errors.Is(err, stream.ErrACLChanged): + logger.Info("subscribe call failed") + default: + logger.Error("subscribe call failed") + } } // isNonTemporaryOrConsecutiveFailure returns true if the error is not a diff --git a/agent/xds/delta.go b/agent/xds/delta.go index 44b63fcdce18..26ba19687e4f 100644 --- a/agent/xds/delta.go +++ b/agent/xds/delta.go @@ -73,7 +73,12 @@ func (s *Server) DeltaAggregatedResources(stream ADSDeltaStream) error { return } if err != nil { - s.Logger.Error("Error receiving new DeltaDiscoveryRequest; closing request channel", "error", err) + switch { + case status.Code(err) == codes.Canceled: + s.Logger.Info("Error receiving new DeltaDiscoveryRequest; closing request channel", "error", err) + default: + s.Logger.Error("Error receiving new DeltaDiscoveryRequest", "error", err) + } close(reqCh) return } From b7880c9896e82dbe25137537f0331aa5403643e9 Mon Sep 17 00:00:00 2001 From: Mukul Anand Date: Wed, 12 Feb 2025 06:30:29 +0000 Subject: [PATCH 2/3] backport of commit 85d1176dde9c5141c537726e9e64655edde6b7b2 --- .changelog/22137.txt | 6 ++++++ agent/submatview/materializer.go | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 .changelog/22137.txt diff --git a/.changelog/22137.txt b/.changelog/22137.txt new file mode 100644 index 000000000000..2e7a491712ab --- /dev/null +++ b/.changelog/22137.txt @@ -0,0 +1,6 @@ +```release-note:improvement +xDS: Log level change from ERROR to INFO for xDS delta discovery request. Stream can be cancelled on server shutdown and other scenarios. It is retryable and error is a superfluous log. +``` +```release-note:improvement +SubMatView: Log level change from ERROR to INFO for subject materialized view as subscription creation is retryable on ACL change. +``` \ No newline at end of file diff --git a/agent/submatview/materializer.go b/agent/submatview/materializer.go index 70f0ef190ce7..49fdeb13f434 100644 --- a/agent/submatview/materializer.go +++ b/agent/submatview/materializer.go @@ -206,9 +206,9 @@ func (m *materializer) handleError(req *pbsubscribe.SubscribeRequest, err error) switch { case errors.Is(err, stream.ErrACLChanged): - logger.Info("subscribe call failed") + logger.Info("subscribe call failed due to ACL change", err) default: - logger.Error("subscribe call failed") + logger.Error("subscribe call failed", err) } } From 2d15ba01756676ef952d3d8dc93d4e856d998270 Mon Sep 17 00:00:00 2001 From: Mukul Anand Date: Wed, 12 Feb 2025 13:01:14 +0000 Subject: [PATCH 3/3] backport of commit 61e9c3f6388dda4e442acab32c7b1cd35cbd3321 --- .changelog/{22137.txt => 22141.txt} | 0 agent/submatview/materializer.go | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename .changelog/{22137.txt => 22141.txt} (100%) diff --git a/.changelog/22137.txt b/.changelog/22141.txt similarity index 100% rename from .changelog/22137.txt rename to .changelog/22141.txt diff --git a/agent/submatview/materializer.go b/agent/submatview/materializer.go index 49fdeb13f434..20c8852007f6 100644 --- a/agent/submatview/materializer.go +++ b/agent/submatview/materializer.go @@ -206,9 +206,9 @@ func (m *materializer) handleError(req *pbsubscribe.SubscribeRequest, err error) switch { case errors.Is(err, stream.ErrACLChanged): - logger.Info("subscribe call failed due to ACL change", err) + logger.Info("subscribe call failed due to ACL change", "error", err) default: - logger.Error("subscribe call failed", err) + logger.Error("subscribe call failed", "error", err) } }