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

bug CS-14532: during 2211-2212 upgrade, do not add resource count entries for resourceTypes that were added in later releases 

status CS-14532: resolved fixed
reviewed-by: Nitin
This commit is contained in:
kishan 2012-04-18 15:39:21 +05:30
parent 08bda90268
commit 7be811905f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/com/cloud/upgrade/dao/Upgrade2211to2212.java
View File

@ -89,17 +89,20 @@ public class Upgrade2211to2212 implements DbUpgrade {
}
rs.close();
//2.2.12 resource types
String[] resourceTypes = {"user_vm", "public_ip", "volume", "snapshot", "template"};
for (Long accountId : accounts) {
for (ResourceType resourceType : Resource.ResourceType.values()) {
for (String resourceType : resourceTypes) {
pstmt = conn.prepareStatement("SELECT * FROM resource_count WHERE type=? and account_id=?");
pstmt.setString(1, resourceType.toString());
pstmt.setString(1, resourceType);
pstmt.setLong(2, accountId);
rs = pstmt.executeQuery();
if (!rs.next()) {
s_logger.debug("Inserting resource_count record of type " + resourceType + " for account id=" + accountId);
pstmt = conn.prepareStatement("INSERT INTO resource_count (account_id, domain_id, type, count) VALUES (?, null, ?, 0)");
pstmt.setLong(1, accountId);
pstmt.setString(2, resourceType.toString());
pstmt.setString(2, resourceType);
pstmt.executeUpdate();
}
rs.close();
@ -108,16 +111,16 @@ public class Upgrade2211to2212 implements DbUpgrade {
}
for (Long domainId : domains) {
for (ResourceType resourceType : Resource.ResourceType.values()) {
for (String resourceType : resourceTypes) {
pstmt = conn.prepareStatement("SELECT * FROM resource_count WHERE type=? and domain_id=?");
pstmt.setString(1, resourceType.toString());
pstmt.setString(1, resourceType);
pstmt.setLong(2, domainId);
rs = pstmt.executeQuery();
if (!rs.next()) {
s_logger.debug("Inserting resource_count record of type " + resourceType + " for domain id=" + domainId);
pstmt = conn.prepareStatement("INSERT INTO resource_count (account_id, domain_id, type, count) VALUES (null, ?, ?, 0)");
pstmt.setLong(1, domainId);
pstmt.setString(2, resourceType.toString());
pstmt.setString(2, resourceType);
pstmt.executeUpdate();
}
rs.close();