Skip to content

Backport to release/1.8.x: #9738 - Stop background refresh of cached data for requests that result in ACL not found errors#9742

Merged
mkeeler merged 2 commits intorelease/1.8.xfrom
backport/1.8.x/9738
Feb 9, 2021
Merged

Backport to release/1.8.x: #9738 - Stop background refresh of cached data for requests that result in ACL not found errors#9742
mkeeler merged 2 commits intorelease/1.8.xfrom
backport/1.8.x/9738

Conversation

@mkeeler
Copy link
Copy Markdown
Member

@mkeeler mkeeler commented Feb 9, 2021

The first commit is the backport of #9738 which required resolving some conflicts with changes to how the cache is structured. In 1.9.x the expiry heap implementation was moved out of the cache package and into lib/expiry.

The second commit is completely unrelated but fixes up what appears to be a botched auto-merge that resulted in duplicate imports of the logging package in agent/xds/server.go. Regardless I wanted to make the linter happy so its fixed too.

@mkeeler mkeeler requested review from a team and jshahriddhi February 9, 2021 15:58
@vercel
Copy link
Copy Markdown

vercel bot commented Feb 9, 2021

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployments, click below or on the icon next to each commit.

consul – ./website

🔍 Inspect: https://vercel.com/hashicorp/consul/nmzmax5jg
✅ Preview: Canceled

consul-ui-staging – ./ui

🔍 Inspect: https://vercel.com/hashicorp/consul-ui-staging/51oz4d344
✅ Preview: Failed

@mkeeler mkeeler merged commit 5b54379 into release/1.8.x Feb 9, 2021
@mkeeler mkeeler deleted the backport/1.8.x/9738 branch February 9, 2021 16:32
mkeeler added a commit that referenced this pull request Feb 9, 2021
…L not found errors (#9742)

Backport of #9738 to release/1.7.x

# Conflicts:
#	agent/cache/cache.go
#	agent/cache/cache_test.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants