Backport of Changed log level for retryable error Scenarios into release/1.20.x

.changelog/22141.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.
+```

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 due to ACL change", "error", err)
+	default:
+		logger.Error("subscribe call failed", "error", err)
+	}
 }
 
 // isNonTemporaryOrConsecutiveFailure returns true if the error is not a

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
 			}