Merge pull request #1116 from Denton24646/fix/catalogsource-context-leak

Bug 1774720: catalogsource context cancel function leak

Author: openshift-merge-robot

pkg/controller/registry/grpc/source.go

@@ -142,27 +142,30 @@ func (s *SourceStore) watch(ctx context.Context, key resolver.CatalogKey, source
 		case <-ctx.Done():
 			return
 		default:
-			timer, _ := context.WithTimeout(ctx, s.stateTimeout(state))
-			if source.Conn.WaitForStateChange(timer, state) {
-				newState := source.Conn.GetState()
-				state = newState
-
-				// update connection state
-				src := s.Get(key)
-				if src == nil {
-					// source was removed, cleanup this goroutine
-					return
+			func() {
+				timer, cancel := context.WithTimeout(ctx, s.stateTimeout(state))
+				defer cancel()
+				if source.Conn.WaitForStateChange(timer, state) {
+					newState := source.Conn.GetState()
+					state = newState
+
+					// update connection state
+					src := s.Get(key)
+					if src == nil {
+						// source was removed, cleanup this goroutine
+						return
+					}
+
+					src.LastConnect = metav1.Now()
+					src.ConnectionState = newState
+					s.sourcesLock.Lock()
+					s.sources[key] = *src
+					s.sourcesLock.Unlock()
+
+					// notify subscriber
+					s.notify <- SourceState{Key: key, State: newState}
 				}
-
-				src.LastConnect = metav1.Now()
-				src.ConnectionState = newState
-				s.sourcesLock.Lock()
-				s.sources[key] = *src
-				s.sourcesLock.Unlock()
-
-				// notify subscriber
-				s.notify <- SourceState{Key: key, State: newState}
-			}
+			}()
 		}
 	}
 }
@@ -190,6 +193,7 @@ func (s *SourceStore) Remove(key resolver.CatalogKey) error {
 func (s *SourceStore) AsClients(globalNamespace, localNamespace string) map[resolver.CatalogKey]client.Interface {
 	refs := map[resolver.CatalogKey]client.Interface{}
 	s.sourcesLock.RLock()
+	defer s.sourcesLock.RUnlock()
 	for key, source := range s.sources {
 		if !(key.Namespace == globalNamespace || key.Namespace == localNamespace) {
 			continue
@@ -199,7 +203,6 @@ func (s *SourceStore) AsClients(globalNamespace, localNamespace string) map[reso
 		}
 		refs[key] = client.NewClientFromConn(source.Conn)
 	}
-	s.sourcesLock.RUnlock()
 
 	// TODO : remove unhealthy
 	return refs