Process a case when workflow is started but update failed

temporalio · Dec 16, 2024 · a3c2ace · a3c2ace
1 parent 57c2e0a
commit a3c2ace
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 15 deletions.
diff --git a/src/Client/WorkflowClient.php b/src/Client/WorkflowClient.php
@@ -235,18 +235,19 @@ public function updateWithStart(
         );
         $workflowStub->hasExecution() and throw new InvalidArgumentException(self::ERROR_WORKFLOW_START_DUPLICATION);
 
-        $handle = $this->getStarter()->updateWithStart(
+        [$execution, $handle] = $this->getStarter()->updateWithStart(
             $workflowType,
             $workflowStub->getOptions() ?? WorkflowOptions::new(),
             $update,
             $updateArgs,
             $startArgs,
         );
 
-        // todo: set execution if UpdateWorkflow was failed but WF was started
-        $workflowStub->setExecution($handle->getExecution());
+        $workflowStub->setExecution($execution);
 
-        return $handle;
+        return $handle instanceof \Throwable
+            ? throw $handle
+            : $handle;
     }
 
     public function newWorkflowStub(

diff --git a/src/Client/WorkflowStubInterface.php b/src/Client/WorkflowStubInterface.php
@@ -32,6 +32,9 @@
  */
 interface WorkflowStubInterface extends WorkflowRunInterface
 {
+    /**
+     * @return non-empty-string|null
+     */
     public function getWorkflowType(): ?string;
 
     /**

diff --git a/src/Internal/Client/WorkflowStarter.php b/src/Internal/Client/WorkflowStarter.php
@@ -122,18 +122,23 @@ function (SignalWithStartInput $input): WorkflowExecution {
         );
     }
 
+    /**
+     * @param non-empty-string $workflowType
+     *
+     * @return array{WorkflowExecution, UpdateHandle|\Throwable}
+     */
     public function updateWithStart(
         string $workflowType,
         WorkflowOptions $options,
         UpdateOptions $update,
         array $updateArgs = [],
         array $startArgs = [],
-    ): UpdateHandle {
+    ): array {
         $arguments = EncodedValues::fromValues($startArgs, $this->converter);
         $updateArguments = EncodedValues::fromValues($updateArgs, $this->converter);
 
         return $this->interceptors->with(
-            function (UpdateWithStartInput $input): UpdateHandle {
+            function (UpdateWithStartInput $input): array {
                 $startRequest = $this->configureExecutionRequest(
                     new StartWorkflowExecutionRequest(),
                     $input->workflowStartInput,
@@ -216,15 +221,19 @@ function (UpdateWithStartInput $input): UpdateHandle {
                 $updateResponse = $responses[1]->getUpdateWorkflow();
                 \assert($updateResponse !== null);
 
-                $updateResult = (new \Temporal\Internal\Client\ResponseToResultMapper($this->converter))
-                    ->mapUpdateWorkflowResponse(
-                        $updateResponse,
-                        updateName: $input->updateInput->updateName,
-                        workflowType: $input->workflowStartInput->workflowType,
-                        workflowExecution: $execution,
-                    );
+                try {
+                    $updateResult = (new \Temporal\Internal\Client\ResponseToResultMapper($this->converter))
+                        ->mapUpdateWorkflowResponse(
+                            $updateResponse,
+                            updateName: $input->updateInput->updateName,
+                            workflowType: $input->workflowStartInput->workflowType,
+                            workflowExecution: $execution,
+                        );
+                } catch (\RuntimeException $e) {
+                    return [$execution, $e];
+                }
 
-                return new UpdateHandle(
+                return [$execution, new UpdateHandle(
                     client: $this->serviceClient,
                     clientOptions: $this->clientOptions,
                     converter: $this->converter,
@@ -234,7 +243,7 @@ function (UpdateWithStartInput $input): UpdateHandle {
                     resultType: $input->updateInput->resultType,
                     updateId: $updateResult->getReference()->updateId,
                     result: $updateResult->getResult(),
-                );
+                )];
             },
             /** @see WorkflowClientCallsInterceptor::updateWithStart() */
             'updateWithStart',
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,9 @@ @@
      */
     interface WorkflowStubInterface extends WorkflowRunInterface
     {
+        /**
+         * @return non-empty-string|null
+         */
         public function getWorkflowType(): ?string;
         /**
@@ Expand Down @@