fix memory leak

Signed-off-by: NikitaSkrynnik <nikita.skrynnik@xored.com>
networkservicemesh · Oct 14, 2024 · bb11536 · bb11536
1 parent dfc3300
commit bb11536
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/pkg/networkservice/nsmonitor/client.go b/pkg/networkservice/nsmonitor/client.go
@@ -73,20 +73,22 @@ func (r *netNSMonitorClient) Request(ctx context.Context, request *networkservic
 		r.monitor = r.supplyMonitor(r.chainCtx)
 	})
 
-	cancelCtx, cancel := context.WithCancel(r.chainCtx)
-	if _, ok := metadata.Map(ctx, metadata.IsClient(r)).LoadOrStore(key{}, cancel); !ok {
+	if _, ok := metadata.Map(ctx, metadata.IsClient(r)).Load(key{}); !ok {
+		cancelCtx, cancel := context.WithCancel(r.chainCtx)
+		metadata.Map(ctx, metadata.IsClient(r)).Store(key{}, cancel)
 		if inodeURL, ok := conn.GetMechanism().GetParameters()[common.InodeURL]; ok {
 			deleteCh := r.monitor.Watch(cancelCtx, inodeURL)
 			factory := begin.FromContext(ctx)
 			go func() {
+				defer cancel()
 				select {
 				case <-r.chainCtx.Done():
 					return
 				case <-cancelCtx.Done():
 					return
 				case _, ok := <-deleteCh:
 					if ok && cancelCtx.Err() == nil {
-						factory.Close(begin.CancelContext(cancelCtx))
+						<-factory.Close(begin.CancelContext(cancelCtx))
 					}
 					return
 				}