Skip to content

fix: bound the usage event rewind to prevent unbounded re-aggregation #13927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
waterWang wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −1
Open

fix: bound the usage event rewind to prevent unbounded re-aggregation #13927

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
private static final int HOURLY_TIME = 60;
private static final int DAILY_TIME = 60 * 24;
private static final int THREE_DAYS_IN_MINUTES = 60 * 24 * 3;
private static final long MAX_EVENT_REWIND_MILLIS = 24L * 60 * 60 * 1000;

@Inject
private AccountDao _accountDao;
Expand Down Expand Up @@ -699,7 +700,10 @@ public void parse(UsageJobVO job, long startDateMillis, long endDateMillis) {
if ((events != null) && (events.size() > 0)) {
Date oldestEventDate = events.get(0).getCreateDate();
if (oldestEventDate.getTime() < startDateMillis) {
startDateMillis = oldestEventDate.getTime();
// Bound the rewind so a single un-processable event cannot pin the
// aggregation window to an arbitrarily old date and cause unbounded
// re-aggregation of the entire history on every run.
startDateMillis = Math.max(oldestEventDate.getTime(), startDateMillis - MAX_EVENT_REWIND_MILLIS);
startDate = new Date(startDateMillis);
}

Expand Down