Repository: aurora Updated Branches: refs/heads/master f1e25375d -> d46d1df96
Make sure we track scheduling penalty when no tasks are scheduled. Reviewed at https://reviews.apache.org/r/58922/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/d46d1df9 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/d46d1df9 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/d46d1df9 Branch: refs/heads/master Commit: d46d1df960b5a1d5353dcd7a51dad97b5d24de80 Parents: f1e2537 Author: David McLaughlin <[email protected]> Authored: Tue May 2 10:24:59 2017 -0700 Committer: David McLaughlin <[email protected]> Committed: Tue May 2 10:24:59 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/aurora/scheduler/scheduling/TaskGroups.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/d46d1df9/src/main/java/org/apache/aurora/scheduler/scheduling/TaskGroups.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/scheduling/TaskGroups.java b/src/main/java/org/apache/aurora/scheduler/scheduling/TaskGroups.java index cea8d0f..2d3492d 100644 --- a/src/main/java/org/apache/aurora/scheduler/scheduling/TaskGroups.java +++ b/src/main/java/org/apache/aurora/scheduler/scheduling/TaskGroups.java @@ -180,10 +180,10 @@ public class TaskGroups implements EventSubscriber { throw new RuntimeException(e); } + scheduledTaskPenalties.accumulate(group.getPenaltyMs()); if (scheduled.isEmpty()) { penaltyMs = settings.taskGroupBackoff.calculateBackoffMs(group.getPenaltyMs()); } else { - scheduledTaskPenalties.accumulate(group.getPenaltyMs()); group.remove(scheduled); if (group.hasMore()) { penaltyMs = settings.firstScheduleDelay.as(Time.MILLISECONDS);
