Skip to content

Remove dead continuedAsNew code after do-while loop #1304

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

Open
cgillum wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove dead continuedAsNew code after do-while loop #1304

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
13 changes: 6 additions & 7 deletions src/DurableTask.Core/TaskOrchestrationDispatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,15 +318,13 @@ protected async Task<bool> OnProcessWorkItemAsync(TaskOrchestrationWorkItem work
var timerMessages = new List<TaskMessage>();
var orchestratorMessages = new List<TaskMessage>();
var isCompleted = false;
var continuedAsNew = false;
var isInterrupted = false;
var isRewinding = false;

// correlation
CorrelationTraceClient.Propagate(() => CorrelationTraceContext.Current = workItem.TraceContext);

ExecutionStartedEvent? continueAsNewExecutionStarted = null;
TaskMessage? continuedAsNewMessage = null;
IList<HistoryEvent>? carryOverEvents = null;
string? carryOverStatus = null;

Expand Down Expand Up @@ -389,10 +387,11 @@ protected async Task<bool> OnProcessWorkItemAsync(TaskOrchestrationWorkItem work
}
else
{
bool continuedAsNew;
do
{
continuedAsNew = false;
continuedAsNewMessage = null;
TaskMessage? continuedAsNewMessage = null;

IReadOnlyList<OrchestratorAction> decisions = new List<OrchestratorAction>();
bool versioningFailed = false;
Expand Down Expand Up @@ -707,18 +706,18 @@ protected async Task<bool> OnProcessWorkItemAsync(TaskOrchestrationWorkItem work
await this.orchestrationService.CompleteTaskOrchestrationWorkItemAsync(
workItem,
runtimeState,
continuedAsNew ? null : messagesToSend,
messagesToSend,
orchestratorMessages,
continuedAsNew ? null : timerMessages,
continuedAsNewMessage,
timerMessages,
continuedAsNewMessage: null,
instanceState);

if (workItem.RestoreOriginalRuntimeStateDuringCompletion)
{
workItem.OrchestrationRuntimeState = runtimeState;
}

return isCompleted || continuedAsNew || isInterrupted || isRewinding;
return isCompleted || isInterrupted || isRewinding;
}

static OrchestrationExecutionContext GetOrchestrationExecutionContext(OrchestrationRuntimeState runtimeState)
Expand Down
Loading