Adding a completed time for terminating a pending orchestration

Co-authored-by: Sophia Tevosyan <stevosyan@microsoft.com>

Author: sophiatev

src/DurableTask.AzureStorage/AzureStorageOrchestrationService.cs

@@ -1065,7 +1065,11 @@ async Task<string> IsExecutableInstance(OrchestrationRuntimeState runtimeState,
                     TaskMessage executionTerminatedEventMessage = newMessages.LastOrDefault(msg => msg.Event is ExecutionTerminatedEvent);
                     if (executionTerminatedEventMessage is not null)
                     {
-                        await this.trackingStore.UpdateStatusForTerminationAsync(instanceId, ((ExecutionTerminatedEvent)executionTerminatedEventMessage.Event).Input);
+                        var executionTerminatedEvent = (ExecutionTerminatedEvent)executionTerminatedEventMessage.Event;
+                        await this.trackingStore.UpdateStatusForTerminationAsync(
+                            instanceId,
+                            executionTerminatedEvent.Input,
+                            executionTerminatedEvent.Timestamp);
                         return $"Instance is {OrchestrationStatus.Terminated}";
                     }
 

src/DurableTask.AzureStorage/Tracking/AzureTableTrackingStore.cs

@@ -796,13 +796,18 @@ public override async Task UpdateStatusForRewindAsync(string instanceId, Cancell
         }
 
         /// <inheritdoc />
-        public override async Task UpdateStatusForTerminationAsync(string instanceId, string output, CancellationToken cancellationToken = default)
+        public override async Task UpdateStatusForTerminationAsync(
+            string instanceId,
+            string output,
+            DateTime lastUpdatedTime,
+            CancellationToken cancellationToken = default)
         {
             string sanitizedInstanceId = KeySanitation.EscapePartitionKey(instanceId);
             TableEntity entity = new TableEntity(sanitizedInstanceId, "")
             {
                 ["RuntimeStatus"] = OrchestrationStatus.Terminated.ToString("G"),
-                ["LastUpdatedTime"] = DateTime.UtcNow,
+                ["LastUpdatedTime"] = lastUpdatedTime,
+                ["CompletedTime"] = DateTime.UtcNow,
                 [OutputProperty] = output
             };
 

src/DurableTask.AzureStorage/Tracking/ITrackingStore.cs

@@ -157,8 +157,9 @@ interface ITrackingStore
         /// </summary>
         /// <param name="instanceId">The instance being terminated</param>
         /// <param name="output">The output of the orchestration</param>
+        /// <param name="lastUpdatedTime">The last updated time of the orchestration (the time the termination request was created)</param>
         /// <param name="cancellationToken">The token to monitor for cancellation requests. The default value is <see cref="CancellationToken.None"/>.</param>
-        Task UpdateStatusForTerminationAsync(string instanceId, string output, CancellationToken cancellationToken = default);
+        Task UpdateStatusForTerminationAsync(string instanceId, string output, DateTime lastUpdatedTime, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Purge The History and state  which is older than thresholdDateTimeUtc based on the timestamp type specified by timeRangeFilterType

src/DurableTask.AzureStorage/Tracking/InstanceStoreBackedTrackingStore.cs

@@ -177,12 +177,17 @@ await instanceStore.WriteEntitiesAsync(new InstanceEntityBase[]
             return null;
         }
 
-        public override async Task UpdateStatusForTerminationAsync(string instanceId, string output, CancellationToken cancellationToken = default)
+        public override async Task UpdateStatusForTerminationAsync(
+            string instanceId,
+            string output,
+            DateTime lastUpdatedTime,
+            CancellationToken cancellationToken = default)
         {
             // Get the most recent execution and update its status to terminated
             IEnumerable<OrchestrationStateInstanceEntity> instanceEntity = await this.instanceStore.GetOrchestrationStateAsync(instanceId, allInstances: false);
             instanceEntity.Single().State.OrchestrationStatus = OrchestrationStatus.Terminated;
-            instanceEntity.Single().State.LastUpdatedTime = DateTime.UtcNow;
+            instanceEntity.Single().State.LastUpdatedTime = lastUpdatedTime;
+            instanceEntity.Single().State.CompletedTime = DateTime.UtcNow;
             instanceEntity.Single().State.Output = output;
             await this.instanceStore.WriteEntitiesAsync(instanceEntity);
         }

src/DurableTask.AzureStorage/Tracking/TrackingStoreBase.cs

@@ -101,7 +101,7 @@ public virtual Task UpdateStatusForRewindAsync(string instanceId, CancellationTo
         }
 
         /// <inheritdoc />
-        public abstract Task UpdateStatusForTerminationAsync(string instanceId, string output, CancellationToken cancellationToken = default);
+        public abstract Task UpdateStatusForTerminationAsync(string instanceId, string output, DateTime lastUpdatedTime, CancellationToken cancellationToken = default);
 
         /// <inheritdoc />
         public abstract Task StartAsync(CancellationToken cancellationToken = default);