java-topology/defects/linkerd2/patch/0001-federated-service-use-map-for-remote-discovery-diff.patch

64 lines
2.3 KiB
Diff

# UNDF: UNDF-2026-000000142
diff --git a/controller/api/destination/federated_service_watcher.go b/controller/api/destination/federated_service_watcher.go
index 1234567..abcdef0 100644
--- a/controller/api/destination/federated_service_watcher.go
+++ b/controller/api/destination/federated_service_watcher.go
@@ -43,7 +43,8 @@ type federatedService struct {
sync.RWMutex
id ServiceID
subscribers []federatedServiceSubscriber
- remoteDiscovery []remoteDiscoveryID
+ // remoteDiscovery stored as map for O(1) membership tests in update().
+ remoteDiscovery map[remoteDiscoveryID]struct{}
localDiscovery string
log *logging.Entry
fsw *FederatedServiceWatcher
@@ -210,7 +211,10 @@ func (fsw *FederatedServiceWatcher) newFederatedService(service *corev1.Service)
fs := &federatedService{...}
- fs.remoteDiscovery = remoteDiscoveryIDs(service, fsw.log)
+ ids := remoteDiscoveryIDs(service, fsw.log)
+ fs.remoteDiscovery = make(map[remoteDiscoveryID]struct{}, len(ids))
+ for _, id := range ids {
+ fs.remoteDiscovery[id] = struct{}{}
+ }
...
}
@@ -225,18 +229,18 @@ func (fs *federatedService) update(service *corev1.Service) {
fs.Lock()
defer fs.Unlock()
- newRemoteDiscovery := remoteDiscoveryIDs(service, fs.log)
- for _, id := range newRemoteDiscovery {
- if !slices.Contains(fs.remoteDiscovery, id) {
+ // Build new set in O(N), then diff old vs new in O(N).
+ newIDs := remoteDiscoveryIDs(service, fs.log)
+ newSet := make(map[remoteDiscoveryID]struct{}, len(newIDs))
+ for _, id := range newIDs {
+ newSet[id] = struct{}{}
+ }
+ for id := range newSet {
+ if _, exists := fs.remoteDiscovery[id]; !exists {
for i := range fs.subscribers {
fs.remoteDiscoverySubscribe(&fs.subscribers[i], id)
}
}
}
- for _, id := range fs.remoteDiscovery {
- if !slices.Contains(newRemoteDiscovery, id) {
+ for id := range fs.remoteDiscovery {
+ if _, exists := newSet[id]; !exists {
for i := range fs.subscribers {
fs.remoteDiscoveryUnsubscribe(&fs.subscribers[i], id)
}
}
}
- fs.remoteDiscovery = newRemoteDiscovery
+ fs.remoteDiscovery = newSet
@@ -308,7 +312,7 @@ func (fs *federatedService) onServiceAdd(service *corev1.Service) {
- for _, id := range fs.remoteDiscovery {
+ for id := range fs.remoteDiscovery {
fs.remoteDiscoverySubscribe(&fs.subscribers[len(fs.subscribers)-1], id)
}
}