Add fields canRerun and canCancel to task meta

skbkontur · Nov 28, 2023 · 4c7504b · 4c7504b
1 parent eeed1ce
commit 4c7504b
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 3 deletions.
diff --git a/Cassandra.DistributedTaskQueue.Monitoring/Api/IRtqMonitoringApi.cs b/Cassandra.DistributedTaskQueue.Monitoring/Api/IRtqMonitoringApi.cs
@@ -11,7 +11,7 @@ public interface IRtqMonitoringApi
     {
         [NotNull, ItemNotNull]
         string[] GetAllTaskStates();
-        
+
         [NotNull, ItemNotNull]
         string[] GetAllTasksNames();
 

diff --git a/Cassandra.DistributedTaskQueue.Monitoring/Api/RtqMonitoringTaskExtensions.cs b/Cassandra.DistributedTaskQueue.Monitoring/Api/RtqMonitoringTaskExtensions.cs
@@ -21,6 +21,8 @@ public static RtqMonitoringTaskMeta ToMonitoringTaskMeta(this TaskMetaInformatio
                     State = meta.State,
                     Attempts = meta.Attempts,
                     ParentTaskId = meta.ParentTaskId,
+                    CanCancel = meta.CanCancel(),
+                    CanRerun = meta.CanRerun()
                 };
         }
     }

diff --git a/Cassandra.DistributedTaskQueue.Monitoring/Api/RtqMonitoringTaskMeta.cs b/Cassandra.DistributedTaskQueue.Monitoring/Api/RtqMonitoringTaskMeta.cs
@@ -59,5 +59,11 @@ public class RtqMonitoringTaskMeta
 
         [JsonProperty("parentTaskId")]
         public string ParentTaskId { get; set; }
+
+        [JsonProperty("canCancel")]
+        public bool CanCancel { get; set; }
+
+        [JsonProperty("canRerun")]
+        public bool CanRerun { get; set; }
     }
 }
diff --git a/...DistributedTaskQueue.Tests/RemoteTaskQueue/RepositoriesTests/HandleTaskMetaStorageTest.cs b/...DistributedTaskQueue.Tests/RemoteTaskQueue/RepositoriesTests/HandleTaskMetaStorageTest.cs
@@ -166,7 +166,7 @@ public string[] GetAllTaskStates()
             {
                 throw new NotImplementedException();
             }
-            
+
             public string[] GetAllTaskNames()
             {
                 throw new NotImplementedException();

diff --git a/Cassandra.DistributedTaskQueue/Cassandra/Entities/TaskMetaInformation.cs b/Cassandra.DistributedTaskQueue/Cassandra/Entities/TaskMetaInformation.cs
@@ -87,6 +87,16 @@ internal List<TimeGuid> AddExceptionInfoId([NotNull] TimeGuid newExceptionInfoId
             return TimeSpan.FromTicks(Math.Max(ExpirationTimestampTicks.Value - Timestamp.Now.Ticks, TimeSpan.TicksPerSecond));
         }
 
+        public bool CanCancel()
+        {
+            return cancelableStates.Contains(State);
+        }
+
+        public bool CanRerun()
+        {
+            return rerunnableStates.Contains(State);
+        }
+
         public void SetOrUpdateTtl(TimeSpan ttl)
         {
             var now = Timestamp.Now;
@@ -152,5 +162,14 @@ private static string TicksToString(long ticks)
         }
 
         public const int TaskExceptionIfoIdsLimit = 201;
+        private readonly TaskState[] cancelableStates = new[] {TaskState.New, TaskState.WaitingForRerun, TaskState.WaitingForRerunAfterError};
+
+        private readonly TaskState[] rerunnableStates = new[]
+            {
+                TaskState.Fatal,
+                TaskState.Finished,
+                TaskState.WaitingForRerun,
+                TaskState.WaitingForRerunAfterError
+            };
     }
 }
diff --git a/Cassandra.DistributedTaskQueue/Configuration/IRtqTaskDataRegistry.cs b/Cassandra.DistributedTaskQueue/Configuration/IRtqTaskDataRegistry.cs
@@ -7,7 +7,7 @@ namespace SkbKontur.Cassandra.DistributedTaskQueue.Configuration
     public interface IRtqTaskDataRegistry
     {
         string[] GetAllTaskStates();
-        
+
         string[] GetAllTaskNames();
 
         string GetTaskName(Type type);