[qfix] Fix deadlineCtx in eventloop (#1277)

* fix deadlineCtx + rename livenessCheck func Signed-off-by: Nikita Skrynnik <[email protected]> * fix naming Signed-off-by: Nikita Skrynnik <[email protected]>
networkservicemesh · May 5, 2022 · 8d67627 · 8d67627
1 parent 5e4251a
commit 8d67627
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/pkg/networkservice/common/heal/client.go b/pkg/networkservice/common/heal/client.go
@@ -32,10 +32,10 @@ import (
 )
 
 type healClient struct {
-	chainCtx               context.Context
-	dataPlaneLivenessCheck LivenessCheck
-	livenessCheckInterval  time.Duration
-	livenessCheckTimeout   time.Duration
+	chainCtx              context.Context
+	livenessCheck         LivenessCheck
+	livenessCheckInterval time.Duration
+	livenessCheckTimeout  time.Duration
 }
 
 // NewClient - returns a new heal client chain element
@@ -48,10 +48,10 @@ func NewClient(chainCtx context.Context, opts ...Option) networkservice.NetworkS
 		opt(o)
 	}
 	return &healClient{
-		chainCtx:               chainCtx,
-		dataPlaneLivenessCheck: o.dataPlaneLivenessCheck,
-		livenessCheckInterval:  o.livenessCheckInterval,
-		livenessCheckTimeout:   o.livenessCheckTimeout,
+		chainCtx:              chainCtx,
+		livenessCheck:         o.livenessCheck,
+		livenessCheckInterval: o.livenessCheckInterval,
+		livenessCheckTimeout:  o.livenessCheckTimeout,
 	}
 }
 

diff --git a/pkg/networkservice/common/heal/eventloop.go b/pkg/networkservice/common/heal/eventloop.go
@@ -134,7 +134,7 @@ func (cev *eventLoop) eventLoop() {
 
 	livenessCheckCtx, livenessCheckCancel := context.WithCancel(context.Background())
 	defer livenessCheckCancel()
-	if cev.heal.dataPlaneLivenessCheck != nil {
+	if cev.heal.livenessCheck != nil {
 		go func() {
 			cev.monitorDataPlane()
 			livenessCheckCancel()
@@ -193,15 +193,13 @@ func (cev *eventLoop) monitorDataPlane() {
 	for {
 		select {
 		case <-ticker.C:
-			deadlineCtx, deadlineCancel := context.WithDeadline(context.Background(), time.Now().Add(cev.heal.livenessCheckTimeout))
-			alive := cev.heal.dataPlaneLivenessCheck(deadlineCtx, cev.conn)
+			deadlineCtx, deadlineCancel := context.WithDeadline(cev.chainCtx, time.Now().Add(cev.heal.livenessCheckTimeout))
+			alive := cev.heal.livenessCheck(deadlineCtx, cev.conn)
 			deadlineCancel()
 
 			if !alive {
 				return
 			}
-		case <-cev.chainCtx.Done():
-			return
 		case <-cev.eventLoopCtx.Done():
 			return
 		}

diff --git a/pkg/networkservice/common/heal/options.go b/pkg/networkservice/common/heal/options.go
@@ -32,9 +32,9 @@ const (
 type LivenessCheck func(deadlineCtx context.Context, conn *networkservice.Connection) bool
 
 type options struct {
-	dataPlaneLivenessCheck LivenessCheck
-	livenessCheckInterval  time.Duration
-	livenessCheckTimeout   time.Duration
+	livenessCheck         LivenessCheck
+	livenessCheckInterval time.Duration
+	livenessCheckTimeout  time.Duration
 }
 
 // Option - option for heal.NewClient() chain element
@@ -43,7 +43,7 @@ type Option func(o *options)
 // WithLivenessCheck - sets the data plane liveness checker
 func WithLivenessCheck(livenessCheck LivenessCheck) Option {
 	return func(o *options) {
-		o.dataPlaneLivenessCheck = livenessCheck
+		o.livenessCheck = livenessCheck
 	}
 }