Skip to content
Merged
Changes from all commits
Commits
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
31 changes: 11 additions & 20 deletions workflow/internal/execution/eventstream.go
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,7 @@ func (s *streamingRunEventStream) runLoop() {
}

// Update status based on what's waiting
if s.stepRunner.HasUnservicedRequests() {
s.setStatus(RunStatusPendingRequests)
} else {
s.setStatus(RunStatusIdle)
}
s.setStatus(idleOrPendingRequestsStatus(s.stepRunner))

// Signal completion to consumer so they can check status and decide whether to continue
// Increment epoch so next consumer iteration gets a new completion signal
Expand Down Expand Up @@ -492,11 +488,7 @@ func (l *lockstepRunEventStream) TakeEventStream(ctx context.Context, blockOnPen

defer func() {
// Update status
if l.stepRunner.HasUnservicedRequests() {
l.setStatus(RunStatusPendingRequests)
} else {
l.setStatus(RunStatusIdle)
}
l.setStatus(idleOrPendingRequestsStatus(l.stepRunner))
}()

l.setStatus(RunStatusRunning)
Expand Down Expand Up @@ -547,11 +539,7 @@ func (l *lockstepRunEventStream) TakeEventStream(ctx context.Context, blockOnPen
}

// Update status
if l.stepRunner.HasUnservicedRequests() {
l.setStatus(RunStatusPendingRequests)
} else {
l.setStatus(RunStatusIdle)
}
l.setStatus(idleOrPendingRequestsStatus(l.stepRunner))

// Check if we should break
status := l.getStatus()
Expand Down Expand Up @@ -579,11 +567,7 @@ func (l *lockstepRunEventStream) TakeEventStream(ctx context.Context, blockOnPen
// No work yet: the run may have progressed to a terminal
// state (e.g. requests serviced elsewhere). Re-evaluate and
// stop if there is nothing left to wait for.
if l.stepRunner.HasUnservicedRequests() {
l.setStatus(RunStatusPendingRequests)
} else {
l.setStatus(RunStatusIdle)
}
l.setStatus(idleOrPendingRequestsStatus(l.stepRunner))
status = l.getStatus()
if l.shouldBreak(status, blockOnPendingRequest, linkedCtx) {
return
Expand Down Expand Up @@ -645,6 +629,13 @@ func (l *lockstepRunEventStream) shouldBreak(status RunStatus, blockOnPendingReq
return false
}

func idleOrPendingRequestsStatus(stepRunner SuperStepRunner) RunStatus {
if stepRunner.HasUnservicedRequests() {
return RunStatusPendingRequests
}
return RunStatusIdle
}

// SignalInput signals that new input has been provided and the run loop should continue processing.
func (l *lockstepRunEventStream) SignalInput() {
l.inputWaiter.signalInput()
Expand Down
Loading