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

Fix problem where autoclose feature is ignored in rollouts. (#642)

Browse Source 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
Kai Zimmermann
2018-03-01 14:36:39 +01:00
committed by GitHub
parent c17f6c0d24
commit f7c3687ed2
4 changed files with 116 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDeploymentManagement.java
View File

@@ -448,8 +448,18 @@ public class JpaDeploymentManagement implements DeploymentManagement {
private JpaAction startScheduledActionIfNoCancelationHasToBeHandledFirst(final JpaAction action) {
// check if we need to override running update actions
final List<Long> overrideObsoleteUpdateActions = onlineDsAssignmentStrategy
.overrideObsoleteUpdateActions(Collections.singletonList(action.getTarget().getId()));
final List<Long> overrideObsoleteUpdateActions;
if (systemSecurityContext.runAsSystem(() -> tenantConfigurationManagement
.getConfigurationValue(TenantConfigurationKey.REPOSITORY_ACTIONS_AUTOCLOSE_ENABLED, Boolean.class)
.getValue())) {
overrideObsoleteUpdateActions = Collections.emptyList();
onlineDsAssignmentStrategy
.closeObsoleteUpdateActions(Collections.singletonList(action.getTarget().getId()));
} else {
overrideObsoleteUpdateActions = onlineDsAssignmentStrategy
.overrideObsoleteUpdateActions(Collections.singletonList(action.getTarget().getId()));
}
action.setActive(true);
action.setStatus(Status.RUNNING);