lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix force quit actions to explicitly handle 0 active actions (#3004)

Browse Source 
* Fix force quit actions to explicitly handle 0 active actions

Signed-off-by: strailov <Stanislav.Trailov@bosch.io>

* Fix dynamic rollout behaviour when using Postgres

Signed-off-by: strailov <Stanislav.Trailov@bosch.io>

---------

Signed-off-by: strailov <Stanislav.Trailov@bosch.io>
This commit is contained in:
Stanislav Trailov
2026-04-09 10:44:06 +03:00
committed by GitHub
parent f9bb49d33e
commit f6cb143283
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaRolloutManagement.java
View File

@@ -561,6 +561,10 @@ public class JpaRolloutManagement implements RolloutManagement {
.getContent(); .getContent();
log.info("Found {} active actions for rollout {}", actions.size(), rollout.getId()); log.info("Found {} active actions for rollout {}", actions.size(), rollout.getId());
if (actions.isEmpty()) {
return;
}
storeActionsAndStatuses(actions, Action.Status.CANCELED); storeActionsAndStatuses(actions, Action.Status.CANCELED);
// find next active actions - filter by targetId list and isActive // find next active actions - filter by targetId list and isActive

2
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java
View File

@@ -28,6 +28,7 @@ import jakarta.persistence.NamedAttributeNode;
import jakarta.persistence.NamedEntityGraph; import jakarta.persistence.NamedEntityGraph;
import jakarta.persistence.NamedEntityGraphs; import jakarta.persistence.NamedEntityGraphs;
import jakarta.persistence.OneToMany; import jakarta.persistence.OneToMany;
import jakarta.persistence.OrderBy;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import jakarta.persistence.Transient; import jakarta.persistence.Transient;
import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Max;
@@ -64,6 +65,7 @@ import org.eclipse.hawkbit.repository.model.TotalTargetCountStatus;
public class JpaRollout extends AbstractJpaNamedEntity implements Rollout, EventAwareEntity { public class JpaRollout extends AbstractJpaNamedEntity implements Rollout, EventAwareEntity {
@OneToMany(targetEntity = JpaRolloutGroup.class, fetch = FetchType.LAZY, cascade = { CascadeType.REMOVE }, mappedBy = "rollout") @OneToMany(targetEntity = JpaRolloutGroup.class, fetch = FetchType.LAZY, cascade = { CascadeType.REMOVE }, mappedBy = "rollout")
@OrderBy("id ASC")
private List<JpaRolloutGroup> rolloutGroups = new ArrayList<>(); private List<JpaRolloutGroup> rolloutGroups = new ArrayList<>();
@Setter @Setter