fix run_task_background getting stuck in running state when foregro…

…und task completes
ethpandaops · Jan 18, 2024 · 460b48d · 460b48d
1 parent cd1cfe4
commit 460b48d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/pkg/coordinator/names/validatornames.go b/pkg/coordinator/names/validatornames.go
@@ -49,6 +49,10 @@ func (vn *ValidatorNames) LoadValidatorNames() {
 
 	vn.names = make(map[uint64]string)
 
+	if vn.config == nil {
+		return
+	}
+
 	// load names
 	if vn.config.InventoryYaml != "" {
 		err := vn.loadFromYaml(vn.config.InventoryYaml)

diff --git a/pkg/coordinator/tasks/run_task_background/task.go b/pkg/coordinator/tasks/run_task_background/task.go
@@ -138,6 +138,10 @@ func (t *Task) Execute(ctx context.Context) error {
 
 	result := <-t.resultChan
 	t.ctx.SetResult(result.result)
+
+	t.resultChanMtx.Lock()
+	t.resultChan = nil
+	t.resultChanMtx.Unlock()
 	cancel()
 
 	<-t.foregroundChan
@@ -197,10 +201,6 @@ func (t *Task) execForegroundTask(ctx context.Context) {
 		t.watchTaskResult(ctx, cancelFn)
 	})
 
-	if ctx.Err() != nil {
-		return
-	}
-
 	taskResult := t.ctx.Scheduler.GetTaskStatus(t.foregroundTask)
 
 	taskStatus := "success"