etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-8656: 30x legacy upgrade code exception messages

This commit is contained in:
Daan Hoogland 2015-08-03 19:35:41 +02:00
parent 8e3b99d0d6
commit f221b9a423
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/schema/src/com/cloud/upgrade/dao/Upgrade306to307.java
View File

@ -28,7 +28,7 @@ import org.apache.log4j.Logger;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
public class Upgrade306to307 extends Upgrade30xBase implements DbUpgrade {
public class Upgrade306to307 extends Upgrade30xBase {
final static Logger s_logger = Logger.getLogger(Upgrade306to307.class);
@Override
@ -97,6 +97,7 @@ public class Upgrade306to307 extends Upgrade30xBase implements DbUpgrade {
pstmt = conn.prepareStatement("drop table `cloud`.`network_details`");
pstmt.executeUpdate();
} catch (SQLException e) {
s_logger.info("[ignored] error during network offering update:" + e.getLocalizedMessage(), e);
} finally {
closeAutoCloseable(rs);
closeAutoCloseable(rs1);

19
engine/schema/src/com/cloud/upgrade/dao/Upgrade30to301.java
View File

@ -28,7 +28,7 @@ import com.cloud.configuration.Resource.ResourceType;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
public class Upgrade30to301 implements DbUpgrade {
public class Upgrade30to301 extends LegacyDbUpgrade {
final static Logger s_logger = Logger.getLogger(Upgrade30to301.class);
@Override
@ -100,20 +100,9 @@ public class Upgrade30to301 implements DbUpgrade {
} catch (SQLException e) {
throw new CloudRuntimeException("Unable to update network resource count for account id=" + accountId, e);
} finally {
try {
if (rs != null) {
rs.close();
}
if (rs1 != null) {
rs1.close();
}
if (pstmt != null) {
pstmt.close();
}
} catch (SQLException e) {
}
closeAutoCloseable(rs);
closeAutoCloseable(rs1);
closeAutoCloseable(pstmt);
}
}