You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/20 10:32:18 UTC
[1/2] git commit: updated refs/heads/4.6 to 4df60db
Repository: cloudstack
Updated Branches:
refs/heads/4.6 78e551874 -> 4df60db7d
CLOUDSTACK-9057 remove old system vm upgrade code
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d6e77624
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d6e77624
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d6e77624
Branch: refs/heads/4.6
Commit: d6e77624d973062da6cefd5083b8479eec729617
Parents: f6db0a2
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Nov 11 15:02:28 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Nov 16 10:46:02 2015 +0000
----------------------------------------------------------------------
.../com/cloud/upgrade/dao/Upgrade442to450.java | 151 +------------------
1 file changed, 1 insertion(+), 150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6e77624/engine/schema/src/com/cloud/upgrade/dao/Upgrade442to450.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade442to450.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade442to450.java
index 931e353..a9fb089 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade442to450.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade442to450.java
@@ -25,16 +25,12 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-
-import com.cloud.hypervisor.Hypervisor;
-import com.cloud.utils.crypt.DBEncryptionUtil;
import org.apache.log4j.Logger;
+import com.cloud.utils.crypt.DBEncryptionUtil;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
@@ -68,7 +64,6 @@ public class Upgrade442to450 implements DbUpgrade {
@Override
public void performDataMigration(Connection conn) {
- updateSystemVmTemplates(conn);
dropInvalidKeyFromStoragePoolTable(conn);
dropDuplicatedForeignKeyFromAsyncJobTable(conn);
updateMaxRouterSizeConfig(conn);
@@ -152,150 +147,6 @@ public class Upgrade442to450 implements DbUpgrade {
return new File[] {new File(script)};
}
- private void updateSystemVmTemplates(Connection conn) {
- s_logger.debug("Updating System Vm template IDs");
- //Get all hypervisors in use
- Set<Hypervisor.HypervisorType> hypervisorsListInUse = new HashSet<Hypervisor.HypervisorType>();
- try (PreparedStatement pstmt = conn.prepareStatement("select distinct(hypervisor_type) from `cloud`.`cluster` where removed is null");
- ResultSet 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;
- default: // no action on cases Any, BareMetal, None, Ovm, Parralels, Simulator and VirtualBox:
- break;
- }
- }
- } catch (SQLException e) {
- s_logger.error("updateSystemVmTemplates:Exception while getting hypervisor types from clusters: "+e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates:Exception while getting hypervisor types from clusters", e);
- }
-
- Map<Hypervisor.HypervisorType, String> NewTemplateNameList = new HashMap<Hypervisor.HypervisorType, String>() {
- {
- put(Hypervisor.HypervisorType.XenServer, "systemvm-xenserver-4.5");
- put(Hypervisor.HypervisorType.VMware, "systemvm-vmware-4.5");
- put(Hypervisor.HypervisorType.KVM, "systemvm-kvm-4.5");
- put(Hypervisor.HypervisorType.LXC, "systemvm-lxc-4.5");
- put(Hypervisor.HypervisorType.Hyperv, "systemvm-hyperv-4.5");
- }
- };
-
- 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.5/systemvm64template-4.5-xen.vhd.bz2");
- put(Hypervisor.HypervisorType.VMware, "http://download.cloud.com/templates/4.5/systemvm64template-4.5-vmware.ova");
- put(Hypervisor.HypervisorType.KVM, "http://download.cloud.com/templates/4.5/systemvm64template-4.5-kvm.qcow2.bz2");
- put(Hypervisor.HypervisorType.LXC, "http://download.cloud.com/templates/4.5/systemvm64template-4.5-kvm.qcow2.bz2");
- put(Hypervisor.HypervisorType.Hyperv, "http://download.cloud.com/templates/4.5/systemvm64template-4.5-hyperv.vhd.zip");
- }
- };
-
- Map<Hypervisor.HypervisorType, String> newTemplateChecksum = new HashMap<Hypervisor.HypervisorType, String>() {
- {
- put(Hypervisor.HypervisorType.XenServer, "2b15ab4401c2d655264732d3fc600241");
- put(Hypervisor.HypervisorType.VMware, "3106a79a4ce66cd7f6a7c50e93f2db57");
- put(Hypervisor.HypervisorType.KVM, "aa9f501fecd3de1daeb9e2f357f6f002");
- put(Hypervisor.HypervisorType.LXC, "aa9f501fecd3de1daeb9e2f357f6f002");
- put(Hypervisor.HypervisorType.Hyperv, "70bd30ea02ee9ed67d2c6b85c179cee9");
- }
- };
-
- for (Map.Entry<Hypervisor.HypervisorType, String> hypervisorAndTemplateName : NewTemplateNameList.entrySet()) {
- s_logger.debug("Updating " + hypervisorAndTemplateName.getKey() + " System Vms");
- try (PreparedStatement pstmt = conn.prepareStatement("select id from `cloud`.`vm_template` where name = ? and removed is null order by id desc limit 1")) {
- //Get 4.5.0 system Vm template Id for corresponding hypervisor
- long templateId = -1;
- pstmt.setString(1, hypervisorAndTemplateName.getValue());
- try (ResultSet rs = pstmt.executeQuery()) {
- if(rs.next()){
- templateId = rs.getLong(1);
- }
- } catch (SQLException e)
- {
- s_logger.error("updateSystemVmTemplates:Exception while getting ids of templates: "+e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates:Exception while getting ids of templates", e);
- }
-
- // change template type to SYSTEM
- if (templateId != -1) {
- try(PreparedStatement templ_type_pstmt = conn.prepareStatement("update `cloud`.`vm_template` set type='SYSTEM' where id = ?");)
- {
- templ_type_pstmt.setLong(1, templateId);
- templ_type_pstmt.executeUpdate();
- }
- catch (SQLException e)
- {
- s_logger.error("updateSystemVmTemplates:Exception while updating template with id " + templateId + " to be marked as 'system': "+e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates:Exception while updating template with id " + templateId + " to be marked as 'system'", e);
- }
- // update template ID of system Vms
- try(PreparedStatement update_templ_id_pstmt = conn.prepareStatement("update `cloud`.`vm_instance` set vm_template_id = ? where type <> 'User' and hypervisor_type = ?");)
- {
- update_templ_id_pstmt.setLong(1, templateId);
- update_templ_id_pstmt.setString(2, hypervisorAndTemplateName.getKey().toString());
- update_templ_id_pstmt.executeUpdate();
- }catch (Exception e)
- {
- s_logger.error("updateSystemVmTemplates:Exception while setting template for " + hypervisorAndTemplateName.getKey().toString() + " to " + templateId + ": "+e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates:Exception while setting template for " + hypervisorAndTemplateName.getKey().toString() + " to " + templateId, e);
- }
- // Change value of global configuration parameter router.template.* for the corresponding hypervisor
- try(PreparedStatement update_pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = ? WHERE name = ?");) {
- update_pstmt.setString(1, hypervisorAndTemplateName.getValue());
- update_pstmt.setString(2, routerTemplateConfigurationNames.get(hypervisorAndTemplateName.getKey()));
- update_pstmt.executeUpdate();
- }catch (SQLException e)
- {
- s_logger.error("updateSystemVmTemplates:Exception while setting " + routerTemplateConfigurationNames.get(hypervisorAndTemplateName.getKey()) + " to " + hypervisorAndTemplateName.getValue() + ": "+e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates:Exception while setting " + routerTemplateConfigurationNames.get(hypervisorAndTemplateName.getKey()) + " to " + hypervisorAndTemplateName.getValue(), e);
- }
- } else {
- if (hypervisorsListInUse.contains(hypervisorAndTemplateName.getKey())){
- throw new CloudRuntimeException("4.5.0 " + hypervisorAndTemplateName.getKey() + " SystemVm template not found. Cannot upgrade system Vms");
- } else {
- s_logger.warn("4.5.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
- try(PreparedStatement update_templ_url_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");) {
- update_templ_url_pstmt.setString(1, newTemplateUrl.get(hypervisorAndTemplateName.getKey()));
- update_templ_url_pstmt.setString(2, newTemplateChecksum.get(hypervisorAndTemplateName.getKey()));
- update_templ_url_pstmt.setString(3, hypervisorAndTemplateName.getKey().toString());
- update_templ_url_pstmt.executeUpdate();
- }catch (SQLException e)
- {
- s_logger.error("updateSystemVmTemplates:Exception while updating 'url' and 'checksum' for hypervisor type " + hypervisorAndTemplateName.getKey().toString() + ": "+e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates:Exception while updating 'url' and 'checksum' for hypervisor type " + hypervisorAndTemplateName.getKey().toString(), e);
- }
- }
- }
- } catch (SQLException e) {
- s_logger.error("updateSystemVmTemplates:Exception while getting ids of templates: "+e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates:Exception while getting ids of templates", e);
- }
- }
- s_logger.debug("Updating System Vm Template IDs Complete");
- }
-
-
private void dropInvalidKeyFromStoragePoolTable(Connection conn) {
HashMap<String, List<String>> uniqueKeys = new HashMap<String, List<String>>();
List<String> keys = new ArrayList<String>();
[2/2] git commit: updated refs/heads/4.6 to 4df60db
Posted by re...@apache.org.
Merge pull request #1072 from DaanHoogland/CLOUDSTACK-9057
CLOUDSTACK-9057 remove old system vm upgrade codereplacing #1061 on release branch for 4.6
* pr/1072:
CLOUDSTACK-9057 remove old system vm upgrade code
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4df60db7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4df60db7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4df60db7
Branch: refs/heads/4.6
Commit: 4df60db7d94f2db6351d3f57f9ae8c6bbf03424e
Parents: 78e5518 d6e7762
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Nov 20 10:31:36 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Fri Nov 20 10:31:37 2015 +0100
----------------------------------------------------------------------
.../com/cloud/upgrade/dao/Upgrade442to450.java | 151 +------------------
1 file changed, 1 insertion(+), 150 deletions(-)
----------------------------------------------------------------------