You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by vi...@apache.org on 2024/07/17 12:13:59 UTC
(cloudstack) branch main updated (afdf4d7d46c -> 35fd17c62ee)
This is an automated email from the ASF dual-hosted git repository.
vishesh pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from afdf4d7d46c Add limit configuration for number of projects (#9172)
add c71ab9598e3 test: refactor ActionEventInterceptorTest to prevent failures (#9384)
add d9f77b841c5 Ignore non-managed pools for storage pool access preparation (#9376)
add 22ef08154dc Switch back to CLOUD_DB after purging usage records (#9367)
add 877c4d9a64b LibvirtOvsFetchInterfaceCommandWrapperTest fix (test fails in mac) - skip it if no interfaces with eth and wl (#9382)
add 7f8f1137099 Merge branch '4.18' into 4.19
add 50586a94816 UI assorted fixes (#9381)
add 2cfb541a1d7 saml: purge token after first response and improve setting description (#9377)
add 6a8494be3be engine-schema,cks: fix finding non removed network vms (#9339)
add 7db83db3dd9 Fix radio buttons in instance migration pop-up (#8836)
add 21c98af13de Fix backup offering buttons for instances in data view (#9391)
add 8a00e25de91 Fix list backups after backup vm is expunged (#9392)
add a53365d1c7f Merge release branch 4.18 to 4.19
new 35fd17c62ee Merge branch '4.19'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../api/command/user/backup/ListBackupsCmd.java | 1 +
.../java/org/apache/cloudstack/backup/Backup.java | 1 +
.../java/com/cloud/usage/dao/UsageDaoImpl.java | 35 +++++++++++---------
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 1 +
.../org/apache/cloudstack/backup/BackupVO.java | 1 +
.../cloudstack/backup/dao/BackupDaoImpl.java | 6 +++-
...LibvirtOvsFetchInterfaceCommandWrapperTest.java | 8 +++--
.../api/command/SAML2LoginAPIAuthenticatorCmd.java | 1 +
.../apache/cloudstack/saml/SAML2AuthManager.java | 19 ++++++-----
.../cloudstack/saml/SAML2AuthManagerImpl.java | 7 ++++
.../command/SAML2LoginAPIAuthenticatorCmdTest.java | 4 +--
.../java/com/cloud/storage/StorageManagerImpl.java | 6 +---
.../cloud/event/ActionEventInterceptorTest.java | 38 ++++++++++++----------
ui/public/config.json | 4 +--
ui/public/index.html | 4 +--
ui/public/locales/en.json | 1 +
ui/src/components/view/InfoCard.vue | 12 -------
ui/src/components/widgets/Console.vue | 9 +----
ui/src/config/section/account.js | 24 ++++++++++++++
ui/src/config/section/compute.js | 2 +-
ui/src/config/section/domain.js | 16 +++++++++
ui/src/config/section/infra/hosts.js | 2 +-
ui/src/config/section/infra/managementServers.js | 4 +--
23 files changed, 126 insertions(+), 80 deletions(-)
(cloudstack) 01/01: Merge branch '4.19'
Posted by vi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vishesh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 35fd17c62eeec877c71027fb32ad11bda4771c98
Merge: afdf4d7d46c a53365d1c7f
Author: Vishesh <vi...@gmail.com>
AuthorDate: Wed Jul 17 17:43:40 2024 +0530
Merge branch '4.19'
.../api/command/user/backup/ListBackupsCmd.java | 1 +
.../java/org/apache/cloudstack/backup/Backup.java | 1 +
.../java/com/cloud/usage/dao/UsageDaoImpl.java | 35 +++++++++++---------
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 1 +
.../org/apache/cloudstack/backup/BackupVO.java | 1 +
.../cloudstack/backup/dao/BackupDaoImpl.java | 6 +++-
...LibvirtOvsFetchInterfaceCommandWrapperTest.java | 8 +++--
.../api/command/SAML2LoginAPIAuthenticatorCmd.java | 1 +
.../apache/cloudstack/saml/SAML2AuthManager.java | 19 ++++++-----
.../cloudstack/saml/SAML2AuthManagerImpl.java | 7 ++++
.../command/SAML2LoginAPIAuthenticatorCmdTest.java | 4 +--
.../java/com/cloud/storage/StorageManagerImpl.java | 6 +---
.../cloud/event/ActionEventInterceptorTest.java | 38 ++++++++++++----------
ui/public/config.json | 4 +--
ui/public/index.html | 4 +--
ui/public/locales/en.json | 1 +
ui/src/components/view/InfoCard.vue | 12 -------
ui/src/components/widgets/Console.vue | 9 +----
ui/src/config/section/account.js | 24 ++++++++++++++
ui/src/config/section/compute.js | 2 +-
ui/src/config/section/domain.js | 16 +++++++++
ui/src/config/section/infra/hosts.js | 2 +-
ui/src/config/section/infra/managementServers.js | 4 +--
23 files changed, 126 insertions(+), 80 deletions(-)
diff --cc api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java
index 8597d97278c,57a1de2f105..7d87cc37e6c
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java
@@@ -116,6 -118,7 +116,7 @@@ public class ListBackupsCmd extends Bas
Pair<List<Backup>, Integer> result = backupManager.listBackups(this);
setupResponseBackupList(result.first(), result.second());
} catch (Exception e) {
- s_logger.debug("Exception while listing backups", e);
++ logger.debug("Exception while listing backups", e);
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
}
}
diff --cc engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java
index 2335043b7c5,3c900b604d8..b849378c705
--- a/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java
@@@ -538,21 -541,25 +539,25 @@@ public class UsageDaoImpl extends Gener
@Override
public void removeOldUsageRecords(int days) {
- String sql = DELETE_ALL_BY_INTERVAL;
- TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB);
- PreparedStatement pstmt = null;
- try {
- txn.start();
- pstmt = txn.prepareAutoCloseStatement(sql);
- pstmt.setLong(1, days);
- pstmt.executeUpdate();
- txn.commit();
- } catch (Exception ex) {
- txn.rollback();
- logger.error("error removing old cloud_usage records for interval: " + days);
- } finally {
- txn.close();
- }
+ Transaction.execute(TransactionLegacy.USAGE_DB, new TransactionCallbackNoReturn() {
+ @Override
+ public void doInTransactionWithoutResult(TransactionStatus status) {
+ 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);
++ logger.error("error removing old cloud_usage records for interval: " + days);
+ } finally {
+ txn.close();
+ }
+ }
+ });
}
public UsageVO persistUsage(final UsageVO usage) {