Skip to content

Commit bdba42f

Browse files
authored
xds: emit resource-not-found logs at Warning level (#8158)
1 parent a0a739f commit bdba42f

File tree

5 files changed

+6
-16
lines changed

5 files changed

+6
-16
lines changed

xds/internal/balancer/cdsbalancer/cdsbalancer.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@ func (b *cdsBalancer) onClusterError(name string, err error) {
572572
//
573573
// Only executed in the context of a serializer callback.
574574
func (b *cdsBalancer) onClusterResourceNotFound(name string) {
575+
b.logger.Warningf("CDS watch for resource %q reported resource-does-not-exist error", name)
575576
err := b.annotateErrorWithNodeID(xdsresource.NewErrorf(xdsresource.ErrorTypeResourceNotFound, "cluster %q not found", name))
576577
b.closeChildPolicyAndReportTF(err)
577578
}

xds/internal/balancer/clusterresolver/resource_resolver_eds.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,7 @@ func (er *edsDiscoveryMechanism) OnResourceDoesNotExist(onDone xdsresource.OnDon
126126
return
127127
}
128128

129-
if er.logger.V(2) {
130-
er.logger.Infof("EDS discovery mechanism for resource %q reported resource-does-not-exist error", er.nameToWatch)
131-
}
129+
er.logger.Warningf("EDS discovery mechanism for resource %q reported resource-does-not-exist error", er.nameToWatch)
132130

133131
// Report an empty update that would result in no priority child being
134132
// created for this discovery mechanism. This would result in the priority

xds/internal/resolver/xds_resolver.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -555,12 +555,9 @@ func (r *xdsResolver) onListenerResourceError(err error) {
555555

556556
// Only executed in the context of a serializer callback.
557557
func (r *xdsResolver) onListenerResourceNotFound() {
558-
if r.logger.V(2) {
559-
r.logger.Infof("Received resource-not-found-error for Listener resource %q", r.ldsResourceName)
560-
}
558+
r.logger.Warningf("Received resource-not-found-error for Listener resource %q", r.ldsResourceName)
561559

562560
r.listenerUpdateRecvd = false
563-
564561
if r.routeConfigWatcher != nil {
565562
r.routeConfigWatcher.stop()
566563
}
@@ -596,9 +593,7 @@ func (r *xdsResolver) onRouteConfigResourceError(name string, err error) {
596593

597594
// Only executed in the context of a serializer callback.
598595
func (r *xdsResolver) onRouteConfigResourceNotFound(name string) {
599-
if r.logger.V(2) {
600-
r.logger.Infof("Received resource-not-found-error for RouteConfiguration resource %q", name)
601-
}
596+
r.logger.Warningf("Received resource-not-found-error for RouteConfiguration resource %q", name)
602597

603598
if r.rdsResourceName != name {
604599
return

xds/internal/server/listener_wrapper.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -460,9 +460,7 @@ func (lw *ldsWatcher) OnResourceDoesNotExist(onDone xdsresource.OnDoneFunc) {
460460
lw.logger.Warningf("Resource %q received resource-does-not-exist error after listener was closed", lw.name)
461461
return
462462
}
463-
if lw.logger.V(2) {
464-
lw.logger.Infof("LDS watch for resource %q reported resource-does-not-exist error", lw.name)
465-
}
463+
lw.logger.Warningf("LDS watch for resource %q reported resource-does-not-exist error", lw.name)
466464

467465
err := xdsresource.NewErrorf(xdsresource.ErrorTypeResourceNotFound, "resource name %q of type Listener not found in received response", lw.name)
468466
lw.parent.onLDSResourceDoesNotExist(err)

xds/internal/server/rds_handler.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,7 @@ func (rw *rdsWatcher) OnResourceDoesNotExist(onDone xdsresource.OnDoneFunc) {
187187
return
188188
}
189189
rw.mu.Unlock()
190-
if rw.logger.V(2) {
191-
rw.logger.Infof("RDS watch for resource %q reported resource-does-not-exist error", rw.routeName)
192-
}
190+
rw.logger.Warningf("RDS watch for resource %q reported resource-does-not-exist error", rw.routeName)
193191
err := xdsresource.NewErrorf(xdsresource.ErrorTypeResourceNotFound, "resource name %q of type RouteConfiguration not found in received response", rw.routeName)
194192
err = fmt.Errorf("[xDS node id: %v]: %w", rw.parent.xdsNodeID, err)
195193
rw.parent.handleRouteUpdate(rw.routeName, rdsWatcherUpdate{err: err})

0 commit comments

Comments
 (0)