CLOUDSTACK-2664: Fixed delete query. Added log message when CloudRuntimeException is thrown during upgrade

Kishan Kavala · Kishan Kavala · commit 3b48299a0395 · 2013-05-24T12:37:18.000+05:30
diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -261,7 +261,10 @@ protected void upgrade(String dbVersion, String currentVersion) {
                 }
 
                 txn.commit();
-            } finally {
+            } catch (CloudRuntimeException e){
+                s_logger.error("Unable to upgrade the database", e);
+                throw new CloudRuntimeException("Unable to upgrade the database", e);
+            }finally {
                 txn.close();
             }
         }
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -759,7 +759,7 @@ private void removeFirewallServiceFromSharedNetworkOfferingWithSGService(Connect
             while (rs.next()) {
                 long id = rs.getLong(1);
                 // remove Firewall service for SG shared network offering
-                pstmt = conn.prepareStatement("DELETE `cloud`.`ntwk_offering_service_map` where network_offering_id=? and service='Firewall'");
+                pstmt = conn.prepareStatement("DELETE from `cloud`.`ntwk_offering_service_map` where network_offering_id=? and service='Firewall'");
                 pstmt.setLong(1, id);
                 pstmt.executeUpdate();
             }

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,10 @@ protected void upgrade(String dbVersion, String currentVersion) {`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`txn.commit();`
`264`		`- } finally {`
	`264`	`+ } catch (CloudRuntimeException e){`
	`265`	`+ s_logger.error("Unable to upgrade the database", e);`
	`266`	`+ throw new CloudRuntimeException("Unable to upgrade the database", e);`
	`267`	`+ }finally {`
`265`	`268`	`txn.close();`
`266`	`269`	`}`
`267`	`270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -759,7 +759,7 @@ private void removeFirewallServiceFromSharedNetworkOfferingWithSGService(Connect`
`759`	`759`	`while (rs.next()) {`
`760`	`760`	`long id = rs.getLong(1);`
`761`	`761`	`// remove Firewall service for SG shared network offering`
`762`		- pstmt = conn.prepareStatement("DELETE `cloud`.`ntwk_offering_service_map` where network_offering_id=? and service='Firewall'");
	`762`	+ pstmt = conn.prepareStatement("DELETE from `cloud`.`ntwk_offering_service_map` where network_offering_id=? and service='Firewall'");
`763`	`763`	`pstmt.setLong(1, id);`
`764`	`764`	`pstmt.executeUpdate();`
`765`	`765`	`}`