Add verbosity to diagnose mis-signaling

Signed-off-by: Dmitrii Okunev <[email protected]>

Author: xaionaro

pkg/jobmanager/jobmanager.go

@@ -161,7 +161,10 @@ func (jm *JobManager) Run(ctx context.Context, resumeJobs bool) error {
 	}
 
 	apiCtx, apiCancel := context.WithCancel(ctx)
-	jm.apiCancel = apiCancel
+	jm.apiCancel = func() {
+		logger.FromCtx(ctx).Debugf("cancelling API context")
+		apiCancel()
+	}
 
 	errCh := make(chan error, 1)
 	go func() {

pkg/jobmanager/start.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/facebookincubator/go-belt/beltctx"
+	"github.com/facebookincubator/go-belt/tool/experimental/errmon"
 	"github.com/facebookincubator/go-belt/tool/experimental/metrics"
 	"github.com/facebookincubator/go-belt/tool/logger"
 	"github.com/linuxboot/contest/pkg/api"
@@ -84,9 +85,19 @@ func (jm *JobManager) start(ev *api.Event) *api.EventResponse {
 func (jm *JobManager) startJob(ctx context.Context, j *job.Job, resumeState *job.PauseEventPayload) {
 	jm.jobsMu.Lock()
 	defer jm.jobsMu.Unlock()
-	jobCtx, jobCancel := context.WithCancel(ctx)
+	jobCtx := ctx
+	jobCtx, jobCancel := context.WithCancel(jobCtx)
 	jobCtx, jobPause := signaller.WithSignal(jobCtx, signals.Paused)
-	jm.jobs[j.ID] = &jobInfo{job: j, pause: jobPause, cancel: jobCancel}
+	jm.jobs[j.ID] = &jobInfo{
+		job: j,
+		pause: func() {
+			logger.FromCtx(ctx).Debugf("pausing job")
+			jobPause()
+		},
+		cancel: func() {
+			logger.FromCtx(ctx).Debugf("cancelling job context")
+			jobCancel()
+		}}
 	go jm.runJob(jobCtx, j, resumeState)
 }
 
@@ -117,11 +128,13 @@ func (jm *JobManager) runJob(ctx context.Context, j *job.Job, resumeState *job.P
 	logger.FromCtx(ctx).Debugf("Job %d: runner finished, err %v", j.ID, err)
 	switch err {
 	case context.Canceled:
-		_ = jm.emitEvent(ctx, j.ID, job.EventJobCancelled)
+		_err := jm.emitEvent(ctx, j.ID, job.EventJobCancelled)
+		errmon.ObserveErrorCtx(ctx, _err)
 		return
 	case signals.Paused:
 		if err := jm.emitEventPayload(ctx, j.ID, job.EventJobPaused, resumeState); err != nil {
-			_ = jm.emitErrEvent(ctx, j.ID, job.EventJobPauseFailed, fmt.Errorf("Job %+v failed pausing: %v", j, err))
+			_err := jm.emitErrEvent(ctx, j.ID, job.EventJobPauseFailed, fmt.Errorf("job %+v failed pausing: %w", j, err))
+			errmon.ObserveErrorCtx(ctx, _err)
 		} else {
 			logger.FromCtx(ctx).Infof("Successfully paused job %d (run %d, %d targets)", j.ID, resumeState.RunID, len(resumeState.Targets))
 			logger.FromCtx(ctx).Debugf("Job %d pause state: %+v", j.ID, resumeState)
@@ -131,17 +144,19 @@ func (jm *JobManager) runJob(ctx context.Context, j *job.Job, resumeState *job.P
 	select {
 	case <-signaller.Until(ctx, signals.Paused):
 		// We were asked to pause but failed to do so.
-		pauseErr := fmt.Errorf("Job %+v failed pausing: %v", j, err)
+		pauseErr := fmt.Errorf("job %+v failed pausing: %w", j, err)
 		logger.FromCtx(ctx).Errorf("%v", pauseErr)
-		_ = jm.emitErrEvent(ctx, j.ID, job.EventJobPauseFailed, pauseErr)
+		_err := jm.emitErrEvent(ctx, j.ID, job.EventJobPauseFailed, pauseErr)
+		errmon.ObserveErrorCtx(ctx, _err)
 		return
 	default:
 	}
 	logger.FromCtx(ctx).Infof("Job %d finished", j.ID)
 	// at this point it is safe to emit the job status event. Note: this is
 	// checking `err` from the `jm.jobRunner.Run()` call above.
 	if err != nil {
-		_ = jm.emitErrEvent(ctx, j.ID, job.EventJobFailed, fmt.Errorf("Job %d failed after %s: %w", j.ID, duration, err))
+		_err := jm.emitErrEvent(ctx, j.ID, job.EventJobFailed, fmt.Errorf("job %d failed after %s: %w", j.ID, duration, err))
+		errmon.ObserveErrorCtx(ctx, _err)
 	} else {
 		logger.FromCtx(ctx).Infof("Job %+v completed after %s", j, duration)
 		err = jm.emitEvent(ctx, j.ID, job.EventJobCompleted)

pkg/runner/step_state.go

@@ -127,7 +127,11 @@ func (ss *stepState) Run(ctx context.Context) error {
 		return nil
 	}
 
-	stepCtx, cancel := context.WithCancel(ctx)
+	stepCtx, stepCtxCancel := context.WithCancel(ctx)
+	cancel := func() {
+		logger.FromCtx(stepCtx).Debugf("cancelling step context")
+		stepCtxCancel()
+	}
 	stepCtx = beltctx.WithField(stepCtx, "step_index", strconv.Itoa(ss.stepIndex))
 	stepCtx = beltctx.WithField(stepCtx, "step_label", ss.sb.TestStepLabel)
 

pkg/runner/test_runner.go

@@ -103,7 +103,10 @@ func (tr *TestRunner) Run(
 
 	// Peel off contexts used for steps and target handlers.
 	runCtx, runCancel := context.WithCancel(ctx)
-	defer runCancel()
+	defer func() {
+		logger.FromCtx(ctx).Debugf("run finished, cancelling the context")
+		runCancel()
+	}()
 
 	var targetStates map[string]*targetState
 
@@ -231,7 +234,9 @@ func (tr *TestRunner) Run(
 				if !ok {
 					return resultErr
 				}
+				logger.FromCtx(ctx).Tracef("got event from targetErrors")
 			case runErr = <-stepsErrorsCh:
+				logger.FromCtx(ctx).Tracef("got event from stepsErrorsCh")
 			}
 			if runErr != nil && runErr != signals.Paused && resultErr == nil {
 				resultErr = runErr
@@ -348,7 +353,7 @@ func (tr *TestRunner) waitSteps(ctx context.Context) ([]json.RawMessage, error)
 		if err != nil {
 			stepsNeverReturned = append(stepsNeverReturned, ss.GetTestStepLabel())
 			ss.SetError(ctx, &cerrors.ErrTestStepsNeverReturned{StepNames: []string{ss.GetTestStepLabel()}})
-			// Stop step context, this will help release the reader.
+			logger.FromCtx(ctx).Debugf("stopping step context, this will help release the reader")
 			ss.ForceStop()
 		} else if resultErr == nil && result.Err != nil && result.Err != signals.Paused {
 			resultErr = result.Err
@@ -481,7 +486,7 @@ loop:
 
 				case <-ctx.Done():
 					err = ctx.Err()
-					logger.FromCtx(ctx).Debugf("Canceled target context during waiting for target result")
+					logger.FromCtx(ctx).Debugf("Canceled target context during waiting for target result: %v", err)
 				}
 
 			case signals.Paused:

tests/integ/jobmanager/common.go

@@ -35,6 +35,7 @@ import (
 	"github.com/linuxboot/contest/pkg/target"
 	"github.com/linuxboot/contest/pkg/types"
 
+	"github.com/facebookincubator/go-belt/beltctx"
 	"github.com/facebookincubator/go-belt/tool/logger"
 	"github.com/linuxboot/contest/plugins/reporters/targetsuccess"
 	"github.com/linuxboot/contest/plugins/targetlocker/inmemory"
@@ -355,8 +356,11 @@ func (suite *TestJobManagerSuite) initJobManager(instanceTag string) {
 	require.NoError(suite.T(), err)
 
 	suite.jm = jm
-	suite.jmCtx, suite.jmCancel = context.WithCancel(logging.WithBelt(context.Background(), logger.LevelDebug))
+	ctx := logging.WithBelt(context.Background(), logger.LevelTrace)
+	ctx = beltctx.WithField(ctx, "integ-test", suite.T().Name())
+	suite.jmCtx, suite.jmCancel = context.WithCancel(ctx)
 	suite.jmCtx, suite.jmPause = signaller.WithSignal(suite.jmCtx, signals.Paused)
+
 }
 
 func (suite *TestJobManagerSuite) BeforeTest(suiteName, testName string) {