Skip to content

[Usage] Include accounts uuid on the cloud_usage accounts initial saving #12420

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

Draft
nvazquez wants to merge 1 commit into
base: 4.20
Choose a base branch
from
Draft

[Usage] Include accounts uuid on the cloud_usage accounts initial saving #12420

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
17 changes: 9 additions & 8 deletions engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class UsageDaoImpl extends GenericDaoBase<UsageVO, Long> implements Usage
private static final String DELETE_ALL = "DELETE FROM cloud_usage";
private static final String DELETE_ALL_BY_ACCOUNTID = "DELETE FROM cloud_usage WHERE account_id = ?";
private static final String DELETE_ALL_BY_INTERVAL = "DELETE FROM cloud_usage WHERE end_date < DATE_SUB(CURRENT_DATE(), INTERVAL ? DAY)";
private static final String INSERT_ACCOUNT = "INSERT INTO cloud_usage.account (id, account_name, type, role_id, domain_id, removed, cleanup_needed) VALUES (?,?,?,?,?,?,?)";
private static final String INSERT_ACCOUNT = "INSERT INTO cloud_usage.account (id, account_name, uuid, type, role_id, domain_id, removed, cleanup_needed) VALUES (?,?,?,?,?,?,?,?)";
private static final String INSERT_USER_STATS = "INSERT INTO cloud_usage.user_statistics (id, data_center_id, account_id, public_ip_address, device_id, device_type, network_id, net_bytes_received,"
+ " net_bytes_sent, current_bytes_received, current_bytes_sent, agg_bytes_received, agg_bytes_sent) VALUES (?,?,?,?,?,?,?,?,?,?, ?, ?, ?)";

Expand Down Expand Up @@ -129,25 +129,26 @@ public void saveAccounts(List<AccountVO> accounts) {
for (AccountVO acct : accounts) {
pstmt.setLong(1, acct.getId());
pstmt.setString(2, acct.getAccountName());
pstmt.setInt(3, acct.getType().ordinal());
pstmt.setString(3, acct.getUuid());
pstmt.setInt(4, acct.getType().ordinal());

//prevent autoboxing NPE by defaulting to User role
if(acct.getRoleId() == null){
pstmt.setLong(4, RoleType.User.getId());
pstmt.setLong(5, RoleType.User.getId());
}else{
pstmt.setLong(4, acct.getRoleId());
pstmt.setLong(5, acct.getRoleId());
}

pstmt.setLong(5, acct.getDomainId());
pstmt.setLong(6, acct.getDomainId());

Date removed = acct.getRemoved();
if (removed == null) {
pstmt.setString(6, null);
pstmt.setString(7, null);
} else {
pstmt.setString(6, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), acct.getRemoved()));
pstmt.setString(7, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), acct.getRemoved()));
}

pstmt.setBoolean(7, acct.getNeedsCleanup());
pstmt.setBoolean(8, acct.getNeedsCleanup());

pstmt.addBatch();
}
Expand Down
Loading