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

Fix for the Bug

Browse Source 
- deleted targets are now considered when calculating threshold for success condition
- added junit test 

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
This commit is contained in:
Jonathan Philip Knoblauch
2016-10-24 17:13:34 +02:00
committed by Kai Zimmermann
parent a0f98529e6
commit 09bf04ed2c
2 changed files with 88 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutManagementTest.java
View File

@@ -160,6 +160,68 @@ public class RolloutManagementTest extends AbstractJpaIntegrationTest {
+ group.getStatus() + " state"));
}
@Test
@Description("Verfiying that next group is started when targets of the group have been deleted.")
public void checkRunningRolloutsStartsNextGroupIfTargetsDeleted() {
final int amountTargetsForRollout = 15;
final int amountOtherTargets = 0;
final int amountGroups = 3;
final String successCondition = "100";
final String errorCondition = "80";
final Rollout createdRollout = createSimpleTestRolloutWithTargetsAndDistributionSet(amountTargetsForRollout,
amountOtherTargets, amountGroups, successCondition, errorCondition);
rolloutManagement.startRollout(createdRollout);
// finish group one by finishing targets and deleting targets
List<Action> runningActions = deploymentManagement.findActionsByRolloutAndStatus(createdRollout,
Status.RUNNING);
finishAction(runningActions.get(0));
finishAction(runningActions.get(1));
finishAction(runningActions.get(2));
targetManagement.deleteTargets(runningActions.get(3).getTarget().getId(),
runningActions.get(4).getTarget().getId());
rolloutManagement.checkRunningRollouts(0);
// validate that the second group is in running state
List<RolloutGroup> runningRolloutGroups = rolloutGroupManagement.findRolloutGroupsByRolloutId(
createdRollout.getId(), new OffsetBasedPageRequest(0, 10, new Sort(Direction.ASC, "id"))).getContent();
assertThat(runningRolloutGroups.get(0).getStatus()).isEqualTo(RolloutGroupStatus.FINISHED);
assertThat(runningRolloutGroups.get(1).getStatus()).isEqualTo(RolloutGroupStatus.RUNNING);
// finish one action and delete the other targets of group two
runningActions = deploymentManagement.findActionsByRolloutAndStatus(createdRollout, Status.RUNNING);
finishAction(runningActions.get(0));
targetManagement.deleteTargets(runningActions.get(1).getTarget().getId(),
runningActions.get(2).getTarget().getId(), runningActions.get(3).getTarget().getId(),
runningActions.get(4).getTarget().getId());
// delete all targets of the third group
runningActions = deploymentManagement.findActionsByRolloutAndStatus(createdRollout, Status.SCHEDULED);
targetManagement.deleteTargets(runningActions.get(0).getTarget().getId(),
runningActions.get(1).getTarget().getId(), runningActions.get(2).getTarget().getId(),
runningActions.get(3).getTarget().getId(), runningActions.get(4).getTarget().getId());
// validate that groups and rollout finished correctly
rolloutManagement.checkRunningRollouts(0);
runningRolloutGroups = rolloutGroupManagement.findRolloutGroupsByRolloutId(createdRollout.getId(),
new OffsetBasedPageRequest(0, 10, new Sort(Direction.ASC, "id"))).getContent();
assertThat(runningRolloutGroups.get(0).getStatus()).isEqualTo(RolloutGroupStatus.FINISHED);
assertThat(runningRolloutGroups.get(1).getStatus()).isEqualTo(RolloutGroupStatus.FINISHED);
assertThat(runningRolloutGroups.get(2).getStatus()).isEqualTo(RolloutGroupStatus.FINISHED);
assertThat(rolloutManagement.findRolloutById(createdRollout.getId()).getStatus())
.isEqualTo(RolloutStatus.FINISHED);
}
private void finishAction(final Action action) {
final JpaAction jpaAction = (JpaAction) action;
action.setStatus(Status.FINISHED);
controllerManagament
.addUpdateActionStatus(new JpaActionStatus(jpaAction, Status.FINISHED, System.currentTimeMillis(), ""));
}
@Test
@Description("Verfiying that the error handling action of a group is executed to pause the current rollout")
public void checkErrorHitOfGroupCallsErrorActionToPauseTheRollout() {