From 33be0ae745c758d2112e574b7a9c5b4079ca5fca Mon Sep 17 00:00:00 2001 From: Vishesh Date: Fri, 26 Jul 2024 14:10:02 +0530 Subject: [PATCH 1/2] Fix removal of usage records (#9442) --- .../src/main/java/com/cloud/usage/dao/UsageDaoImpl.java | 5 ----- 1 file changed, 5 deletions(-) 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 038d17a85a3..c51496ade2e 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 @@ -476,16 +476,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(); } } }); From cf0e44dd7ec678f8fe67d66d280669ae2adf2ebb Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Mon, 29 Jul 2024 00:05:55 -0400 Subject: [PATCH 2/2] UI: Display Firewall, LB and Port Forwading rules tab for CKS clusters deployed on isolated networks (#9458) --- ui/src/views/compute/KubernetesServiceTab.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/src/views/compute/KubernetesServiceTab.vue b/ui/src/views/compute/KubernetesServiceTab.vue index de5617cfcf1..2655a0e5ae2 100644 --- a/ui/src/views/compute/KubernetesServiceTab.vue +++ b/ui/src/views/compute/KubernetesServiceTab.vue @@ -393,6 +393,7 @@ export default { if (this.arrayHasItems(networks)) { this.network = networks[0] } + resolve(this.network) }) this.networkLoading = false })