This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 01d44347e724c825b014625a8ce78fa57bb3a760
Merge: 502a633ddd0 2e88eb45a3b
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Thu Mar 21 18:12:47 2024 +0530
Merge remote-tracking branch 'origin/4.19'
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
Conflicts:
plugins/network-elements/juniper-contrail/pom.xml
pom.xml
tools/marvin/setup.py
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
client/pom.xml | 14 +++++-----
developer/pom.xml | 12 ++++-----
engine/schema/pom.xml | 4 +--
.../java/com/cloud/upgrade/DatabaseCreator.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade41900to41910.java | 30 +++++++++++++++++++---
.../java/com/cloud/utils/db/TransactionLegacy.java | 6 ++++-
plugins/database/mysql-ha/pom.xml | 4 +--
plugins/database/quota/pom.xml | 4 +--
plugins/network-elements/juniper-contrail/pom.xml | 4 +--
plugins/storage/volume/cloudbyte/pom.xml | 4 +--
pom.xml | 6 ++---
server/pom.xml | 4 +--
.../java/com/cloud/test/regression/TestCase.java | 2 +-
tools/devcloud-kvm/pom.xml | 8 +++---
tools/devcloud4/pom.xml | 8 +++---
usage/pom.xml | 4 +--
.../java/com/cloud/usage/UsageSanityCheckerIT.java | 3 ++-
utils/pom.xml | 5 ++--
18 files changed, 76 insertions(+), 48 deletions(-)
diff --cc
engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41900to41910.java
index 6085faba634,5c57fb31fcf..f55580a7e19
--- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41900to41910.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41900to41910.java
@@@ -16,12 -16,16 +16,14 @@@
// under the License.
package com.cloud.upgrade.dao;
+ import com.cloud.upgrade.SystemVmTemplateRegistration;
import com.cloud.utils.exception.CloudRuntimeException;
-import org.apache.log4j.Logger;
import java.io.InputStream;
import java.sql.Connection;
- public class Upgrade41900to41910 implements DbUpgrade {
-public class Upgrade41900to41910 implements DbUpgrade,
DbUpgradeSystemVmTemplate {
- final static Logger LOG = Logger.getLogger(Upgrade41900to41910.class);
++public class Upgrade41900to41910 extends DbUpgradeAbstractImpl implements
DbUpgrade, DbUpgradeSystemVmTemplate {
+ private SystemVmTemplateRegistration systemVmTemplateRegistration;
@Override
public String[] getUpgradableVersionRange() {
@@@ -61,6 -66,25 +64,25 @@@
throw new CloudRuntimeException("Unable to find " + scriptFile);
}
- return new InputStream[] {script};
+ return new InputStream[]{script};
+ }
+
+ private void addIndexes(Connection conn) {
+ DbUpgradeUtils.addIndexIfNeeded(conn, "vm_stats", "vm_id");
+ }
+
+ @Override
+ public void updateSystemVmTemplates(Connection conn) {
- LOG.debug("Updating System Vm template IDs");
++ logger.debug("Updating System Vm template IDs");
+ initSystemVmTemplateRegistration();
+ try {
+ systemVmTemplateRegistration.updateSystemVmTemplates(conn);
+ } catch (Exception e) {
+ throw new CloudRuntimeException("Failed to find / register
SystemVM template(s)");
+ }
+ }
+
+ private void initSystemVmTemplateRegistration() {
+ systemVmTemplateRegistration = new SystemVmTemplateRegistration("");
}
}
diff --cc plugins/network-elements/juniper-contrail/pom.xml
index a23b6d71058,9eb61383a99..a6a0df9f9d5
--- a/plugins/network-elements/juniper-contrail/pom.xml
+++ b/plugins/network-elements/juniper-contrail/pom.xml
@@@ -119,13 -119,9 +119,13 @@@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --cc pom.xml
index a8062ae8fe6,3151c9f0d29..b52a37a0fa8
--- a/pom.xml
+++ b/pom.xml
@@@ -464,9 -447,14 +464,9 @@@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- <version>${cs.reload4j.version}</version>
- </dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
<version>${cs.mysql.version}</version>
<scope>test</scope>
</dependency>
diff --cc test/src-not-used/main/java/com/cloud/test/regression/TestCase.java
index a07dbe4ed85,2bbf1bbac2f..26b534e976c
--- a/test/src-not-used/main/java/com/cloud/test/regression/TestCase.java
+++ b/test/src-not-used/main/java/com/cloud/test/regression/TestCase.java
@@@ -86,9 -85,9 +86,9 @@@ public abstract class TestCase
this.conn = null;
try {
Class.forName("com.mysql.jdbc.Driver");
- this.conn = DriverManager.getConnection("jdbc:mysql://" +
param.get("db") + "/cloud", "root", dbPassword);
+ this.conn = DriverManager.getConnection("jdbc:mysql://" +
param.get("db") + "/cloud?" + TransactionLegacy.CONNECTION_PARAMS, "root",
dbPassword);
if (!this.conn.isValid(0)) {
- s_logger.error("Connection to DB failed to establish");
+ LOGGER.error("Connection to DB failed to establish");
}
} catch (Exception ex) {
