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

[v15] Add fallback to cache.GetAccessList call #41326

Merged
merged 2 commits into from
May 14, 2024
Merged

[v15] Add fallback to cache.GetAccessList call #41326

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f96ce51
Add fallback to cache.GetAccessList call
smallinsky May 7, 2024
a88b0bd
Merge branch 'branch/v15' into bot/backport-41258-branch/v15
smallinsky May 13, 2024
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
12 changes: 11 additions & 1 deletion lib/cache/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2981,7 +2981,17 @@ func (c *Cache) GetAccessList(ctx context.Context, name string) (*accesslist.Acc
return nil, trace.Wrap(err)
}
defer rg.Release()
return rg.reader.GetAccessList(ctx, name)
item, err := rg.reader.GetAccessList(ctx, name)
if trace.IsNotFound(err) && rg.IsCacheRead() {
// release read lock early
rg.Release()
// fallback is sane because method is never used
// in construction of derivative caches.
if item, err := c.Config.AccessLists.GetAccessList(ctx, name); err == nil {
return item, nil
}
}
return item, trace.Wrap(err)
}

// CountAccessListMembers will count all access list members.
Expand Down
Loading