Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 12 additions & 3 deletions pkg/reftracker/ref_tracker.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,27 @@ func (a *AppRefTracker) AppsForRef(refKey RefKey) (map[RefKey]struct{}, error) {
return nil, fmt.Errorf("could not find ref %s", refKey.Description())
}

return apps, nil
return copyRefKeySet(apps), nil
}

func (a *AppRefTracker) RefsForApp(appKey RefKey) (map[RefKey]struct{}, error) {
a.lock.Lock()
defer a.lock.Unlock()

if a.appsToRefs[appKey] == nil {
refs := a.appsToRefs[appKey]
if refs == nil {
return nil, fmt.Errorf("could not find refs for App %s", appKey.RefName())
}

return a.appsToRefs[appKey], nil
return copyRefKeySet(refs), nil
}

func copyRefKeySet(in map[RefKey]struct{}) map[RefKey]struct{} {
out := make(map[RefKey]struct{}, len(in))
for k := range in {
out[k] = struct{}{}
}
return out
}

func (a *AppRefTracker) RemoveRef(refKey RefKey) {
Expand Down
52 changes: 52 additions & 0 deletions pkg/reftracker/ref_tracker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package reftracker_test

import (
"sync"
"testing"

"carvel.dev/kapp-controller/pkg/reftracker"
Expand Down Expand Up @@ -59,3 +60,54 @@ func Test_RemoveAppFromAllRefs_RemovesApp(t *testing.T) {
t.Fatalf("expected app to be removed from appRefTracker after deletion")
}
}

func Test_AppsForRef_SafeForConcurrentIteration(t *testing.T) {
appRefTracker := reftracker.NewAppRefTracker()

refKey := reftracker.NewSecretKey("secretName", "default")
refKeyMap := map[reftracker.RefKey]struct{}{refKey: {}}

for i := 0; i < 20; i++ {
appKey := reftracker.NewAppKey("seed-app", "default")
appKey = reftracker.NewAppKey(appKey.RefName()+string(rune('a'+i)), "default")
appRefTracker.ReconcileRefs(refKeyMap, appKey)
}

stop := make(chan struct{})
var wg sync.WaitGroup

wg.Add(1)
go func() {
defer wg.Done()
i := 0
for {
select {
case <-stop:
return
default:
appKey := reftracker.NewAppKey("mutator-app", "default")
appKey = reftracker.NewAppKey(appKey.RefName()+string(rune('a'+(i%26))), "default")
appRefTracker.ReconcileRefs(refKeyMap, appKey)
appRefTracker.RemoveAppFromAllRefs(appKey)
i++
}
}
}()

iterDone := make(chan struct{})
go func() {
defer close(iterDone)
for i := 0; i < 200; i++ {
apps, err := appRefTracker.AppsForRef(refKey)
if err != nil {
continue
}
for range apps {
}
}
}()

<-iterDone
close(stop)
wg.Wait()
}