Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

envoy: Include detail in NACK warning #12016

Merged
merged 1 commit into from
Jun 11, 2020
Merged

envoy: Include detail in NACK warning #12016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/envoy/xds/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ func (s *Server) processRequestStream(ctx context.Context, streamLog *logrus.Ent
}
if versionInfo < nonce {
// versions after VersionInfo, upto and including ResponseNonce are NACKed
requestLog.Warningf("NACK received for versions after %s and up to %s; waiting for a version update before sending again", req.VersionInfo, req.ResponseNonce)
requestLog.WithField(logfields.XDSDetail, detail).Warningf("NACK received for versions after %s and up to %s; waiting for a version update before sending again", req.VersionInfo, req.ResponseNonce)
// Watcher will behave as if the sent version was acked.
// Otherwise we will just be sending the same failing
// version over and over filling logs.
Expand Down
3 changes: 3 additions & 0 deletions pkg/logging/logfields/logfields.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,9 @@ const (
// XDSResource is an xDS resource message.
XDSResource = "xdsResource"

// XDSDetail is detail string included in XDS NACKs.
XDSDetail = "xdsDetail"

// K8s-specific

// K8sNodeID is the k8s ID of a K8sNode
Expand Down