Skip to content

Commit 01d4434

Browse files
rohityadavcloudrohityadavcloud
committed
Merge remote-tracking branch 'origin/4.19'
Signed-off-by: Rohit Yadav <[email protected]> Conflicts: plugins/network-elements/juniper-contrail/pom.xml pom.xml tools/marvin/setup.py Signed-off-by: Rohit Yadav <[email protected]>
2 parents 502a633 + 2e88eb4 commit 01d4434

File tree

18 files changed

+76
-48
lines changed

18 files changed

+76
-48
lines changed

‎client/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
<artifactId>jetty-util</artifactId>
6969
</dependency>
7070
<dependency>
71-
<groupId>mysql</groupId>
72-
<artifactId>mysql-connector-java</artifactId>
71+
<groupId>com.mysql</groupId>
72+
<artifactId>mysql-connector-j</artifactId>
7373
</dependency>
7474
<dependency>
7575
<groupId>org.apache.cloudstack</groupId>
@@ -714,8 +714,8 @@
714714
<dependencies>
715715
<!-- specify the dependent jdbc driver here -->
716716
<dependency>
717-
<groupId>mysql</groupId>
718-
<artifactId>mysql-connector-java</artifactId>
717+
<groupId>com.mysql</groupId>
718+
<artifactId>mysql-connector-j</artifactId>
719719
<version>${cs.mysql.version}</version>
720720
</dependency>
721721
<dependency>
@@ -903,8 +903,8 @@
903903
<outputDirectory>${project.build.directory}/pythonlibs</outputDirectory>
904904
</artifactItem>
905905
<artifactItem>
906-
<groupId>mysql</groupId>
907-
<artifactId>mysql-connector-java</artifactId>
906+
<groupId>com.mysql</groupId>
907+
<artifactId>mysql-connector-j</artifactId>
908908
<overWrite>false</overWrite>
909909
<outputDirectory>${project.build.directory}/lib</outputDirectory>
910910
</artifactItem>
@@ -978,7 +978,7 @@
978978
<exclude>org.bouncycastle:bcprov-jdk15on</exclude>
979979
<exclude>org.bouncycastle:bcpkix-jdk15on</exclude>
980980
<exclude>org.bouncycastle:bctls-jdk15on</exclude>
981-
<exclude>mysql:mysql-connector-java</exclude>
981+
<exclude>com.mysql:mysql-connector-j</exclude>
982982
<exclude>org.apache.cloudstack:cloud-plugin-storage-volume-storpool</exclude>
983983
<exclude>org.apache.cloudstack:cloud-plugin-storage-volume-linstor</exclude>
984984
<exclude>org.apache.cloudstack:cloud-usage</exclude>

‎developer/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@
112112
<dependencies>
113113
<!-- specify the dependent jdbc driver here -->
114114
<dependency>
115-
<groupId>mysql</groupId>
116-
<artifactId>mysql-connector-java</artifactId>
115+
<groupId>com.mysql</groupId>
116+
<artifactId>mysql-connector-j</artifactId>
117117
<version>${cs.mysql.version}</version>
118118
</dependency>
119119
</dependencies>
@@ -180,8 +180,8 @@
180180
<version>1.2.1</version>
181181
<dependencies>
182182
<dependency>
183-
<groupId>mysql</groupId>
184-
<artifactId>mysql-connector-java</artifactId>
183+
<groupId>com.mysql</groupId>
184+
<artifactId>mysql-connector-j</artifactId>
185185
<version>${cs.mysql.version}</version>
186186
</dependency>
187187
</dependencies>
@@ -238,8 +238,8 @@
238238
<version>1.2.1</version>
239239
<dependencies>
240240
<dependency>
241-
<groupId>mysql</groupId>
242-
<artifactId>mysql-connector-java</artifactId>
241+
<groupId>com.mysql</groupId>
242+
<artifactId>mysql-connector-j</artifactId>
243243
<version>${cs.mysql.version}</version>
244244
</dependency>
245245
</dependencies>

‎engine/schema/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<version>${project.version}</version>
5050
</dependency>
5151
<dependency>
52-
<groupId>mysql</groupId>
53-
<artifactId>mysql-connector-java</artifactId>
52+
<groupId>com.mysql</groupId>
53+
<artifactId>mysql-connector-j</artifactId>
5454
</dependency>
5555
<dependency>
5656
<groupId>org.ini4j</groupId>

‎engine/schema/src/main/java/com/cloud/upgrade/DatabaseCreator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private static void runScript(Connection conn, Reader reader, String filename, b
7474

7575
private static void runQuery(String host, String port, String rootPassword, String query, boolean dryRun) {
7676
System.out.println("============> Running query: " + query);
77-
try (Connection conn = DriverManager.getConnection(String.format("jdbc:mysql://%s:%s/", host, port), "root", rootPassword);
77+
try (Connection conn = DriverManager.getConnection(String.format("jdbc:mysql://%s:%s/?" + TransactionLegacy.CONNECTION_PARAMS, host, port), "root", rootPassword);
7878
Statement stmt = conn.createStatement();){
7979
if (!dryRun)
8080
stmt.executeUpdate(query);

‎engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41900to41910.java‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,18 @@
1616
// under the License.
1717
package com.cloud.upgrade.dao;
1818

19+
import com.cloud.upgrade.SystemVmTemplateRegistration;
1920
import com.cloud.utils.exception.CloudRuntimeException;
2021

2122
import java.io.InputStream;
2223
import java.sql.Connection;
2324

24-
public class Upgrade41900to41910 implements DbUpgrade {
25+
public class Upgrade41900to41910 extends DbUpgradeAbstractImpl implements DbUpgrade, DbUpgradeSystemVmTemplate {
26+
private SystemVmTemplateRegistration systemVmTemplateRegistration;
2527

2628
@Override
2729
public String[] getUpgradableVersionRange() {
28-
return new String[] {"4.19.0.0", "4.19.1.0"};
30+
return new String[]{"4.19.0.0", "4.19.1.0"};
2931
}
3032

3133
@Override
@@ -46,11 +48,12 @@ public InputStream[] getPrepareScripts() {
4648
throw new CloudRuntimeException("Unable to find " + scriptFile);
4749
}
4850

49-
return new InputStream[] {script};
51+
return new InputStream[]{script};
5052
}
5153

5254
@Override
5355
public void performDataMigration(Connection conn) {
56+
addIndexes(conn);
5457
}
5558

5659
@Override
@@ -61,6 +64,25 @@ public InputStream[] getCleanupScripts() {
6164
throw new CloudRuntimeException("Unable to find " + scriptFile);
6265
}
6366

64-
return new InputStream[] {script};
67+
return new InputStream[]{script};
68+
}
69+
70+
private void addIndexes(Connection conn) {
71+
DbUpgradeUtils.addIndexIfNeeded(conn, "vm_stats", "vm_id");
72+
}
73+
74+
@Override
75+
public void updateSystemVmTemplates(Connection conn) {
76+
logger.debug("Updating System Vm template IDs");
77+
initSystemVmTemplateRegistration();
78+
try {
79+
systemVmTemplateRegistration.updateSystemVmTemplates(conn);
80+
} catch (Exception e) {
81+
throw new CloudRuntimeException("Failed to find / register SystemVM template(s)");
82+
}
83+
}
84+
85+
private void initSystemVmTemplateRegistration() {
86+
systemVmTemplateRegistration = new SystemVmTemplateRegistration("");
6587
}
6688
}

‎framework/db/src/main/java/com/cloud/utils/db/TransactionLegacy.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public class TransactionLegacy implements Closeable {
8383
public static final short SIMULATOR_DB = 3;
8484

8585
public static final short CONNECTED_DB = -1;
86+
public static final String CONNECTION_PARAMS = "scrollTolerantForwardOnly=true";
8687

8788
private static AtomicLong s_id = new AtomicLong();
8889
private static final TransactionMBeanImpl s_mbean = new TransactionMBeanImpl();
@@ -1212,6 +1213,9 @@ protected static String buildConnectionUri(String loadBalanceStrategy, String dr
12121213
connectionUri.append(loadBalanceStrategy);
12131214
}
12141215

1216+
connectionUri.append("&");
1217+
connectionUri.append(CONNECTION_PARAMS);
1218+
12151219
return connectionUri.toString();
12161220
}
12171221

@@ -1276,7 +1280,7 @@ private static String getDBHAParams(String dbName, Properties dbProps) {
12761280

12771281
@SuppressWarnings({"unchecked", "rawtypes"})
12781282
private static DataSource getDefaultDataSource(final String database) {
1279-
final ConnectionFactory connectionFactory = new DriverManagerConnectionFactory("jdbc:mysql://localhost:3306/" + database, "cloud", "cloud");
1283+
final ConnectionFactory connectionFactory = new DriverManagerConnectionFactory("jdbc:mysql://localhost:3306/" + database + "?" + CONNECTION_PARAMS, "cloud", "cloud");
12801284
final PoolableConnectionFactory poolableConnectionFactory = new PoolableConnectionFactory(connectionFactory, null);
12811285
final GenericObjectPool connectionPool = new GenericObjectPool(poolableConnectionFactory);
12821286
return new PoolingDataSource(connectionPool);

‎plugins/database/mysql-ha/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
</parent>
3030
<dependencies>
3131
<dependency>
32-
<groupId>mysql</groupId>
33-
<artifactId>mysql-connector-java</artifactId>
32+
<groupId>com.mysql</groupId>
33+
<artifactId>mysql-connector-j</artifactId>
3434
<scope>provided</scope>
3535
</dependency>
3636
</dependencies>

‎plugins/database/quota/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<version>${project.version}</version>
5050
</dependency>
5151
<dependency>
52-
<groupId>mysql</groupId>
53-
<artifactId>mysql-connector-java</artifactId>
52+
<groupId>com.mysql</groupId>
53+
<artifactId>mysql-connector-j</artifactId>
5454
<scope>provided</scope>
5555
</dependency>
5656
<dependency>

‎plugins/network-elements/juniper-contrail/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@
124124
<artifactId>reload4j</artifactId>
125125
</dependency>
126126
<dependency>
127-
<groupId>mysql</groupId>
128-
<artifactId>mysql-connector-java</artifactId>
127+
<groupId>com.mysql</groupId>
128+
<artifactId>mysql-connector-j</artifactId>
129129
<scope>provided</scope>
130130
</dependency>
131131
<dependency>

‎plugins/storage/volume/cloudbyte/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<version>${project.version}</version>
4040
</dependency>
4141
<dependency>
42-
<groupId>mysql</groupId>
43-
<artifactId>mysql-connector-java</artifactId>
42+
<groupId>com.mysql</groupId>
43+
<artifactId>mysql-connector-j</artifactId>
4444
<scope>provided</scope>
4545
</dependency>
4646
<dependency>

0 commit comments

Comments
 (0)