[core] Extend run number validity timeframe to support pre/post hooks

Author: teo

core/environment/environment.go

@@ -29,6 +29,7 @@ package environment
 import (
 	"errors"
 	"fmt"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -127,6 +128,21 @@ func newEnvironment(userVars map[string]string) (env *Environment, err error) {
 		},
 		fsm.Callbacks{
 			"before_event": func(e *fsm.Event) {
+				// If the event is START_ACTIVITY, we set up a new run number 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
+				// to plugin hooks.
+				if e.Event == "START_ACTIVITY" {
+					runNumber, rnErr := the.ConfSvc().NewRunNumber()
+					if rnErr != nil {
+						e.Cancel(rnErr)
+						return
+					}
+					env.currentRunNumber = runNumber
+					rnString := strconv.FormatUint(uint64(runNumber), 10)
+					env.workflow.GetVars().Set("run_number", rnString)
+					env.workflow.GetVars().Set("runNumber", rnString)
+				}
 				errHooks := env.handleHooks(env.Workflow(), fmt.Sprintf("before_%s", e.Event))
 				if errHooks != nil {
 					e.Cancel(errHooks)
@@ -173,6 +189,13 @@ func newEnvironment(userVars map[string]string) (env *Environment, err error) {
 							e.Event,
 						)
 				}
+
+				// If the event is STOP_ACTIVITY, we remove the active run number after all hooks are done.
+				if e.Event == "STOP_ACTIVITY" {
+					env.currentRunNumber = 0
+					env.workflow.GetVars().Del("run_number")
+					env.workflow.GetVars().Del("runNumber")
+				}
 			},
 		},
 	)

core/environment/transition_startactivity.go

@@ -54,17 +54,12 @@ func (t StartActivityTransition) do(env *Environment) (err error) {
 		return errors.New("cannot transition in NIL environment")
 	}
 
-	var runNumber uint32
-	runNumber, err = the.ConfSvc().NewRunNumber()
-	if err != nil {
-		return
-	}
+	runNumber := env.currentRunNumber
 
 	log.WithField(infologger.Run, runNumber).
 		WithField("partition", env.Id().String()).
 		Info("starting new run")
 
-	env.currentRunNumber = runNumber
 	args := controlcommands.PropertyMap{
 		"runNumber": strconv.FormatUint(uint64(runNumber), 10),
 	}

core/environment/transition_stopactivity.go

@@ -56,8 +56,6 @@ func (t StopActivityTransition) do(env *Environment) (err error) {
 		WithField("partition", env.Id().String()).
 		Info("stopping run")
 	runNumber := env.currentRunNumber
-
-	env.currentRunNumber = 0
 
 	taskmanMessage := task.NewTransitionTaskMessage(
 						env.Workflow().GetTasks(),

core/workflow/callable/call.go

@@ -26,7 +26,6 @@ package callable
 
 import (
 	"fmt"
-	"strconv"
 	texttemplate "text/template"
 	"time"
 
@@ -129,7 +128,6 @@ func (c *Call) Call() error {
 			template.WrapPointer(&output),
 			template.WrapPointer(&returnVar),
 		}
-	c.VarStack["run_number"] = strconv.FormatUint(uint64(c.parentRole.GetCurrentRunNumber()), 10 )
 	c.VarStack["environment_id"] = c.parentRole.GetEnvironmentId().String()
 	objStack := integration.PluginsInstance().ObjectStack(c)