improve heal monitor cleanup

Signed-off-by: Danil Uzlov <DanilUzlov@yandex.ru>
networkservicemesh · Jun 19, 2023 · 945b583 · 945b583
1 parent 0ff7602
commit 945b583
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/networkservice/common/heal/eventloop.go b/pkg/networkservice/common/heal/eventloop.go
@@ -34,6 +34,7 @@ import (
 type eventLoop struct {
 	heal              *healClient
 	eventLoopCtx      context.Context
+	eventLoopCancel   context.CancelFunc
 	chainCtx          context.Context
 	conn              *networkservice.Connection
 	eventFactory      begin.EventFactory
@@ -81,6 +82,7 @@ func newEventLoop(ctx context.Context, cc grpc.ClientConnInterface, conn *networ
 	cev := &eventLoop{
 		heal:              heal,
 		eventLoopCtx:      eventLoopCtx,
+		eventLoopCancel:   eventLoopCancel,
 		chainCtx:          ctx,
 		conn:              conn,
 		eventFactory:      ev,
@@ -136,6 +138,8 @@ func (cev *eventLoop) eventLoop() {
 
 func (cev *eventLoop) waitForEvents() (needToHeal, reselect bool) {
 	defer close(cev.monitorFinishedCh)
+	// make sure we stop all monitors
+	defer cev.eventLoopCancel()
 
 	ctrlPlaneCh := cev.monitorCtrlPlane()
 	dataPlaneCh := cev.monitorDataPlane()