Skip to content

Call ODC STOP only when the partition is in RUNNING #732

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

Merged
knopers8 merged 1 commit into from
Aug 19, 2025
Merged

Call ODC STOP only when the partition is in RUNNING #732

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 71 additions & 2 deletions core/integration/odc/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1437,20 +1437,21 @@ func (p *Plugin) CallStack(data interface{}) (stack map[string]interface{}) {
rn, ok := varStack["run_number"]
if !ok {
log.WithField("partition", envId).
WithField("call", "Start").
WithField("call", "Stop").
Warn("cannot acquire run number for ODC Stop")
}
runNumberu64, err = strconv.ParseUint(rn, 10, 32)
if err != nil {
log.WithField("partition", envId).
WithField("call", "Stop").
WithError(err).
Error("cannot acquire run number for ODC EOR")
runNumberu64 = 0
}
runEndTimeMs, ok := varStack["run_end_time_ms"]
if !ok {
log.WithField("partition", envId).
WithField("call", "Start").
WithField("call", "Stop").
Warn("cannot acquire run_end_time_ms")
}

Expand All @@ -1473,6 +1474,74 @@ func (p *Plugin) CallStack(data interface{}) (stack map[string]interface{}) {
}
return
}
stack["EnsureStop"] = func() (out string) {
// ODC Stop
callFailedStr := "EPN EnsureStop call failed"
var (
runNumberu64 uint64
err error
)

timeout := callable.AcquireTimeout(ODC_STOP_TIMEOUT, varStack, "EnsureStop", envId)

ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel()

state, err := handleGetState(ctx, p.odcClient, envId)
if err != nil {
log.WithError(err).
WithField("level", infologger.IL_Support).
WithField("partition", envId).
WithField("call", "EnsureStop").
Error("ODC error")
call.VarStack["__call_error_reason"] = err.Error()
call.VarStack["__call_error"] = callFailedStr
return
}
if state != "RUNNING" {
log.WithField("level", infologger.IL_Devel).
WithField("partition", envId).
WithField("call", "EnsureStop").
Infof("ODC EnsureStop attempted, while ODC partition is not in 'RUNNING' but '%s', skipping", state)
return
}

rn, ok := varStack["run_number"]
if !ok {
log.WithField("partition", envId).
WithField("call", "EnsureStop").
Warn("cannot acquire run number for ODC EnsureStop")
}
runNumberu64, err = strconv.ParseUint(rn, 10, 32)
if err != nil {
log.WithField("partition", envId).
WithField("call", "EnsureStop").
WithError(err).
Error("cannot acquire run number for ODC EOR")
runNumberu64 = 0
}
runEndTimeMs, ok := varStack["run_end_time_ms"]
if !ok {
log.WithField("partition", envId).
WithField("call", "EnsureStop").
Warn("cannot acquire run_end_time_ms")
}

arguments := make(map[string]string)
arguments["run_end_time_ms"] = runEndTimeMs

err = handleStop(ctx, p.odcClient, arguments, paddingTimeout, envId, runNumberu64, call)
if err != nil {
log.WithError(err).
WithField("level", infologger.IL_Support).
WithField("partition", envId).
WithField("call", "EnsureStop").
Error("ODC error")
call.VarStack["__call_error_reason"] = err.Error()
call.VarStack["__call_error"] = callFailedStr
}
return
}
stack["EnsureCleanup"] = func() (out string) {
// ODC Shutdown for current env + all orphans

Expand Down
Loading