diff --git a/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java index 3c900b604d8..bc98652c95d 100644 --- a/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java @@ -547,16 +547,11 @@ public class UsageDaoImpl extends GenericDaoBase implements Usage TransactionLegacy txn = TransactionLegacy.currentTxn(); PreparedStatement pstmt = null; try { - txn.start(); pstmt = txn.prepareAutoCloseStatement(DELETE_ALL_BY_INTERVAL); pstmt.setLong(1, days); pstmt.executeUpdate(); - txn.commit(); } catch (Exception ex) { - txn.rollback(); s_logger.error("error removing old cloud_usage records for interval: " + days); - } finally { - txn.close(); } } }); diff --git a/ui/src/views/compute/KubernetesServiceTab.vue b/ui/src/views/compute/KubernetesServiceTab.vue index bdaa2eefde6..9bc80afae08 100644 --- a/ui/src/views/compute/KubernetesServiceTab.vue +++ b/ui/src/views/compute/KubernetesServiceTab.vue @@ -402,6 +402,7 @@ export default { if (this.arrayHasItems(networks)) { this.network = networks[0] } + resolve(this.network) }) this.networkLoading = false })