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

Fix transactions on mysql of createActionsForDynamicGroupInNewTransaction (#1768)

Browse Source 
Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2024-07-12 16:43:17 +03:00
committed by GitHub
parent 9b9bc7ee00
commit beeb2523e2
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -784,7 +784,7 @@ public class JpaRolloutExecutor implements RolloutExecutor {
private int createActionsForDynamicGroupInNewTransaction(final JpaRollout rollout, final RolloutGroup group, private int createActionsForDynamicGroupInNewTransaction(final JpaRollout rollout, final RolloutGroup group,
final String targetFilter, final long limit) { final String targetFilter, final long limit) {
final List<Action> newActions = DeploymentHelper.runInNewTransaction(txManager, "createActionsForRolloutDynamicGroup", status -> { return DeploymentHelper.runInNewTransaction(txManager, "createActionsForRolloutDynamicGroup", status -> {
final PageRequest pageRequest = PageRequest.of(0, Math.toIntExact(limit)); final PageRequest pageRequest = PageRequest.of(0, Math.toIntExact(limit));
final Slice<Target> targets = targetManagement.findByNotInGEGroupAndNotInActiveActionGEWeightOrInRolloutAndTargetFilterQueryAndCompatibleAndUpdatable( final Slice<Target> targets = targetManagement.findByNotInGEGroupAndNotInActiveActionGEWeightOrInRolloutAndTargetFilterQueryAndCompatibleAndUpdatable(
pageRequest, pageRequest,
@@ -793,20 +793,19 @@ public class JpaRolloutExecutor implements RolloutExecutor {
targetFilter, rollout.getDistributionSet().getType()); targetFilter, rollout.getDistributionSet().getType());
if (targets.getNumberOfElements() == 0) { if (targets.getNumberOfElements() == 0) {
return Collections.emptyList(); return 0;
} }
final DistributionSet distributionSet = rollout.getDistributionSet(); final DistributionSet distributionSet = rollout.getDistributionSet();
final ActionType actionType = rollout.getActionType(); final ActionType actionType = rollout.getActionType();
final long forceTime = rollout.getForcedTime(); final long forceTime = rollout.getForcedTime();
return createActions(targets.getContent(), distributionSet, actionType, forceTime, rollout, group); final List<Action> newActions = createActions(targets.getContent(), distributionSet, actionType, forceTime, rollout, group);
if (!newActions.isEmpty()) {
deploymentManagement.startScheduledActions(newActions);
}
return newActions.size();
}); });
if (!newActions.isEmpty()) {
deploymentManagement.startScheduledActions(newActions);
}
return newActions.size();
} }
/** /**