apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.18' into 4.19

Browse Source
This commit is contained in:
Rohit Yadav 2024-07-29 09:42:38 +05:30
commit 3d32ab5a49
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java
View File

@ -547,16 +547,11 @@ public class UsageDaoImpl extends GenericDaoBase<UsageVO, Long> implements Usage
TransactionLegacy txn = TransactionLegacy.currentTxn(); TransactionLegacy txn = TransactionLegacy.currentTxn();
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
try { try {
txn.start();
pstmt = txn.prepareAutoCloseStatement(DELETE_ALL_BY_INTERVAL); pstmt = txn.prepareAutoCloseStatement(DELETE_ALL_BY_INTERVAL);
pstmt.setLong(1, days); pstmt.setLong(1, days);
pstmt.executeUpdate(); pstmt.executeUpdate();
txn.commit();
} catch (Exception ex) { } catch (Exception ex) {
txn.rollback();
s_logger.error("error removing old cloud_usage records for interval: " + days); s_logger.error("error removing old cloud_usage records for interval: " + days);
} finally {
txn.close();
} }
} }
}); });

1
ui/src/views/compute/KubernetesServiceTab.vue
View File

@ -402,6 +402,7 @@ export default {
if (this.arrayHasItems(networks)) { if (this.arrayHasItems(networks)) {
this.network = networks[0] this.network = networks[0]
} }
resolve(this.network)
}) })
this.networkLoading = false this.networkLoading = false
}) })