Fix: Service status stuck at starting after stop #7479
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When stopping a service that's currently deploying, mark any IN_PROGRESS or QUEUED activities as CANCELLED. This prevents the status from remaining stuck at "starting" after containers are stopped. Follows the existing pattern used in forceDeploy().
There was a problem hiding this comment.
Pull request overview
This PR fixes a bug where a service's status remains stuck at "starting" after stopping the service. The fix cancels any in-progress or queued deployment activities when StopService is invoked, following a similar pattern to the existing forceDeploy() method.
Key Changes:
- Added logic to cancel in-progress/queued activities before stopping service containers
- Imported
ProcessStatusenum andActivitymodel to support activity cancellation - Activities with IN_PROGRESS or QUEUED status are updated to CANCELLED status
| ->orWhere('properties->status', ProcessStatus::QUEUED->value); | ||
| }) | ||
| ->each(function ($activity) { | ||
| $activity->properties = $activity->properties->put('status', ProcessStatus::CANCELLED->value); |
There was a problem hiding this comment.
The property modification approach is inconsistent with the existing pattern in forceDeploy(). In app/Livewire/Project/Service/Heading.php:115, the code directly assigns to the property:
$activity->properties->status = ProcessStatus::ERROR->value;This code uses:
$activity->properties = $activity->properties->put('status', ProcessStatus::CANCELLED->value);Consider using direct assignment for consistency:
$activity->properties->status = ProcessStatus::CANCELLED->value;
Suggested change
| $activity->properties = $activity->properties->put('status', ProcessStatus::CANCELLED->value); | |
| $activity->properties->status = ProcessStatus::CANCELLED->value; |
Comment on lines
+23
to
+31
| Activity::where('properties->type_uuid', $service->uuid) | ||
| ->where(function ($q) { | ||
| $q->where('properties->status', ProcessStatus::IN_PROGRESS->value) | ||
| ->orWhere('properties->status', ProcessStatus::QUEUED->value); | ||
| }) | ||
| ->each(function ($activity) { | ||
| $activity->properties = $activity->properties->put('status', ProcessStatus::CANCELLED->value); | ||
| $activity->save(); | ||
| }); |
There was a problem hiding this comment.
[nitpick] For consistency with the existing forceDeploy() pattern (lines 109-117 in app/Livewire/Project/Service/Heading.php), consider using .get() with a foreach loop instead of .each():
$activities = Activity::where('properties->type_uuid', $service->uuid)
->where(function ($q) {
$q->where('properties->status', ProcessStatus::IN_PROGRESS->value)
->orWhere('properties->status', ProcessStatus::QUEUED->value);
})->get();
foreach ($activities as $activity) {
$activity->properties->status = ProcessStatus::CANCELLED->value;
$activity->save();
}This matches the established pattern in the codebase for similar operations.
Suggested change
| Activity::where('properties->type_uuid', $service->uuid) | |
| ->where(function ($q) { | |
| $q->where('properties->status', ProcessStatus::IN_PROGRESS->value) | |
| ->orWhere('properties->status', ProcessStatus::QUEUED->value); | |
| }) | |
| ->each(function ($activity) { | |
| $activity->properties = $activity->properties->put('status', ProcessStatus::CANCELLED->value); | |
| $activity->save(); | |
| }); | |
| $activities = Activity::where('properties->type_uuid', $service->uuid) | |
| ->where(function ($q) { | |
| $q->where('properties->status', ProcessStatus::IN_PROGRESS->value) | |
| ->orWhere('properties->status', ProcessStatus::QUEUED->value); | |
| }) | |
| ->get(); | |
| foreach ($activities as $activity) { | |
| $activity->properties = $activity->properties->put('status', ProcessStatus::CANCELLED->value); | |
| $activity->save(); | |
| } |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
forceDeploy()methodHow to Test