Remove Suspend versioning option

Signed-off-by: halspang <[email protected]>

Author: halspang

src/Client/Core/DurableTaskClient.cs

@@ -399,19 +399,6 @@ public virtual Task<PurgeResult> PurgeAllInstancesAsync(
         throw new NotSupportedException($"{this.GetType()} does not support purging of orchestration instances.");
     }
 
-    /// <summary>
-    /// Abandons a task orchestration work item to be re-enqueued at a later time.
-    /// </summary>
-    /// <param name="completionToken">The completion token that was given when the WorkItem was fetched.</param>
-    /// <param name="cancellation">
-    /// A <see cref="CancellationToken"/> that can be used to cancel the purge operation.
-    /// </param>
-    /// <returns>A task that completes when the WorkItem has been abandoned.</returns>
-    public virtual Task AbandonOrchestrationTask(string completionToken, CancellationToken cancellation = default)
-    {
-        throw new NotSupportedException($"{this.GetType()} does not support abandoning task orchestration work items.");
-    }
-
     // TODO: Create task hub
 
     // TODO: Delete task hub

src/Client/Grpc/GrpcDurableTaskClient.cs

@@ -396,17 +396,6 @@ public override Task<PurgeResult> PurgeAllInstancesAsync(
         return this.PurgeInstancesCoreAsync(request, cancellation);
     }
 
-    /// <inheritdoc/>
-    public override async Task AbandonOrchestrationTask(string completionToken, CancellationToken cancellation = default)
-    {
-        P.AbandonOrchestrationTaskRequest request = new()
-        {
-            CompletionToken = completionToken,
-        };
-
-        await this.sidecarClient.AbandonTaskOrchestratorWorkItemAsync(request, cancellationToken: cancellation);
-    }
-
     static AsyncDisposable GetCallInvoker(GrpcDurableTaskClientOptions options, out CallInvoker callInvoker)
     {
         if (options.Channel is GrpcChannel c)

src/Worker/Core/DurableTaskWorkerOptions.cs

@@ -10,7 +10,6 @@ namespace Microsoft.DurableTask.Worker;
 /// </summary>
 public class DurableTaskWorkerOptions
 {
-    readonly VersioningOptions versioning = new();
     DataConverter dataConverter = JsonDataConverter.Default;
 
     /// <summary>
@@ -44,15 +43,10 @@ public enum VersionFailureStrategy
         /// </summary>
         Reject = 0,
 
-        /// <summary>
-        /// Suspend the orchestration if the version does not adhere to the matching strategy.
-        /// </summary>
-        Suspend = 1,
-
         /// <summary>
         /// Fail the orchestration if the version does not adhere to the matching strategy.
         /// </summary>
-        Fail = 2,
+        Fail = 1,
     }
 
     /// <summary>
@@ -144,24 +138,7 @@ public DataConverter DataConverter
     /// version of the worker, the versions that can be worked on, and what to do in case a version does not comply
     /// with the given options.
     /// </remarks>
-    public VersioningOptions Versioning
-    {
-        get => this.versioning;
-        set
-        {
-            if (value is not null)
-            {
-                this.IsVersioningSet = true;
-                this.Versioning.Version = value.Version;
-                this.Versioning.MatchStrategy = value.MatchStrategy;
-                this.Versioning.FailureStrategy = value.FailureStrategy;
-            }
-            else
-            {
-                this.IsVersioningSet = false;
-            }
-        }
-    }
+    public VersioningOptions? Versioning { get; set; }
 
     /// <summary>
     /// Gets a value indicating whether versioning is explicitly set or not.

src/Worker/Grpc/GrpcDurableTaskWorker.Processor.cs

@@ -299,6 +299,8 @@ async Task OnRunOrchestratorAsync(
                 ? new(this.internalOptions.InsertEntityUnlocksOnCompletion)
                 : null;
 
+            DurableTaskWorkerOptions.VersioningOptions? versioning = this.worker.workerOptions.Versioning;
+            bool versionFailure = false;
             try
             {
                 OrchestrationRuntimeState runtimeState = await this.BuildRuntimeStateAsync(
@@ -308,11 +310,11 @@ async Task OnRunOrchestratorAsync(
 
 
                 // If versioning has been explicitly set, we attempt to follow that pattern. If it is not set, we don't compare versions here.
-                if (this.worker.workerOptions.IsVersioningSet)
+                if (versioning != null)
                 {
-                    int versionComparison = TaskOrchestrationVersioningUtils.CompareVersions(runtimeState.Version, this.worker.workerOptions.Versioning.Version);
+                    int versionComparison = TaskOrchestrationVersioningUtils.CompareVersions(runtimeState.Version, versioning.Version);
 
-                    switch (this.worker.workerOptions.Versioning.MatchStrategy)
+                    switch (versioning.MatchStrategy)
                     {
                         case DurableTaskWorkerOptions.VersionMatchStrategy.None:
                             // No versioning, breakout.
@@ -324,7 +326,7 @@ async Task OnRunOrchestratorAsync(
                                 failureDetails = new P.TaskFailureDetails
                                 {
                                     ErrorType = "VersionMismatch",
-                                    ErrorMessage = $"The orchestration version '{runtimeState.Version}' does not match the worker version '{this.worker.grpcOptions.Versioning.Version}'.",
+                                    ErrorMessage = $"The orchestration version '{runtimeState.Version}' does not match the worker version '{versioning.Version}'.",
                                     IsNonRetriable = true,
                                 };
                             }
@@ -337,7 +339,7 @@ async Task OnRunOrchestratorAsync(
                                 failureDetails = new P.TaskFailureDetails
                                 {
                                     ErrorType = "VersionMismatch",
-                                    ErrorMessage = $"The orchestration version '{runtimeState.Version}' is greater than the worker version '{this.worker.grpcOptions.Versioning.Version}'.",
+                                    ErrorMessage = $"The orchestration version '{runtimeState.Version}' is greater than the worker version '{versioning.Version}'.",
                                     IsNonRetriable = true,
                                 };
                             }
@@ -348,11 +350,13 @@ async Task OnRunOrchestratorAsync(
                             failureDetails = new P.TaskFailureDetails
                             {
                                 ErrorType = "VersionError",
-                                ErrorMessage = $"The version match strategy '{this.worker.workerOptions.Versioning.MatchStrategy}' is unknown.",
+                                ErrorMessage = $"The version match strategy '{versioning.MatchStrategy}' is unknown.",
                                 IsNonRetriable = true,
                             };
                             break;
                     }
+
+                    versionFailure = failureDetails != null;
                 }
 
                 // Only continue with the work if the versioning check passed.
@@ -415,9 +419,9 @@ async Task OnRunOrchestratorAsync(
                     completionToken,
                     entityConversionState);
             }
-            else if (failureDetails != null && failureDetails.ErrorType == "VersionMismatch")
+            else if (versioning != null && failureDetails != null && versionFailure)
             {
-                if (this.worker.workerOptions.Versioning.FailureStrategy == DurableTaskWorkerOptions.VersionFailureStrategy.Fail)
+                if (versioning.FailureStrategy == DurableTaskWorkerOptions.VersionFailureStrategy.Fail)
                 {
                     response = new P.OrchestratorResponse
                     {
@@ -436,17 +440,6 @@ async Task OnRunOrchestratorAsync(
                         },
                     };
                 }
-                else if (this.worker.workerOptions.Versioning.FailureStrategy == DurableTaskWorkerOptions.VersionFailureStrategy.Suspend)
-                {
-                    await this.client.SuspendInstanceAsync(
-                        new P.SuspendRequest
-                        {
-                            InstanceId = request.InstanceId,
-                            Reason = "Version mismatch",
-                        },
-                        cancellationToken: cancellationToken);
-                    return;
-                }
                 else
                 {
                     await this.client.AbandonTaskOrchestratorWorkItemAsync(