change logic to ignore pending updates and signals if d.done

temporalio · Jan 31, 2025 · 6952be3 · 6952be3
1 parent fc965a0
commit 6952be3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/service/worker/workerdeployment/version_workflow.go b/service/worker/workerdeployment/version_workflow.go
@@ -174,7 +174,7 @@ func (d *VersionWorkflowRunner) run(ctx workflow.Context) error {
 	workflow.Go(ctx, d.listenToSignals)
 
 	// Wait on any pending signals and updates.
-	err := workflow.Await(ctx, func() bool { return (d.signalsCompleted || d.done) && d.pendingUpdates == 0 })
+	err := workflow.Await(ctx, func() bool { return (d.signalsCompleted && d.pendingUpdates == 0) || d.done })
 	if err != nil {
 		return err
 	}

diff --git a/service/worker/workerdeployment/workflow.go b/service/worker/workerdeployment/workflow.go
@@ -140,7 +140,7 @@ func (d *WorkflowRunner) run(ctx workflow.Context) error {
 
 	// Wait until we can continue as new or are cancelled.
 	err = workflow.Await(ctx, func() bool {
-		return (workflow.GetInfo(ctx).GetContinueAsNewSuggested() || d.done) && pendingUpdates == 0
+		return (workflow.GetInfo(ctx).GetContinueAsNewSuggested() && pendingUpdates == 0) || d.done
 	})
 	if err != nil {
 		return err