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

Delete non-LRU cache in SPIRE Agent #5383

Merged
merged 22 commits into from
Sep 27, 2024
Merged

Delete non-LRU cache in SPIRE Agent #5383

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c57535d
compiles wheeeee
amoore877 Aug 13, 2024
4ef00d8
tests compile
amoore877 Aug 13, 2024
b14ca20
local tests passing
amoore877 Aug 13, 2024
4cdf1a2
fix: lint (linux), lint (windows)
amoore877 Aug 13, 2024
f838ce8
fix integration test fetch-x509-svids
amoore877 Aug 13, 2024
f7ac93a
one more removeable config ref
amoore877 Aug 13, 2024
7a077c2
fix: lint (linux), lint (windows)
amoore877 Aug 14, 2024
b148c8f
helpful test comments
amoore877 Aug 14, 2024
81a6821
Merge branch 'main' into delete_non_lru_for_reals
amoore877 Aug 20, 2024
a6653fa
Merge branch 'main' into delete_non_lru_for_reals
amoore877 Aug 26, 2024
02fd57b
Merge branch 'main' into delete_non_lru_for_reals
amoore877 Aug 29, 2024
d7330e6
Merge branch 'main' into delete_non_lru_for_reals
amoore877 Sep 9, 2024
d11a640
Merge branch 'main' into delete_non_lru_for_reals
amoore877 Sep 11, 2024
37ec2dd
struct doc
amoore877 Sep 11, 2024
5cbf474
please stop the screaming
amoore877 Sep 11, 2024
0dce619
struct doc 2
amoore877 Sep 11, 2024
42e33b3
simplify struct
amoore877 Sep 11, 2024
7e6e85a
comment fix
amoore877 Sep 11, 2024
a1c5b9e
Merge branch 'main' into delete_non_lru_for_reals
amoore877 Sep 18, 2024
686804f
Merge branch 'main' into delete_non_lru_for_reals
amoore877 Sep 23, 2024
dd27054
Merge branch 'main' into delete_non_lru_for_reals
amoore877 Sep 27, 2024
2c0fb70
Merge branch 'main' into delete_non_lru_for_reals
amartinezfayo Sep 27, 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
Prev Previous commit
Next Next commit
local tests passing 
Signed-off-by: amoore877 <andrew.s.moore@uber.com>
  • Loading branch information
@amoore877
amoore877 committed Aug 19, 2024
commit b14ca2049bd4e07251e9cfd5388ae820138a2212
36 changes: 18 additions & 18 deletions pkg/agent/manager/cache/lru_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,8 +699,8 @@ func TestLRUCacheSVIDCacheExpiry(t *testing.T) {

// Move clk by 2 seconds
clk.Add(2 * time.Second)
// update total of 12 entries
updateEntries := createUpdateEntries(10, makeBundles(bundleV1))
// update total of size+2 entries
updateEntries := createUpdateEntries(SVIDCacheMaxSize, makeBundles(bundleV1))
updateEntries.RegistrationEntries[foo.EntryId] = foo
updateEntries.RegistrationEntries[bar.EntryId] = bar

Expand All @@ -717,10 +717,10 @@ func TestLRUCacheSVIDCacheExpiry(t *testing.T) {
sub.Finish()
}
}
assert.Equal(t, 12, cache.CountX509SVIDs())
assert.Equal(t, SVIDCacheMaxSize+2, cache.CountX509SVIDs())

cache.UpdateEntries(updateEntries, nil)
assert.Equal(t, 10, cache.CountX509SVIDs())
assert.Equal(t, SVIDCacheMaxSize, cache.CountX509SVIDs())

// foo SVID should be removed from cache as it does not have active subscriber
assert.False(t, cache.notifySubscriberIfSVIDAvailable(makeSelectors("A"), subA.(*lruCacheSubscriber)))
Expand All @@ -736,24 +736,24 @@ func TestLRUCacheSVIDCacheExpiry(t *testing.T) {
require.Len(t, cache.GetStaleEntries(), 1)
assert.Equal(t, foo, cache.GetStaleEntries()[0].Entry)

assert.Equal(t, 10, cache.CountX509SVIDs())
assert.Equal(t, SVIDCacheMaxSize, cache.CountX509SVIDs())
}

func TestLRUCacheMaxSVIDCacheSize(t *testing.T) {
clk := clock.NewMock(t)
cache := newTestLRUCacheWithConfig(clk)

// create entries more than maxSvidCacheSize
updateEntries := createUpdateEntries(12, makeBundles(bundleV1))
updateEntries := createUpdateEntries(SVIDCacheMaxSize+2, makeBundles(bundleV1))
cache.UpdateEntries(updateEntries, nil)

require.Len(t, cache.GetStaleEntries(), 10)
require.Len(t, cache.GetStaleEntries(), SVIDCacheMaxSize)

cache.UpdateSVIDs(&UpdateSVIDs{
X509SVIDs: makeX509SVIDsFromStaleEntries(cache.GetStaleEntries()),
})
require.Len(t, cache.GetStaleEntries(), 0)
assert.Equal(t, 10, cache.CountX509SVIDs())
assert.Equal(t, SVIDCacheMaxSize, cache.CountX509SVIDs())

// Validate that active subscriber will still get SVID even if SVID count is at maxSvidCacheSize
foo := makeRegistrationEntry("FOO", "A")
Expand All @@ -764,25 +764,25 @@ func TestLRUCacheMaxSVIDCacheSize(t *testing.T) {

cache.UpdateEntries(updateEntries, nil)
require.Len(t, cache.GetStaleEntries(), 1)
assert.Equal(t, 10, cache.CountX509SVIDs())
assert.Equal(t, SVIDCacheMaxSize, cache.CountX509SVIDs())

cache.UpdateSVIDs(&UpdateSVIDs{
X509SVIDs: makeX509SVIDs(foo),
})
assert.Equal(t, 11, cache.CountX509SVIDs())
assert.Equal(t, SVIDCacheMaxSize+1, cache.CountX509SVIDs())
require.Len(t, cache.GetStaleEntries(), 0)
}

func TestSyncSVIDsWithSubscribers(t *testing.T) {
clk := clock.NewMock(t)
cache := newTestLRUCacheWithConfig(clk)

updateEntries := createUpdateEntries(5, makeBundles(bundleV1))
updateEntries := createUpdateEntries(SVIDCacheMaxSize, makeBundles(bundleV1))
cache.UpdateEntries(updateEntries, nil)
cache.UpdateSVIDs(&UpdateSVIDs{
X509SVIDs: makeX509SVIDsFromStaleEntries(cache.GetStaleEntries()),
})
assert.Equal(t, 5, cache.CountX509SVIDs())
assert.Equal(t, SVIDCacheMaxSize, cache.CountX509SVIDs())

// Update foo but its SVID is not yet cached
foo := makeRegistrationEntry("FOO", "A")
Expand All @@ -800,7 +800,7 @@ func TestSyncSVIDsWithSubscribers(t *testing.T) {
require.Len(t, cache.GetStaleEntries(), 1)
assert.Equal(t, []*StaleEntry{{Entry: cache.records[foo.EntryId].entry}}, cache.GetStaleEntries())

assert.Equal(t, 5, cache.CountX509SVIDs())
assert.Equal(t, SVIDCacheMaxSize, cache.CountX509SVIDs())
}

func TestNotifySubscriberWhenSVIDIsAvailable(t *testing.T) {
Expand Down Expand Up @@ -830,10 +830,10 @@ func TestSubscribeToWorkloadUpdatesLRUNoSelectors(t *testing.T) {
// Creating test entries, but this will not affect current test...
foo := makeRegistrationEntry("FOO", "A")
bar := makeRegistrationEntry("BAR", "B")
cache.UpdateEntries(&UpdateEntries{
Bundles: makeBundles(bundleV1),
RegistrationEntries: makeRegistrationEntries(foo, bar),
}, nil)
updateEntries := createUpdateEntries(SVIDCacheMaxSize, makeBundles(bundleV1))
updateEntries.RegistrationEntries[foo.EntryId] = foo
updateEntries.RegistrationEntries[bar.EntryId] = bar
cache.UpdateEntries(updateEntries, nil)

subWaitCh := make(chan struct{}, 1)
subErrCh := make(chan error, 1)
Expand Down Expand Up @@ -871,7 +871,7 @@ func TestSubscribeToWorkloadUpdatesLRUNoSelectors(t *testing.T) {
<-subWaitCh
cache.SyncSVIDsWithSubscribers()

assert.Len(t, cache.GetStaleEntries(), 1)
assert.Len(t, cache.GetStaleEntries(), SVIDCacheMaxSize)
cache.UpdateSVIDs(&UpdateSVIDs{
X509SVIDs: makeX509SVIDs(foo, bar),
})
Expand Down