From c52e87428c6b240bd2d508d6cbdc65d6a0617e21 Mon Sep 17 00:00:00 2001 From: Alec Holmes Date: Thu, 31 Mar 2022 15:12:56 -0400 Subject: [PATCH] rebase with main Signed-off-by: Alec Holmes --- go.sum | 2 -- pkg/cache/v3/simple.go | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/go.sum b/go.sum index 59db8369e4..950d7d44c6 100644 --- a/go.sum +++ b/go.sum @@ -55,8 +55,6 @@ github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc h1:PYXxkRUBGUMa5xgMVMD github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= diff --git a/pkg/cache/v3/simple.go b/pkg/cache/v3/simple.go index 677a32e628..58e8a63267 100644 --- a/pkg/cache/v3/simple.go +++ b/pkg/cache/v3/simple.go @@ -238,7 +238,7 @@ func (cache *snapshotCache) SetSnapshot(ctx context.Context, node string, snapsh watch := info.watches[key.ID] version := snapshot.GetVersion(watch.Request.TypeUrl) if version != watch.Request.VersionInfo { - cache.log.Debugf("respond open watch %d %s%v with new version %q", id, watch.Request.TypeUrl, watch.Request.ResourceNames, version) + cache.log.Debugf("respond open watch %d %s%v with new version %q", key.ID, watch.Request.TypeUrl, watch.Request.ResourceNames, version) resources := snapshot.GetResourcesAndTTL(watch.Request.TypeUrl) err := cache.respond(ctx, watch.Request, watch.Response, resources, version, false)