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

Added upgrade path from 2.2.7 to 2.2.8

This commit is contained in:
alena 2011-06-24 11:29:56 -07:00
parent 1db2667c54
commit 67be5512c8
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
View File

@ -43,7 +43,7 @@ import com.cloud.upgrade.dao.Upgrade221to222;
import com.cloud.upgrade.dao.Upgrade222to224;
import com.cloud.upgrade.dao.Upgrade224to225;
import com.cloud.upgrade.dao.Upgrade225to226;
import com.cloud.upgrade.dao.Upgrade226to227;
import com.cloud.upgrade.dao.Upgrade227to228;
import com.cloud.upgrade.dao.UpgradeSnapshot217to224;
import com.cloud.upgrade.dao.UpgradeSnapshot223to224;
import com.cloud.upgrade.dao.VersionDao;
@ -66,15 +66,16 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
public DatabaseUpgradeChecker() {
_dao = ComponentLocator.inject(VersionDaoImpl.class);
_upgradeMap.put("2.1.7", new DbUpgrade[] { new Upgrade217to218(), new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade226to227() });
_upgradeMap.put("2.1.8", new DbUpgrade[] { new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade226to227() });
_upgradeMap.put("2.1.9", new DbUpgrade[] { new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade226to227() });
_upgradeMap.put("2.2.1", new DbUpgrade[] { new Upgrade221to222(), new UpgradeSnapshot223to224(), new Upgrade222to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade226to227()});
_upgradeMap.put("2.2.2", new DbUpgrade[] { new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade226to227() });
_upgradeMap.put("2.2.3", new DbUpgrade[] { new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade226to227() });
_upgradeMap.put("2.2.4", new DbUpgrade[] { new Upgrade224to225(), new Upgrade225to226(), new Upgrade226to227() });
_upgradeMap.put("2.2.5", new DbUpgrade[] { new Upgrade225to226(), new Upgrade226to227() });
_upgradeMap.put("2.2.6", new DbUpgrade[] { new Upgrade226to227()});
_upgradeMap.put("2.1.7", new DbUpgrade[] { new Upgrade217to218(), new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228() });
_upgradeMap.put("2.1.8", new DbUpgrade[] { new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228() });
_upgradeMap.put("2.1.9", new DbUpgrade[] { new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228() });
_upgradeMap.put("2.2.1", new DbUpgrade[] { new Upgrade221to222(), new UpgradeSnapshot223to224(), new Upgrade222to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228()});
_upgradeMap.put("2.2.2", new DbUpgrade[] { new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228() });
_upgradeMap.put("2.2.3", new DbUpgrade[] { new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228() });
_upgradeMap.put("2.2.4", new DbUpgrade[] { new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228() });
_upgradeMap.put("2.2.5", new DbUpgrade[] { new Upgrade225to226(), new Upgrade227to228() });
_upgradeMap.put("2.2.6", new DbUpgrade[] { new Upgrade227to228()});
_upgradeMap.put("2.2.7", new DbUpgrade[] { new Upgrade227to228()});
}
protected void runScript(Connection conn, File file) {

14
server/src/com/cloud/upgrade/dao/Upgrade226to227.java → server/src/com/cloud/upgrade/dao/Upgrade227to228.java
View File

@ -39,8 +39,8 @@ import com.cloud.utils.component.Inject;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
public class Upgrade226to227 implements DbUpgrade {
final static Logger s_logger = Logger.getLogger(Upgrade226to227.class);
public class Upgrade227to228 implements DbUpgrade {
final static Logger s_logger = Logger.getLogger(Upgrade227to228.class);
@Inject
protected SnapshotDao _snapshotDao;
@Inject
@ -52,12 +52,12 @@ public class Upgrade226to227 implements DbUpgrade {
@Override
public String[] getUpgradableVersionRange() {
return new String[] {"2.2.5"};
return new String[] {"2.2.6, 2.2.7"};
}
@Override
public String getUpgradedVersion() {
return "2.2.6";
return "2.2.8";
}
@Override
@ -67,9 +67,9 @@ public class Upgrade226to227 implements DbUpgrade {
@Override
public File[] getPrepareScripts() {
String script = Script.findScript("", "db/schema-226to227.sql");
String script = Script.findScript("", "db/schema-227to228.sql");
if (script == null) {
throw new CloudRuntimeException("Unable to find db/schema-226to227.sql");
throw new CloudRuntimeException("Unable to find db/schema-227to228.sql");
}
return new File[] { new File(script) };
@ -143,7 +143,7 @@ public class Upgrade226to227 implements DbUpgrade {
keys.add("unique_name");
indexes.put("network_offerings", keys);
s_logger.debug("Dropping keys that don't exist in 2.2.7 version of the DB...");
s_logger.debug("Dropping keys that don't exist in 2.2.8 version of the DB...");
// drop indexes now
for (String tableName : indexes.keySet()) {

0
setup/db/db/schema-226to227.sql → setup/db/db/schema-227to228.sql
View File