Skip to content

Commit d40ab1f

Browse files
strailovavgustinmm
andauthored
Fix Deletion of rollout and dynamic Rollouts with Postgres (#3006)
* Fix stop rollout when using PosgreSQL (2) (#3000) Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com> * Remove table alias on SET when stopping rollouts (#3002) Signed-off-by: strailov <Stanislav.Trailov@bosch.io> * Fix force quit actions to explicitly handle 0 active actions (#3004) * 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> --------- Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com> Signed-off-by: strailov <Stanislav.Trailov@bosch.io> Co-authored-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
1 parent 5c0f1e3 commit d40ab1f

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,10 @@ private void forceQuitActionsOfRollout(final Rollout rollout) {
561561
.getContent();
562562
log.info("Found {} active actions for rollout {}", actions.size(), rollout.getId());
563563

564+
if (actions.isEmpty()) {
565+
return;
566+
}
567+
564568
storeActionsAndStatuses(actions, Action.Status.CANCELED);
565569

566570
// find next active actions - filter by targetId list and isActive

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import jakarta.persistence.NamedEntityGraph;
2929
import jakarta.persistence.NamedEntityGraphs;
3030
import jakarta.persistence.OneToMany;
31+
import jakarta.persistence.OrderBy;
3132
import jakarta.persistence.Table;
3233
import jakarta.persistence.Transient;
3334
import jakarta.validation.constraints.Max;
@@ -64,6 +65,7 @@
6465
public class JpaRollout extends AbstractJpaNamedEntity implements Rollout, EventAwareEntity {
6566

6667
@OneToMany(targetEntity = JpaRolloutGroup.class, fetch = FetchType.LAZY, cascade = { CascadeType.REMOVE }, mappedBy = "rollout")
68+
@OrderBy("id ASC")
6769
private List<JpaRolloutGroup> rolloutGroups = new ArrayList<>();
6870

6971
@Setter

0 commit comments

Comments
 (0)