fix(kuma-cp): don't cache filtered data #5574

lukidzi · 2023-01-04T18:36:06Z

Whenever there is a call to ReadOnlyResourceManager first it hits the cache and later if there is no hit, goes to the store. In case there is a List call that has filters, we filter on the store/pagination store. Later that result is returned, cached, and here we have an issue. The key which keeps the data has no information about filters so the filtered result is stored at the same key as no filtered. Whenever in the code we have a call for List of objects with/without filters we are going to retrieve already cached elements. In the code, I've introduced that the cached store doesn't allow calls with ListByFilterFunc and the cache always has a sorted list.

Signed-off-by: Lukasz Dziedziak <[email protected]>

michaelbeaumont · 2023-01-05T08:37:14Z

@lukidzi does this belong in the changelog or is it a

> Changelog: skip

pkg/xds/sync/ingress_proxy_builder.go

pkg/core/resources/store/options.go

lukidzi · 2023-01-05T11:37:05Z

@lukidzi does this belong in the changelog or is it a
> Changelog: skip

It should be in the changelog, that fixes the current wrong behavior

Signed-off-by: Lukasz Dziedziak <[email protected]>

pkg/core/resources/manager/cache.go

pkg/core/resources/store/options.go

Signed-off-by: Lukasz Dziedziak <[email protected]>

pkg/core/resources/manager/cache.go

Signed-off-by: Lukasz Dziedziak <[email protected]>

lobkovilya

LGTM

lukidzi · 2023-01-10T13:05:22Z

@Mergifyio backport release-2.0 release-1.8 release-1.7 release-1.6 release-1.5

mergify · 2023-01-10T13:05:55Z

backport release-2.0 release-1.8 release-1.7 release-1.6 release-1.5

✅ Backports have been created

#5632 fix(kuma-cp): don't cache filtered data (backport #5574) has been created for branch release-2.0
#5633 fix(kuma-cp): don't cache filtered data (backport #5574) has been created for branch release-1.8
#5634 fix(kuma-cp): don't cache filtered data (backport #5574) has been created for branch release-1.7
#5635 fix(kuma-cp): don't cache filtered data (backport #5574) has been created for branch release-1.6
#5636 fix(kuma-cp): don't cache filtered data (backport #5574) has been created for branch release-1.5

Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76)

Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76) # Conflicts: # pkg/xds/sync/ingress_proxy_builder.go

Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76) Signed-off-by: Lukasz Dziedziak <[email protected]>

Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76) # Conflicts: # pkg/xds/sync/ingress_proxy_builder.go Signed-off-by: Lukasz Dziedziak <[email protected]>

* fix(kuma-cp): don't cache filtered data (#5574) Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76) Signed-off-by: Lukasz Dziedziak <[email protected]> * fix(kuma-cp): fixed parameters Signed-off-by: Lukasz Dziedziak <[email protected]> * fix(kuma-cp): fix conflict Signed-off-by: Lukasz Dziedziak <[email protected]> Signed-off-by: Lukasz Dziedziak <[email protected]> Co-authored-by: Łukasz Dziedziak <[email protected]>

Signed-off-by: Lukasz Dziedziak <[email protected]>

* fix(kuma-cp): don't cache filtered data (#5574) Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76) Signed-off-by: Lukasz Dziedziak <[email protected]> * fix(kuma-cp): removed character Signed-off-by: Lukasz Dziedziak <[email protected]> Signed-off-by: Lukasz Dziedziak <[email protected]> Co-authored-by: Łukasz Dziedziak <[email protected]>

* fix(kuma-cp): don't cache filtered data (#5574) Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76) Signed-off-by: Lukasz Dziedziak <[email protected]> * fix(kuma-cp): fixed parameters Signed-off-by: Lukasz Dziedziak <[email protected]> * fix(kuma-cp): fix conflict Signed-off-by: Lukasz Dziedziak <[email protected]> * test(kuma-cp): fix wait for goroutine to be done (backport #5638) (#5647) Signed-off-by: Lukasz Dziedziak <[email protected]> Signed-off-by: Lukasz Dziedziak <[email protected]> Co-authored-by: Łukasz Dziedziak <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

* fix(kuma-cp): don't cache filtered data (#5574) Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76) Signed-off-by: Lukasz Dziedziak <[email protected]> * fix(kuma-cp): fixed parameters Signed-off-by: Lukasz Dziedziak <[email protected]> * fix(kuma-cp): fix conflict Signed-off-by: Lukasz Dziedziak <[email protected]> * test(kuma-cp): fix wait for goroutine to be done (backport #5638) (#5646) Signed-off-by: Lukasz Dziedziak <[email protected]> Signed-off-by: Lukasz Dziedziak <[email protected]> Co-authored-by: Łukasz Dziedziak <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

* test(kuma-cp): fix wait for goroutine to be done (backport #5638) (#5648) Signed-off-by: Lukasz Dziedziak <[email protected]>

Signed-off-by: Lukasz Dziedziak <[email protected]> Signed-off-by: Bart Smykla <[email protected]>

lukidzi added 2 commits January 4, 2023 11:25

fix(kuma-cp): cache keep always ordered results and doesnt allow filters

423dd25

Signed-off-by: Lukasz Dziedziak <[email protected]>

fix(kuma-cp): renamed function

24dfac1

Signed-off-by: Lukasz Dziedziak <[email protected]>

lukidzi requested review from a team, lahabana and lobkovilya and removed request for a team January 4, 2023 18:36

lukidzi changed the title ~~fix(kuma-cp): don't cache data with filters~~ fix(kuma-cp): don't cache filtered data Jan 4, 2023

lahabana reviewed Jan 5, 2023

View reviewed changes

pkg/xds/sync/ingress_proxy_builder.go Show resolved Hide resolved

pkg/core/resources/store/options.go Show resolved Hide resolved

lukidzi added 2 commits January 5, 2023 06:50

fix(kuma-cp): added pagination and name prefix to function check

f003d80

Signed-off-by: Lukasz Dziedziak <[email protected]>

Merge branch 'master' into fix/cached-results

f6f5204

lobkovilya reviewed Jan 9, 2023

View reviewed changes

pkg/core/resources/manager/cache.go Show resolved Hide resolved

pkg/core/resources/manager/cache.go Outdated Show resolved Hide resolved

pkg/core/resources/store/options.go Outdated Show resolved Hide resolved

fix(kuma-cp): applied review changes

7ab6396

Signed-off-by: Lukasz Dziedziak <[email protected]>

lobkovilya reviewed Jan 10, 2023

View reviewed changes

pkg/core/resources/manager/cache.go Outdated Show resolved Hide resolved

fix(kuma-cp): changed localtion of data

5afc5f3

Signed-off-by: Lukasz Dziedziak <[email protected]>

lobkovilya approved these changes Jan 10, 2023

View reviewed changes

lukidzi merged commit f5b8d76 into kumahq:master Jan 10, 2023

mergify bot pushed a commit that referenced this pull request Jan 10, 2023

fix(kuma-cp): don't cache filtered data (#5574)

a71c961

Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76)

This was referenced Jan 10, 2023

fix(kuma-cp): don't cache filtered data (backport #5574) #5632

Merged

fix(kuma-cp): don't cache filtered data (backport #5574) #5633

Merged

mergify bot pushed a commit that referenced this pull request Jan 10, 2023

fix(kuma-cp): don't cache filtered data (#5574)

9305551

Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76)

mergify bot mentioned this pull request Jan 10, 2023

fix(kuma-cp): don't cache filtered data (backport #5574) #5634

Merged

mergify bot pushed a commit that referenced this pull request Jan 10, 2023

fix(kuma-cp): don't cache filtered data (#5574)

dfb7cd0

Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76)

mergify bot mentioned this pull request Jan 10, 2023

fix(kuma-cp): don't cache filtered data (backport #5574) #5635

Merged

mergify bot pushed a commit that referenced this pull request Jan 10, 2023

fix(kuma-cp): don't cache filtered data (#5574)

b999702

Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76)

mergify bot mentioned this pull request Jan 10, 2023

fix(kuma-cp): don't cache filtered data (backport #5574) #5636

Merged

mergify bot pushed a commit that referenced this pull request Jan 10, 2023

fix(kuma-cp): don't cache filtered data (#5574)

230f70e

Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76) # Conflicts: # pkg/xds/sync/ingress_proxy_builder.go

lukidzi added a commit that referenced this pull request Jan 10, 2023

fix(kuma-cp): don't cache filtered data (#5574)

0c3b9c7

Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76) Signed-off-by: Lukasz Dziedziak <[email protected]>

lukidzi added a commit that referenced this pull request Jan 10, 2023

fix(kuma-cp): don't cache filtered data (#5574)

8a1a711

Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76) Signed-off-by: Lukasz Dziedziak <[email protected]>

lukidzi added a commit that referenced this pull request Jan 10, 2023

fix(kuma-cp): don't cache filtered data (#5574)

fba59f1

Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76) Signed-off-by: Lukasz Dziedziak <[email protected]>

lukidzi added a commit that referenced this pull request Jan 10, 2023

fix(kuma-cp): don't cache filtered data (#5574)

85a581f

Signed-off-by: Lukasz Dziedziak <[email protected]> (cherry picked from commit f5b8d76) Signed-off-by: Lukasz Dziedziak <[email protected]>

michaelbeaumont mentioned this pull request Jan 10, 2023

chore: fix merge error in store options #5637

Merged

12 tasks

lukidzi added a commit that referenced this pull request Jan 11, 2023

fix(kuma-cp): don't cache filtered data (#5574)

a1e911e

Signed-off-by: Lukasz Dziedziak <[email protected]>

lukidzi pushed a commit that referenced this pull request Jan 11, 2023

fix(kuma-cp): don't cache filtered data (backport #5574) (#5636)

86dc069

* test(kuma-cp): fix wait for goroutine to be done (backport #5638) (#5648) Signed-off-by: Lukasz Dziedziak <[email protected]>

lukidzi pushed a commit that referenced this pull request Jan 11, 2023

fix(kuma-cp): don't cache filtered data (backport #5574) (#5636)

0fc9d4f

* test(kuma-cp): fix wait for goroutine to be done (backport #5638) (#5648) Signed-off-by: Lukasz Dziedziak <[email protected]>

bartsmykla pushed a commit to bartsmykla/kuma that referenced this pull request Jan 14, 2023

fix(kuma-cp): don't cache filtered data (kumahq#5574)

670aedd

Signed-off-by: Lukasz Dziedziak <[email protected]> Signed-off-by: Bart Smykla <[email protected]>

shaneutt mentioned this pull request Feb 14, 2023

chore: replace k8s.gcr.io registry usage #6040

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(kuma-cp): don't cache filtered data #5574

fix(kuma-cp): don't cache filtered data #5574

lukidzi commented Jan 4, 2023

michaelbeaumont commented Jan 5, 2023

lukidzi commented Jan 5, 2023

lobkovilya left a comment

lukidzi commented Jan 10, 2023

mergify bot commented Jan 10, 2023 •

edited

Loading

fix(kuma-cp): don't cache filtered data #5574

fix(kuma-cp): don't cache filtered data #5574

Conversation

lukidzi commented Jan 4, 2023

michaelbeaumont commented Jan 5, 2023

lukidzi commented Jan 5, 2023

lobkovilya left a comment

Choose a reason for hiding this comment

lukidzi commented Jan 10, 2023

mergify bot commented Jan 10, 2023 • edited Loading

✅ Backports have been created

mergify bot commented Jan 10, 2023 •

edited

Loading