feat: #9 cancel next tasks in task group if the current task fails

Author: bohdan-shulha

api-nodes/Http/Controllers/NextTaskController.php

@@ -20,7 +20,7 @@ public function __invoke(Node $node)
 
         $taskGroup = $node->taskGroups()->inProgress()->first();
 
-        $task = $taskGroup ? $this->getNextTaskFromGroup($taskGroup) : $this->pickNextTask($node);
+        $task = $taskGroup ? $this->getNextTaskFromGroup($node, $taskGroup) : $this->pickNextTask($node);
         if ($task) {
             if ($task instanceof Response) {
                 return $task;
@@ -38,7 +38,7 @@ public function __invoke(Node $node)
         ], 204);
     }
 
-    protected function getNextTaskFromGroup(NodeTaskGroup $taskGroup)
+    protected function getNextTaskFromGroup(Node $node, NodeTaskGroup $taskGroup)
     {
         if ($taskGroup->tasks()->running()->first()) {
             return new Response([
@@ -49,7 +49,7 @@ protected function getNextTaskFromGroup(NodeTaskGroup $taskGroup)
         $task = $taskGroup->tasks()->pending()->first();
 
         if ($task) {
-            $task->start();
+            $task->start($node);
 
             return $task;
         }
@@ -63,9 +63,13 @@ protected function pickNextTask(Node $node)
             return $query->where('node_id', $node->id)->orWhere('node_id', null);
         })->pending()->first();
 
+        if (!$taskGroup) {
+            return null;
+        }
+
         $task = $taskGroup->tasks()->first();
 
-        $taskGroup->startTask($node, $task);
+        $task->start($node);
 
         return $task;
     }

api-nodes/Http/Controllers/TaskController.php

@@ -22,7 +22,7 @@ public function complete(NodeTask $task, Request $request)
 
         $result = TaskResultCast::RESULT_BY_TYPE[$task->type]::validateAndCreate($request->all());
 
-        $task->taskGroup->completeTask($task, $result);
+        $task->complete($result);
 
         return new Response('', 204);
     }
@@ -39,7 +39,7 @@ public function fail(NodeTask $task, Request $request)
 
         $result = ErrorResult::validateAndCreate($request->all());
 
-        $task->taskGroup->failTask($task, $result);
+        $task->fail($result);
 
         return new Response('', 204);
     }

app/Casts/TaskResultCast.php

@@ -32,7 +32,7 @@ public function get(Model $model, string $key, mixed $value, array $attributes):
             return ErrorResult::from($value);
         }
 
-        if ($model->is_ended) {
+        if ($value != null) {
             return self::RESULT_BY_TYPE[$model->type]::from($value);
         }
 

app/Http/Controllers/NodeController.php

@@ -44,7 +44,7 @@ public function show(Node $node)
     {
         $initTaskGroup = $node->tasks()->inProgress()->ofType(InitSwarmTaskPayload::class)->first()?->taskGroup->with('tasks')->first();
         if (!$initTaskGroup) {
-            $initTaskGroup = $node->tasks()->failed()->ofType(InitSwarmTaskPayload::class)->first()?->taskGroup->with('tasks')->first();
+            $initTaskGroup = $node->tasks()->unsuccessful()->ofType(InitSwarmTaskPayload::class)->first()?->taskGroup->with('tasks')->first();
         }
 
         return Inertia::render('Nodes/Show', ['node' => $node, 'initTaskGroup' => $initTaskGroup]);

app/Models/NodeTask.php

@@ -97,8 +97,12 @@ public function getIsFailedAttribute()
         return $this->status === TaskStatus::Failed;
     }
 
-    public function start(): void
+    public function start(Node $node): void
     {
+        if ($this->taskGroup->is_pending) {
+            $this->taskGroup->start($node);
+        }
+
         $this->status = TaskStatus::Running;
         $this->started_at = now();
         $this->save();
@@ -116,7 +120,8 @@ public function complete(AbstractTaskResult $result): void
             $this->taskGroup->save();
         }
 
-        event(new self::TYPE_TO_EVENT_COMPLETED[$this->type]($this));
+        $eventMap = self::TYPE_TO_EVENT_COMPLETED;
+        event(new $eventMap[$this->type]($this));
     }
 
     public function fail(AbstractTaskResult $result): void
@@ -129,6 +134,9 @@ public function fail(AbstractTaskResult $result): void
         $this->taskGroup->status = TaskStatus::Failed;
         $this->taskGroup->save();
 
-        event(new self::TYPE_TO_EVENT_FAILED[$this->type]($this));
+        $this->taskGroup->tasks()->pending()->update(['status' => TaskStatus::Canceled]);
+
+        $eventMap = self::TYPE_TO_EVENT_FAILED;
+        event(new $eventMap[$this->type]($this));
     }
 }

app/Models/NodeTask/TaskStatus.php

@@ -8,12 +8,12 @@ enum TaskStatus: string
     case Running = 'running';
     case Completed = 'completed';
     case Failed = 'failed';
-    case Cancelled = 'cancelled';
+    case Canceled = 'canceled';
 
     public function isEnded(): bool
     {
         return $this->value === TaskStatus::Completed->value
             || $this->value === TaskStatus::Failed->value
-            || $this->value === TaskStatus::Cancelled->value;
+            || $this->value === TaskStatus::Canceled->value;
     }
 }

app/Models/NodeTaskGroup.php

@@ -43,25 +43,11 @@ public function node(): BelongsTo
         return $this->belongsTo(Node::class);
     }
 
-    public function startTask(Node $node, NodeTask $task): void
+    public function start(Node $node): void
     {
         $this->status = TaskStatus::Running;
         $this->node_id = $node->id;
         $this->started_at = now();
         $this->save();
-
-        $task->start();
-    }
-
-    public function completeTask(NodeTask $task, AbstractTaskResult $result): void
-    {
-
-
-        $task->complete($result);
-    }
-
-    public function failTask(NodeTask $task, AbstractTaskResult $result): void
-    {
-        $task->fail($result);
     }
 }

app/Traits/HasTaskStatus.php

@@ -32,6 +32,16 @@ public function scopeFailed(Builder $builder): Builder
         return $builder->where($builder->qualifyColumn('status'), TaskStatus::Failed);
     }
 
+    public function scopeUnsuccessful(Builder $builder): Builder
+    {
+        return $builder->whereIn($builder->qualifyColumn('status'), [TaskStatus::Failed, TaskStatus::Canceled]);
+    }
+
+    public function getIsPendingAttribute() : bool
+    {
+        return $this->status === TaskStatus::Pending;
+    }
+
     public function getIsRunningAttribute() : bool
     {
         return $this->status === TaskStatus::Running;

resources/js/Components/NodeTasks/TaskResult.vue

@@ -54,6 +54,10 @@ const classes = computed(() => {
     <path fill-rule="evenodd" d="M2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Zm7.707-3.707a1 1 0 0 0-1.414 1.414L10.586 12l-2.293 2.293a1 1 0 1 0 1.414 1.414L12 13.414l2.293 2.293a1 1 0 0 0 1.414-1.414L13.414 12l2.293-2.293a1 1 0 0 0-1.414-1.414L12 10.586 9.707 8.293Z" clip-rule="evenodd"/>
   </svg>
 
+  <svg v-if="task.status === 'canceled'"
+      class="w-4 h-4 me-2 text-gray-800 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+    <path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="m6 6 12 12m3-6a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"/>
+  </svg>
 
 
 

resources/js/Pages/Nodes/Show.vue

@@ -32,9 +32,7 @@ defineProps([
 
       <SectionBorder v-if="$props.node.online" />
 
-        <NewSwarmCluster v-if="$props.node.online && $props.node.swarm_id === null" :node="$props.node"/>
-
-      <SectionBorder v-if="$props.initTaskGroup" />
+      <NewSwarmCluster v-if="$props.node.online && $props.node.swarm_id === null" :node="$props.node"/>
       <InitSwarmProgress v-if="$props.initTaskGroup" :taskGroup="$props.initTaskGroup" />
     </ShowLayout>
 </template>