[core] Adapt to current looplab/fsm package

AliceO2Group · Jul 18, 2023 · f322c58 · f322c58
1 parent 941cdcc
commit f322c58
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/core/environment/environment.go b/core/environment/environment.go
@@ -27,6 +27,7 @@
 package environment
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"sort"
@@ -148,7 +149,7 @@ func newEnvironment(userVars map[string]string) (env *Environment, err error) {
 			{Name: "RECOVER", Src: []string{"ERROR"}, Dst: "DEPLOYED"},
 		},
 		fsm.Callbacks{
-			"before_event": func(e *fsm.Event) {
+			"before_event": func(_ context.Context, e *fsm.Event) {
 				// If the event is START_ACTIVITY, we set up and update variables relevant to plugins early on.
 				// This used to be done inside the transition_startactivity, but then the new RN isn't available to the
 				// before_START_ACTIVITY hooks. By setting it up here, we ensure the run number is available especially
@@ -229,7 +230,7 @@ func newEnvironment(userVars map[string]string) (env *Environment, err error) {
 					e.Cancel(errHooks)
 				}
 			},
-			"leave_state": func(e *fsm.Event) {
+			"leave_state": func(_ context.Context, e *fsm.Event) {
 				errHooks := env.handleHooks(env.Workflow(), fmt.Sprintf("leave_%s", e.Src))
 				if errHooks != nil {
 					e.Cancel(errHooks)
@@ -238,7 +239,7 @@ func newEnvironment(userVars map[string]string) (env *Environment, err error) {
 
 				env.handlerFunc()(e)
 			},
-			"enter_state": func(e *fsm.Event) {
+			"enter_state": func(_ context.Context, e *fsm.Event) {
 				enterStateTimeMs := strconv.FormatInt(time.Now().UnixMilli(), 10)
 				env.workflow.SetRuntimeVar("enter_state_time_ms", enterStateTimeMs)
 
@@ -255,7 +256,7 @@ func newEnvironment(userVars map[string]string) (env *Environment, err error) {
 					"partition": envId,
 				}).Debug("environment.sm entering state")
 			},
-			"after_event": func(e *fsm.Event) {
+			"after_event": func(_ context.Context, e *fsm.Event) {
 				errHooks := env.handleHooks(env.Workflow(), fmt.Sprintf("after_%s", e.Event))
 				if errHooks != nil {
 					e.Cancel(errHooks)
@@ -613,7 +614,7 @@ func (env *Environment) TryTransition(t Transition) (err error) {
 	if err != nil {
 		return
 	}
-	err = env.Sm.Event(t.eventName(), t)
+	err = env.Sm.Event(context.Background(), t.eventName(), t)
 	return
 }
 

diff --git a/core/task/scheduler.go b/core/task/scheduler.go
@@ -92,7 +92,7 @@ func runSchedulerController(ctx context.Context,
 			switch {
 			case receivedEvent == scheduler.Event_SUBSCRIBED:
 				if state.sm.Is("INITIAL") {
-					state.sm.Event("CONNECT")
+					state.sm.Event(context.Background(), "CONNECT")
 				}
 			}
 		}

diff --git a/core/task/schedulerstate.go b/core/task/schedulerstate.go
@@ -143,34 +143,34 @@ func NewScheduler(taskman *Manager, fidStore store.Singleton, shutdown func()) (
 			{Name: "EXIT", Src: []string{"CONNECTED"}, Dst: "FINAL"},
 		},
 		fsm.Callbacks{
-			"before_event": func(e *fsm.Event) {
+			"before_event": func(_ context.Context, e *fsm.Event) {
 				log.WithFields(logrus.Fields{
 					"event": e.Event,
 					"src":   e.Src,
 					"dst":   e.Dst,
 				}).Debug("state.sm starting transition")
 			},
-			"enter_state": func(e *fsm.Event) {
+			"enter_state": func(_ context.Context, e *fsm.Event) {
 				log.WithFields(logrus.Fields{
 					"event": e.Event,
 					"src":   e.Src,
 					"dst":   e.Dst,
 				}).Debug("state.sm entering state")
 			},
-			"leave_CONNECTED": func(e *fsm.Event) {
+			"leave_CONNECTED": func(_ context.Context, e *fsm.Event) {
 				log.Debug("leave_CONNECTED")
 
 			},
-			"before_NEW_ENVIRONMENT": func(e *fsm.Event) {
+			"before_NEW_ENVIRONMENT": func(_ context.Context, e *fsm.Event) {
 				log.Debug("before_NEW_ENVIRONMENT")
 				e.Async() //transition frozen until the corresponding fsm.Transition call
 			},
-			"enter_CONNECTED": func(e *fsm.Event) {
+			"enter_CONNECTED": func(_ context.Context, e *fsm.Event) {
 				log.Debug("enter_CONNECTED")
 				log.WithField("level", infologger.IL_Support).
 					Info("scheduler connected")
 			},
-			"after_NEW_ENVIRONMENT": func(e *fsm.Event) {
+			"after_NEW_ENVIRONMENT": func(_ context.Context, e *fsm.Event) {
 				log.Debug("after_NEW_ENVIRONMENT")
 			},
 		},
@@ -206,10 +206,10 @@ func (state *schedulerState) Start(ctx context.Context) {
 		if state.err != nil {
 			err = state.err
 			log.WithField("error", err.Error()).Debug("scheduler quit with error, main state machine GO_ERROR")
-			state.sm.Event("GO_ERROR", err) //TODO: use error information in GO_ERROR
+			state.sm.Event(context.Background(), "GO_ERROR", err) //TODO: use error information in GO_ERROR
 		} else {
 			log.Debug("scheduler quit, no errors")
-			state.sm.Event("EXIT")
+			state.sm.Event(context.Background(), "EXIT")
 		}
 	}()
 }