You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2014/01/17 08:21:39 UTC
[2/2] git commit: updated refs/heads/master to c0f6065
CLOUDSTACK-5690: Added upgarde template support for 4.3 64 bit templates. Changed min required version for VR to 4.3
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c0f60651
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c0f60651
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c0f60651
Branch: refs/heads/master
Commit: c0f60651b94828d52407b3a6b6c47c451dabb45f
Parents: 008b029
Author: Kishan Kavala <ki...@cloud.com>
Authored: Fri Jan 17 12:51:16 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Fri Jan 17 12:51:16 2014 +0530
----------------------------------------------------------------------
.../network/VirtualNetworkApplianceService.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 170 -------------------
.../com/cloud/upgrade/dao/Upgrade421to430.java | 137 +++++++++++++++
3 files changed, 138 insertions(+), 171 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0f60651/api/src/com/cloud/network/VirtualNetworkApplianceService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/VirtualNetworkApplianceService.java b/api/src/com/cloud/network/VirtualNetworkApplianceService.java
index fa3ef6d..a9d9c52 100644
--- a/api/src/com/cloud/network/VirtualNetworkApplianceService.java
+++ b/api/src/com/cloud/network/VirtualNetworkApplianceService.java
@@ -69,5 +69,5 @@ public interface VirtualNetworkApplianceService {
List<Long> upgradeRouterTemplate(UpgradeRouterTemplateCmd cmd);
- public static final String MinVRVersion = "4.2.0";
+ public static final String MinVRVersion = "4.3.0";
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0f60651/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index a933d03..82b6d84 100755
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -27,11 +27,9 @@ import java.sql.SQLException;
import java.sql.Types;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.UUID;
import org.apache.log4j.Logger;
@@ -83,7 +81,6 @@ public class Upgrade410to420 implements DbUpgrade {
persistVswitchConfiguration(conn);
createPlaceHolderNics(conn);
updateRemoteAccessVpn(conn);
- updateSystemVmTemplates(conn);
updateOverCommitRatioClusterDetails(conn);
updatePrimaryStore(conn);
addEgressFwRulesForSRXGuestNw(conn);
@@ -634,173 +631,6 @@ public class Upgrade410to420 implements DbUpgrade {
}
- private void updateSystemVmTemplates(Connection conn) {
- // TODO: system vm template migration after storage refactoring
- PreparedStatement pstmt = null;
- ResultSet rs = null;
- s_logger.debug("Updating System Vm template IDs");
- try {
- //Get all hypervisors in use
- Set<HypervisorType> hypervisorsListInUse = new HashSet<HypervisorType>();
- try {
- pstmt = conn.prepareStatement("select distinct(hypervisor_type) from `cloud`.`cluster` where removed is null");
- rs = pstmt.executeQuery();
- while (rs.next()) {
- switch (HypervisorType.getType(rs.getString(1))) {
- case XenServer:
- hypervisorsListInUse.add(HypervisorType.XenServer);
- break;
- case KVM:
- hypervisorsListInUse.add(HypervisorType.KVM);
- break;
- case VMware:
- hypervisorsListInUse.add(HypervisorType.VMware);
- break;
- case Hyperv:
- hypervisorsListInUse.add(HypervisorType.Hyperv);
- break;
- case LXC:
- hypervisorsListInUse.add(HypervisorType.LXC);
- break;
- }
- }
- } catch (SQLException e) {
- throw new CloudRuntimeException("Error while listing hypervisors in use", e);
- }
-
- Map<HypervisorType, String> NewTemplateNameList = new HashMap<HypervisorType, String>() {
- {
- put(HypervisorType.XenServer, "systemvm-xenserver-4.2");
- put(HypervisorType.VMware, "systemvm-vmware-4.2");
- put(HypervisorType.KVM, "systemvm-kvm-4.2");
- put(HypervisorType.LXC, "systemvm-lxc-4.2");
- put(HypervisorType.Hyperv, "systemvm-hyperv-4.2");
- }
- };
-
- Map<HypervisorType, String> routerTemplateConfigurationNames = new HashMap<HypervisorType, String>() {
- {
- put(HypervisorType.XenServer, "router.template.xen");
- put(HypervisorType.VMware, "router.template.vmware");
- put(HypervisorType.KVM, "router.template.kvm");
- put(HypervisorType.LXC, "router.template.lxc");
- put(HypervisorType.Hyperv, "router.template.hyperv");
- }
- };
-
- Map<HypervisorType, String> newTemplateUrl = new HashMap<HypervisorType, String>() {
- {
- put(HypervisorType.XenServer, "http://download.cloud.com/templates/4.2/systemvmtemplate-2013-07-12-master-xen.vhd.bz2");
- put(HypervisorType.VMware, "http://download.cloud.com/templates/4.2/systemvmtemplate-4.2-vh7.ova");
- put(HypervisorType.KVM, "http://download.cloud.com/templates/4.2/systemvmtemplate-2013-06-12-master-kvm.qcow2.bz2");
- put(HypervisorType.LXC, "http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2");
- put(HypervisorType.Hyperv, "http://download.cloud.com/templates/4.2/systemvmtemplate-2013-06-12-master-xen.vhd.bz2");
- }
- };
-
- Map<HypervisorType, String> newTemplateChecksum = new HashMap<HypervisorType, String>() {
- {
- put(HypervisorType.XenServer, "fb1b6e032a160d86f2c28feb5add6d83");
- put(HypervisorType.VMware, "8fde62b1089e5844a9cd3b9b953f9596");
- put(HypervisorType.KVM, "6cea42b2633841648040becb588bd8f0");
- put(HypervisorType.LXC, "2755de1f9ef2ce4d6f2bee2efbb4da92");
- put(HypervisorType.Hyperv, "fb1b6e032a160d86f2c28feb5add6d83");
- }
- };
-
- for (Map.Entry<HypervisorType, String> hypervisorAndTemplateName : NewTemplateNameList.entrySet()) {
- s_logger.debug("Updating " + hypervisorAndTemplateName.getKey() + " System Vms");
- try {
- //Get 4.2.0 system Vm template Id for corresponding hypervisor
- pstmt = conn.prepareStatement("select id from `cloud`.`vm_template` where name = ? and removed is null order by id desc limit 1");
- pstmt.setString(1, hypervisorAndTemplateName.getValue());
- rs = pstmt.executeQuery();
- if (rs.next()) {
- long templateId = rs.getLong(1);
- rs.close();
- pstmt.close();
- // Mark the old system templates as removed
- pstmt =
- conn.prepareStatement("UPDATE `cloud`.`vm_template` SET removed = now() WHERE hypervisor_type = ? AND type = 'SYSTEM' AND removed is null");
- pstmt.setString(1, hypervisorAndTemplateName.getKey().toString());
- pstmt.executeUpdate();
- pstmt.close();
- // change template type to SYSTEM
- pstmt = conn.prepareStatement("update `cloud`.`vm_template` set type='SYSTEM' where id = ?");
- pstmt.setLong(1, templateId);
- pstmt.executeUpdate();
- pstmt.close();
- // update templete ID of system Vms
- pstmt = conn.prepareStatement("update `cloud`.`vm_instance` set vm_template_id = ? where type <> 'User' and hypervisor_type = ?");
- pstmt.setLong(1, templateId);
- pstmt.setString(2, hypervisorAndTemplateName.getKey().toString());
- pstmt.executeUpdate();
- pstmt.close();
- // Change value of global configuration parameter router.template.* for the corresponding hypervisor
- pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = ? WHERE name = ?");
- pstmt.setString(1, hypervisorAndTemplateName.getValue());
- pstmt.setString(2, routerTemplateConfigurationNames.get(hypervisorAndTemplateName.getKey()));
- pstmt.executeUpdate();
- pstmt.close();
- } else {
- if (hypervisorsListInUse.contains(hypervisorAndTemplateName.getKey())) {
- throw new CloudRuntimeException("4.2.0 " + hypervisorAndTemplateName.getKey() + " SystemVm template not found. Cannot upgrade system Vms");
- } else {
- s_logger.warn("4.2.0 " + hypervisorAndTemplateName.getKey() + " SystemVm template not found. " + hypervisorAndTemplateName.getKey() +
- " hypervisor is not used, so not failing upgrade");
- // Update the latest template URLs for corresponding hypervisor
- pstmt =
- conn.prepareStatement("UPDATE `cloud`.`vm_template` SET url = ? , checksum = ? WHERE hypervisor_type = ? AND type = 'SYSTEM' AND removed is null order by id desc limit 1");
- pstmt.setString(1, newTemplateUrl.get(hypervisorAndTemplateName.getKey()));
- pstmt.setString(2, newTemplateChecksum.get(hypervisorAndTemplateName.getKey()));
- pstmt.setString(3, hypervisorAndTemplateName.getKey().toString());
- pstmt.executeUpdate();
- pstmt.close();
- }
- }
- } catch (SQLException e) {
- throw new CloudRuntimeException("Error while updating " + hypervisorAndTemplateName.getKey() + " systemVm template", e);
- }
- }
- try {
- pstmt = conn.prepareStatement("UPDATE `cloud`.`vm_template` set dynamically_scalable = 1 where name = ? and type = 'SYSTEM'");
- pstmt.setString(1, NewTemplateNameList.get(HypervisorType.VMware));
- pstmt.executeUpdate();
- pstmt.close();
- } catch (SQLException e) {
- throw new CloudRuntimeException("Error while updating dynamically_scalable flag to 1 for SYSTEM template systemvm-vmware-4.2");
- }
- s_logger.debug("Updating System Vm Template IDs Complete");
- } finally {
- try {
- if (rs != null) {
- rs.close();
- }
-
- if (pstmt != null) {
- pstmt.close();
- }
- } catch (SQLException e) {
- }
- }
- /*
- pstmt = null;
- try {
- pstmt = conn.prepareStatement("update vm_template set image_data_store_id = 1 where type = 'SYSTEM' or type = 'BUILTIN'");
- pstmt.executeUpdate();
- } catch (SQLException e) {
- throw new CloudRuntimeException("Failed to upgrade vm template data store uuid: " + e.toString());
- } finally {
- if (pstmt != null) {
- try {
- pstmt.close();
- } catch (SQLException e) {
- }
- }
- }
- */
- }
-
//KVM snapshot flag: only turn on if Customers is using snapshot;
private void setKVMSnapshotFlag(Connection conn) {
s_logger.debug("Verify and set the KVM snapshot flag if snapshot was used. ");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0f60651/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
index 9702792..a9735c3 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
@@ -24,7 +24,12 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import com.cloud.hypervisor.Hypervisor;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -64,6 +69,7 @@ public class Upgrade421to430 implements DbUpgrade {
public void performDataMigration(Connection conn) {
encryptLdapConfigParams(conn);
upgradeMemoryOfSsvmOffering(conn);
+ updateSystemVmTemplates(conn);
}
private void upgradeMemoryOfSsvmOffering(Connection conn) {
@@ -183,6 +189,137 @@ public class Upgrade421to430 implements DbUpgrade {
}
+ private void updateSystemVmTemplates(Connection conn) {
+ PreparedStatement pstmt = null;
+ ResultSet rs = null;
+ s_logger.debug("Updating System Vm template IDs");
+ try{
+ //Get all hypervisors in use
+ Set<Hypervisor.HypervisorType> hypervisorsListInUse = new HashSet<Hypervisor.HypervisorType>();
+ try {
+ pstmt = conn.prepareStatement("select distinct(hypervisor_type) from `cloud`.`cluster` where removed is null");
+ rs = pstmt.executeQuery();
+ while(rs.next()){
+ switch (Hypervisor.HypervisorType.getType(rs.getString(1))) {
+ case XenServer: hypervisorsListInUse.add(Hypervisor.HypervisorType.XenServer);
+ break;
+ case KVM: hypervisorsListInUse.add(Hypervisor.HypervisorType.KVM);
+ break;
+ case VMware: hypervisorsListInUse.add(Hypervisor.HypervisorType.VMware);
+ break;
+ case Hyperv: hypervisorsListInUse.add(Hypervisor.HypervisorType.Hyperv);
+ break;
+ case LXC: hypervisorsListInUse.add(Hypervisor.HypervisorType.LXC);
+ break;
+ }
+ }
+ } catch (SQLException e) {
+ throw new CloudRuntimeException("Error while listing hypervisors in use", e);
+ }
+
+ Map<Hypervisor.HypervisorType, String> NewTemplateNameList = new HashMap<Hypervisor.HypervisorType, String>(){
+ { put(Hypervisor.HypervisorType.XenServer, "systemvm-xenserver-4.3");
+ put(Hypervisor.HypervisorType.VMware, "systemvm-vmware-4.3");
+ put(Hypervisor.HypervisorType.KVM, "systemvm-kvm-4.3");
+ put(Hypervisor.HypervisorType.LXC, "systemvm-lxc-4.3");
+ put(Hypervisor.HypervisorType.Hyperv, "systemvm-hyperv-4.3");
+ }
+ };
+
+ Map<Hypervisor.HypervisorType, String> routerTemplateConfigurationNames = new HashMap<Hypervisor.HypervisorType, String>(){
+ { put(Hypervisor.HypervisorType.XenServer, "router.template.xen");
+ put(Hypervisor.HypervisorType.VMware, "router.template.vmware");
+ put(Hypervisor.HypervisorType.KVM, "router.template.kvm");
+ put(Hypervisor.HypervisorType.LXC, "router.template.lxc");
+ put(Hypervisor.HypervisorType.Hyperv, "router.template.hyperv");
+ }
+ };
+
+ Map<Hypervisor.HypervisorType, String> newTemplateUrl = new HashMap<Hypervisor.HypervisorType, String>(){
+ { put(Hypervisor.HypervisorType.XenServer, "http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2");
+ put(Hypervisor.HypervisorType.VMware, "http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-vh7.ova");
+ put(Hypervisor.HypervisorType.KVM, "http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2");
+ put(Hypervisor.HypervisorType.LXC, "http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2");
+ put(Hypervisor.HypervisorType.Hyperv, "http://download.cloud.com/templates/4.3/systemvm64template-2013-12-23-hyperv.vhd.bz2");
+ }
+ };
+
+ Map<Hypervisor.HypervisorType, String> newTemplateChecksum = new HashMap<Hypervisor.HypervisorType, String>(){
+ { put(Hypervisor.HypervisorType.XenServer, "74b92f031cc5c2089ee89efb81344dcf");
+ put(Hypervisor.HypervisorType.VMware, "8fde62b1089e5844a9cd3b9b953f9596");
+ put(Hypervisor.HypervisorType.KVM, "85a1bed07bf43cbf022451cb2ecae4ff");
+ put(Hypervisor.HypervisorType.LXC, "85a1bed07bf43cbf022451cb2ecae4ff");
+ put(Hypervisor.HypervisorType.Hyperv, "5df45ee6ebe1b703a8805f4e1f4d0818");
+ }
+ };
+
+ for (Map.Entry<Hypervisor.HypervisorType, String> hypervisorAndTemplateName : NewTemplateNameList.entrySet()){
+ s_logger.debug("Updating " + hypervisorAndTemplateName.getKey() + " System Vms");
+ try {
+ //Get 4.3.0 system Vm template Id for corresponding hypervisor
+ pstmt = conn.prepareStatement("select id from `cloud`.`vm_template` where name = ? and removed is null order by id desc limit 1");
+ pstmt.setString(1, hypervisorAndTemplateName.getValue());
+ rs = pstmt.executeQuery();
+ if(rs.next()){
+ long templateId = rs.getLong(1);
+ rs.close();
+ pstmt.close();
+ // Mark the old system templates as removed
+ pstmt = conn.prepareStatement("UPDATE `cloud`.`vm_template` SET removed = now() WHERE hypervisor_type = ? AND type = 'SYSTEM' AND removed is null");
+ pstmt.setString(1, hypervisorAndTemplateName.getKey().toString());
+ pstmt.executeUpdate();
+ pstmt.close();
+ // change template type to SYSTEM
+ pstmt = conn.prepareStatement("update `cloud`.`vm_template` set type='SYSTEM' where id = ?");
+ pstmt.setLong(1, templateId);
+ pstmt.executeUpdate();
+ pstmt.close();
+ // update templete ID of system Vms
+ pstmt = conn.prepareStatement("update `cloud`.`vm_instance` set vm_template_id = ? where type <> 'User' and hypervisor_type = ?");
+ pstmt.setLong(1, templateId);
+ pstmt.setString(2, hypervisorAndTemplateName.getKey().toString());
+ pstmt.executeUpdate();
+ pstmt.close();
+ // Change value of global configuration parameter router.template.* for the corresponding hypervisor
+ pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = ? WHERE name = ?");
+ pstmt.setString(1, hypervisorAndTemplateName.getValue());
+ pstmt.setString(2, routerTemplateConfigurationNames.get(hypervisorAndTemplateName.getKey()));
+ pstmt.executeUpdate();
+ pstmt.close();
+ } else {
+ if (hypervisorsListInUse.contains(hypervisorAndTemplateName.getKey())){
+ throw new CloudRuntimeException("4.3.0 " + hypervisorAndTemplateName.getKey() + " SystemVm template not found. Cannot upgrade system Vms");
+ } else {
+ s_logger.warn("4.3.0 " + hypervisorAndTemplateName.getKey() + " SystemVm template not found. " + hypervisorAndTemplateName.getKey() + " hypervisor is not used, so not failing upgrade");
+ // Update the latest template URLs for corresponding hypervisor
+ pstmt = conn.prepareStatement("UPDATE `cloud`.`vm_template` SET url = ? , checksum = ? WHERE hypervisor_type = ? AND type = 'SYSTEM' AND removed is null order by id desc limit 1");
+ pstmt.setString(1, newTemplateUrl.get(hypervisorAndTemplateName.getKey()));
+ pstmt.setString(2, newTemplateChecksum.get(hypervisorAndTemplateName.getKey()));
+ pstmt.setString(3, hypervisorAndTemplateName.getKey().toString());
+ pstmt.executeUpdate();
+ pstmt.close();
+ }
+ }
+ } catch (SQLException e) {
+ throw new CloudRuntimeException("Error while updating "+ hypervisorAndTemplateName.getKey() +" systemVm template", e);
+ }
+ }
+ s_logger.debug("Updating System Vm Template IDs Complete");
+ }
+ finally {
+ try {
+ if (rs != null) {
+ rs.close();
+ }
+
+ if (pstmt != null) {
+ pstmt.close();
+ }
+ } catch (SQLException e) {
+ }
+ }
+ }
+
@Override
public File[] getCleanupScripts() {
String script = Script.findScript("", "db/schema-421to430-cleanup.sql");