Skip to content

fix: Avoid site-agent workflow state races #2706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kfelternv wants to merge 5 commits into
base: main
Choose a base branch
from
+11 −10
Draft

fix: Avoid site-agent workflow state races #2706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ada78f
fix: Avoid site-agent workflow state races
kfelternv Jun 19, 2026
858f851
Merge upstream main into fix/site-agent-workflow-state-race
kfelternv Jun 22, 2026
3e0083e
Merge upstream main into fix/site-agent-workflow-state-race
kfelternv Jun 22, 2026
111fa93
Merge upstream main into fix/site-agent-workflow-state-race
kfelternv Jun 23, 2026
d4d6b71
Merge remote-tracking branch 'refs/remotes/origin/main' into HEAD
kfelternv Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions rest-api/site-agent/pkg/components/managers/workflow/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,10 @@ func (wflow *API) GetState() []string {
strs = append(strs, fmt.Sprintln("Temporal Connection Attempted: ", wt.State.ConnectionAttempted.Load()))
strs = append(strs, fmt.Sprintln("Temporal Connection Succeeded: ", wt.State.ConnectionSucc.Load()))
strs = append(strs, fmt.Sprintln("Temporal Status: ", computils.CompStatus(wt.State.HealthStatus.Load()).String()))
strs = append(strs, fmt.Sprintln("Temporal Last Error: ", *wt.State.Err))
strs = append(strs, fmt.Sprintln("Temporal Connection Time: ", wt.State.ConnectionTime))
errMsg, _ := wt.State.Err.Load().(string)
connectionTime, _ := wt.State.ConnectionTime.Load().(string)
strs = append(strs, fmt.Sprintln("Temporal Last Error: ", errMsg))
strs = append(strs, fmt.Sprintln("Temporal Connection Time: ", connectionTime))

return strs
}
Expand Down
9 changes: 3 additions & 6 deletions rest-api/site-agent/pkg/components/managers/workflow/orchestrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ import (
"os"
"time"

"sync/atomic"
"unsafe"

"github.com/rs/zerolog"
zlogadapter "logur.dev/adapter/zerolog"
"logur.dev/logur"
Expand Down Expand Up @@ -48,14 +45,14 @@ func Orchestrator() {

// keep track how many events we've seen.
state.ConnectionAttempted.Inc()
state.ConnectionTime = time.Now().String()
state.ConnectionTime.Store(time.Now().String())

err := workflowOrchestrator()
if err != nil {
state.HealthStatus.Store(uint64(computils.CompUnhealthy))
tStr := err.Error()
atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(&state.Err)), unsafe.Pointer(&tStr))
log.Error().Msg(*state.Err)
state.Err.Store(tStr)
log.Error().Msg(tStr)
} else {
// keep track how many succeeded.
state.ConnectionSucc.Inc()
Expand Down
6 changes: 4 additions & 2 deletions rest-api/site-agent/pkg/datatypes/managertypes/workflow/workflowtypes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
package workflowtypes

import (
stdatomic "sync/atomic"

"go.temporal.io/sdk/client"
"go.temporal.io/sdk/worker"
"go.uber.org/atomic"
Expand All @@ -18,9 +20,9 @@ type State struct {
// HealthStatus current health state
HealthStatus atomic.Uint64
// Err is error message
Err *string
Err stdatomic.Value
// ConnectionTime time when attempted to connect
ConnectionTime string
ConnectionTime stdatomic.Value
}

// MgrState - Mgr state
Expand Down