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

fix #655 Repeated subscriptions result in multiple callbacks #674

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix #655 Repeated subscriptions result in multiple callbacks #674

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ec58a0
fix #655 Repeated subscriptions result in multiple callbacks
yesAnd92 Oct 30, 2023
1b3a79c
Revert "fix #655 Repeated subscriptions result in multiple callbacks"
yesAnd92 Nov 2, 2023
0d50316
Add duplicate check during subscription
yesAnd92 Nov 2, 2023
5cd83e1
Merge branch 'nacos-group:master' into repeat-sub-bug
yesAnd92 Nov 2, 2023
e0819bc
Merge branch 'master' into repeat-sub-bug
yesAnd92 Dec 19, 2023
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
9 changes: 8 additions & 1 deletion clients/naming_client/naming_cache/subscribe_callback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ func (ed *SubscribeCallback) AddCallbackFunc(serviceName string, clusters string
var funcSlice []*func(services []model.Instance, err error)
old, ok := ed.callbackFuncMap.Get(key)
if ok {
funcSlice = append(funcSlice, old.([]*func(services []model.Instance, err error))...)
for _, funcItem := range old.([]*func(services []model.Instance, err error)) {
if funcItem != callbackFunc {
funcSlice = append(funcSlice, funcItem)
}
}
}
funcSlice = append(funcSlice, callbackFunc)
ed.callbackFuncMap.Set(key, funcSlice)
Expand All @@ -73,6 +77,9 @@ func (ed *SubscribeCallback) ServiceChanged(cacheKey string, service *model.Serv
funcs, ok := ed.callbackFuncMap.Get(cacheKey)
if ok {
for _, funcItem := range funcs.([]*func(services []model.Instance, err error)) {
if *funcItem == nil {
continue
}
(*funcItem)(service.Hosts, nil)
}
}
Expand Down