You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/06/03 15:42:04 UTC
[1/2] git commit: updated refs/heads/4.4-forward to 0329beb
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward d511847cf -> 0329bebac
Fixed ResouceLeak on pstmtCidr in the function Upgrade430to440.moveCidrsToTheirOwnTable as reported by coverity
Fixed another leak which might occur due to outer while loop.
Signed-off-by: Daan Hoogland <da...@onecht.net>
(cherry picked from commit 004e0cbf61e9bf29bd716c8a0d7ac2f10c57433b)
(cherry picked from commit fa3bbe9a1946b3597fe5d1a8a448607d54106b7e)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bd5cd695
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bd5cd695
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bd5cd695
Branch: refs/heads/4.4-forward
Commit: bd5cd69517083112f7b56575ccc0cdba2220a44b
Parents: d511847
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Tue Jun 3 14:09:20 2014 +0530
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Jun 3 15:41:24 2014 +0200
----------------------------------------------------------------------
engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd5cd695/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
index 46dc03f..b6753b9 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
@@ -243,6 +243,9 @@ public class Upgrade430to440 implements DbUpgrade {
pstmtItem = conn.prepareStatement(networkAclItemSql);
rsItems = pstmtItem.executeQuery();
+ String networkAclItemCidrSql = "INSERT INTO `cloud`.`network_acl_item_cidrs` (network_acl_item_id, cidr) VALUES (?,?)";
+ pstmtCidr = conn.prepareStatement(networkAclItemCidrSql);
+
// for each network acl item
while(rsItems.next()) {
long itemId = rsItems.getLong(1);
@@ -252,8 +255,6 @@ public class Upgrade430to440 implements DbUpgrade {
// split it
String[] cidrArray = cidrList.split(",");
// insert a record per cidr
- String networkAclItemCidrSql = "INSERT INTO `cloud`.`network_acl_item_cidrs` (network_acl_item_id, cidr) VALUES (?,?)";
- pstmtCidr = conn.prepareStatement(networkAclItemCidrSql);
pstmtCidr.setLong(1, itemId);
for (String cidr : cidrArray) {
pstmtCidr.setString(2, cidr);
[2/2] git commit: updated refs/heads/4.4-forward to 0329beb
Posted by da...@apache.org.
update vlan uris
Conflicts:
engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
(cherry picked from commit 44012ddadfd73e76b3750e7ce1e6b4aa24d74796)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0329beba
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0329beba
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0329beba
Branch: refs/heads/4.4-forward
Commit: 0329bebac5aa7dd68d7d9350d3a2cc609ce5e4a9
Parents: bd5cd69
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri May 30 22:32:37 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Jun 3 15:41:47 2014 +0200
----------------------------------------------------------------------
.../com/cloud/upgrade/dao/Upgrade430to440.java | 38 +++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0329beba/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
index b6753b9..a3ac447 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
@@ -26,6 +26,7 @@ import java.sql.SQLException;
import org.apache.log4j.Logger;
import com.cloud.network.Network;
+import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
@@ -62,7 +63,7 @@ public class Upgrade430to440 implements DbUpgrade {
secondaryIpsAccountAndDomainIdsUpdate(conn);
moveCidrsToTheirOwnTable(conn);
addExtractTemplateAndVolumeColumns(conn);
-
+ updateVlanUris(conn);
}
private void addExtractTemplateAndVolumeColumns(Connection conn) {
@@ -283,6 +284,41 @@ public class Upgrade430to440 implements DbUpgrade {
s_logger.debug("Done moving network acl item cidrs to a row per cidr");
}
+ private void updateVlanUris(Connection conn) {
+ s_logger.debug("updating vlan URIs");
+ PreparedStatement pstmt = null;
+ ResultSet rs = null;
+ try {
+ pstmt = conn.prepareStatement("SELECT id, vlan_id FROM `cloud`.`vlan` where vlan_id not like '%:%'");
+ rs = pstmt.executeQuery();
+ while (rs.next()) {
+ long id = rs.getLong(1);
+ String vlan = rs.getString(2);
+ if (vlan == null || "".equals(vlan)) {
+ continue;
+ }
+ String vlanUri = BroadcastDomainType.Vlan.toUri(vlan).toString();
+ pstmt = conn.prepareStatement("update `cloud`.`vlan` set vlan_id=? where id=?");
+ pstmt.setString(1, vlanUri);
+ pstmt.setLong(2, id);
+ pstmt.executeUpdate();
+ }
+ } catch (SQLException e) {
+ throw new CloudRuntimeException("Unable to update vlan URIs ", e);
+ } finally {
+ try {
+ if (rs != null) {
+ rs.close();
+ }
+
+ if (pstmt != null) {
+ pstmt.close();
+ }
+ } catch (SQLException e) {
+ }
+ }
+ s_logger.debug("Done updateing vlan URIs");
+ }
@Override
public File[] getCleanupScripts() {