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

Detatch DS in rollout execution in case lasy loaded (#2123)

Browse Source 
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2024-12-06 14:40:52 +02:00
committed by GitHub
parent be6a58a38a
commit 613a11a78b
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java
View File

@@ -844,14 +844,13 @@ public class JpaRolloutExecutor implements RolloutExecutor {
return totalActionsCreated; return totalActionsCreated;
} }
private Long createActionsForTargetsInNewTransaction( private Long createActionsForTargetsInNewTransaction(final Rollout rollout, final RolloutGroup group, final int limit) {
final Rollout rollout, final RolloutGroup group, final int limit) {
return DeploymentHelper.runInNewTransaction(txManager, "createActionsForTargets", status -> { return DeploymentHelper.runInNewTransaction(txManager, "createActionsForTargets", status -> {
final Slice<Target> targets = final Slice<Target> targets = targetManagement.findByInRolloutGroupWithoutAction(PageRequest.of(0, limit), group.getId());
targetManagement.findByInRolloutGroupWithoutAction(PageRequest.of(0, limit), group.getId());
if (targets.getNumberOfElements() > 0) { if (targets.getNumberOfElements() > 0) {
final DistributionSet distributionSet = rollout.getDistributionSet(); final DistributionSet distributionSet = rollout.getDistributionSet();
entityManager.detach(distributionSet); // if lazy loaded with different session
final ActionType actionType = rollout.getActionType(); final ActionType actionType = rollout.getActionType();
final long forceTime = rollout.getForcedTime(); final long forceTime = rollout.getForcedTime();
createActions(targets.getContent(), distributionSet, actionType, forceTime, rollout, group); createActions(targets.getContent(), distributionSet, actionType, forceTime, rollout, group);
@@ -866,17 +865,13 @@ public class JpaRolloutExecutor implements RolloutExecutor {
} }
/** /**
* Creates an action entry into the action repository. In case of existing * Creates an action entry into the action repository. In case of existing scheduled actions the scheduled actions gets canceled.
* scheduled actions the scheduled actions gets canceled. A scheduled action * A scheduled action is created in-active for static and running for dynamic groups.
* is created in-active for static and running for dynamic groups.
*/ */
private List<Action> createActions(final Collection<Target> targets, final DistributionSet distributionSet, private List<Action> createActions(final Collection<Target> targets, final DistributionSet distributionSet,
final ActionType actionType, final Long forcedTime, final Rollout rollout, final ActionType actionType, final Long forcedTime, final Rollout rollout, final RolloutGroup rolloutGroup) {
final RolloutGroup rolloutGroup) { // cancel all current scheduled actions for this target. E.g. an action is already scheduled and a next action is created
// cancel all current scheduled actions for this target. E.g. an action // then cancel the current scheduled action to cancel. E.g. a new scheduled action is created.
// is already scheduled and a next action is created then cancel the
// current scheduled action to cancel. E.g. a new scheduled action is
// created.
final List<Long> targetIds = targets.stream().map(Target::getId).toList(); final List<Long> targetIds = targets.stream().map(Target::getId).toList();
deploymentManagement.cancelInactiveScheduledActionsForTargets(targetIds); deploymentManagement.cancelInactiveScheduledActionsForTargets(targetIds);
return targets.stream() return targets.stream()