You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2019/06/10 13:15:59 UTC

[cloudstack] branch master updated (0fbf500 -> 4b5a415)

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from 0fbf500  kvm: live storage migration intra cluster from NFS source and destination (#2983)
     add a3e5664  schema: add 4.11.2 to 4.11.3 systemvmtemplate upgrade path (#3381)
     add a91a88b  Merge remote-tracking branch 'origin/4.11' into 4.12
     new 4b5a415  Merge remote-tracking branch 'origin/4.12'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |   4 +-
 .../com/cloud/upgrade/dao/Upgrade41110to41120.java | 177 ---------------------
 ...grade443to444.java => Upgrade41120to41130.java} |  18 +--
 .../com/cloud/upgrade/dao/Upgrade41200to41300.java | 176 ++++++++++++++++++++
 .../cloud/upgrade/DatabaseUpgradeCheckerTest.java  |   6 +-
 5 files changed, 188 insertions(+), 193 deletions(-)
 copy engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade443to444.java => Upgrade41120to41130.java} (70%)


[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.12'

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 4b5a415f24b26b2bb18dc459970355317e3adb9d
Merge: 0fbf500 a91a88b
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Mon Jun 10 18:43:19 2019 +0530

    Merge remote-tracking branch 'origin/4.12'
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>

 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |   4 +-
 .../com/cloud/upgrade/dao/Upgrade41110to41120.java | 177 ---------------------
 ...e41200to41300.java => Upgrade41120to41130.java} |  29 +---
 .../com/cloud/upgrade/dao/Upgrade41200to41300.java | 176 ++++++++++++++++++++
 .../cloud/upgrade/DatabaseUpgradeCheckerTest.java  |   6 +-
 5 files changed, 188 insertions(+), 204 deletions(-)

diff --cc engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
index fbb1399,8d24ab9..0ffb5fa
--- a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@@ -63,8 -63,8 +63,9 @@@ import com.cloud.upgrade.dao.Upgrade410
  import com.cloud.upgrade.dao.Upgrade410to420;
  import com.cloud.upgrade.dao.Upgrade41100to41110;
  import com.cloud.upgrade.dao.Upgrade41110to41120;
+ import com.cloud.upgrade.dao.Upgrade41120to41130;
  import com.cloud.upgrade.dao.Upgrade41120to41200;
 +import com.cloud.upgrade.dao.Upgrade41200to41300;
  import com.cloud.upgrade.dao.Upgrade420to421;
  import com.cloud.upgrade.dao.Upgrade421to430;
  import com.cloud.upgrade.dao.Upgrade430to440;
@@@ -183,8 -183,8 +184,9 @@@ public class DatabaseUpgradeChecker imp
                  .next("4.10.0.0", new Upgrade41000to41100())
                  .next("4.11.0.0", new Upgrade41100to41110())
                  .next("4.11.1.0", new Upgrade41110to41120())
-                 .next("4.11.2.0", new Upgrade41120to41200())
+                 .next("4.11.2.0", new Upgrade41120to41130())
+                 .next("4.11.3.0", new Upgrade41120to41200())
 +                .next("4.12.0.0", new Upgrade41200to41300())
                  .build();
      }
  
diff --cc engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41120to41130.java
index f7e968c,c2750d3..d9eec47
--- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41120to41130.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41120to41130.java
@@@ -19,14 -19,21 +19,8 @@@ package com.cloud.upgrade.dao
  
  import java.io.InputStream;
  import java.sql.Connection;
 -import java.sql.PreparedStatement;
 -import java.sql.ResultSet;
 -import java.sql.SQLException;
 -import java.util.HashMap;
 -import java.util.HashSet;
 -import java.util.Map;
 -import java.util.Set;
 -
 -import org.apache.log4j.Logger;
 -
 -import com.cloud.hypervisor.Hypervisor;
 -import com.cloud.utils.exception.CloudRuntimeException;
  
- import org.apache.log4j.Logger;
- 
- import com.cloud.utils.exception.CloudRuntimeException;
- 
- public class Upgrade41200to41300 implements DbUpgrade {
- 
-     final static Logger LOG = Logger.getLogger(Upgrade41200to41300.class);
+ public class Upgrade41120to41130 implements DbUpgrade {
 -    final static Logger LOG = Logger.getLogger(Upgrade41120to41130.class);
  
      @Override
      public String[] getUpgradableVersionRange() {
@@@ -56,7 -57,175 +44,6 @@@
  
      @Override
      public void performDataMigration(Connection conn) {
 -        updateSystemVmTemplates(conn);
 -    }
 -
 -    @SuppressWarnings("serial")
 -    private void updateSystemVmTemplates(final Connection conn) {
 -        LOG.debug("Updating System Vm template IDs");
 -        final 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;
 -                    case Ovm3:
 -                        hypervisorsListInUse.add(Hypervisor.HypervisorType.Ovm3);
 -                        break;
 -                    default:
 -                        break;
 -                }
 -            }
 -        } catch (final SQLException e) {
 -            LOG.error("updateSystemVmTemplates: Exception caught while getting hypervisor types from clusters: " + e.getMessage());
 -            throw new CloudRuntimeException("updateSystemVmTemplates:Exception while getting hypervisor types from clusters", e);
 -        }
 -
 -        final Map<Hypervisor.HypervisorType, String> NewTemplateNameList = new HashMap<Hypervisor.HypervisorType, String>() {
 -            {
 -                put(Hypervisor.HypervisorType.KVM, "systemvm-kvm-4.11.3");
 -                put(Hypervisor.HypervisorType.VMware, "systemvm-vmware-4.11.3");
 -                put(Hypervisor.HypervisorType.XenServer, "systemvm-xenserver-4.11.3");
 -                put(Hypervisor.HypervisorType.Hyperv, "systemvm-hyperv-4.11.3");
 -                put(Hypervisor.HypervisorType.LXC, "systemvm-lxc-4.11.3");
 -                put(Hypervisor.HypervisorType.Ovm3, "systemvm-ovm3-4.11.3");
 -            }
 -        };
 -
 -        final Map<Hypervisor.HypervisorType, String> routerTemplateConfigurationNames = new HashMap<Hypervisor.HypervisorType, String>() {
 -            {
 -                put(Hypervisor.HypervisorType.KVM, "router.template.kvm");
 -                put(Hypervisor.HypervisorType.VMware, "router.template.vmware");
 -                put(Hypervisor.HypervisorType.XenServer, "router.template.xenserver");
 -                put(Hypervisor.HypervisorType.Hyperv, "router.template.hyperv");
 -                put(Hypervisor.HypervisorType.LXC, "router.template.lxc");
 -                put(Hypervisor.HypervisorType.Ovm3, "router.template.ovm3");
 -            }
 -        };
 -
 -        final Map<Hypervisor.HypervisorType, String> newTemplateUrl = new HashMap<Hypervisor.HypervisorType, String>() {
 -            {
 -                put(Hypervisor.HypervisorType.KVM, "https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-kvm.qcow2.bz2");
 -                put(Hypervisor.HypervisorType.VMware, "https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-vmware.ova");
 -                put(Hypervisor.HypervisorType.XenServer, "https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-xen.vhd.bz2");
 -                put(Hypervisor.HypervisorType.Hyperv, "https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-hyperv.vhd.zip");
 -                put(Hypervisor.HypervisorType.LXC, "https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-kvm.qcow2.bz2");
 -                put(Hypervisor.HypervisorType.Ovm3, "https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-ovm.raw.bz2");
 -            }
 -        };
 -
 -        final Map<Hypervisor.HypervisorType, String> newTemplateChecksum = new HashMap<Hypervisor.HypervisorType, String>() {
 -            {
 -                put(Hypervisor.HypervisorType.KVM, "15ec268d0939a8fa0be1bc79f397a167");
 -                put(Hypervisor.HypervisorType.XenServer, "ae96f35fb746524edc4ebc9856719d71");
 -                put(Hypervisor.HypervisorType.VMware, "f50c82139430afce7e4e46d3a585abbd");
 -                put(Hypervisor.HypervisorType.Hyperv, "abf411f6cdd9139716b5d8172ab903a6");
 -                put(Hypervisor.HypervisorType.LXC, "15ec268d0939a8fa0be1bc79f397a167");
 -                put(Hypervisor.HypervisorType.Ovm3, "c71f143a477f4c7a0d5e8c82ccb00220");
 -            }
 -        };
 -
 -        for (final Map.Entry<Hypervisor.HypervisorType, String> hypervisorAndTemplateName : NewTemplateNameList.entrySet()) {
 -            LOG.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.11 systemvm 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 (final SQLException e) {
 -                    LOG.error("updateSystemVmTemplates: Exception caught while getting ids of templates: " + e.getMessage());
 -                    throw new CloudRuntimeException("updateSystemVmTemplates: Exception caught 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 (final SQLException e) {
 -                        LOG.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 = ? and removed is NULL");) {
 -                        update_templ_id_pstmt.setLong(1, templateId);
 -                        update_templ_id_pstmt.setString(2, hypervisorAndTemplateName.getKey().toString());
 -                        update_templ_id_pstmt.executeUpdate();
 -                    } catch (final Exception e) {
 -                        LOG.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 (final SQLException e) {
 -                        LOG.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);
 -                    }
--
 -                    // Change value of global configuration parameter
 -                    // minreq.sysvmtemplate.version for the ACS version
 -                    try (PreparedStatement update_pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = ? WHERE name = ?");) {
 -                        update_pstmt.setString(1, "4.11.3");
 -                        update_pstmt.setString(2, "minreq.sysvmtemplate.version");
 -                        update_pstmt.executeUpdate();
 -                    } catch (final SQLException e) {
 -                        LOG.error("updateSystemVmTemplates:Exception while setting 'minreq.sysvmtemplate.version' to 4.11.3: " + e.getMessage());
 -                        throw new CloudRuntimeException("updateSystemVmTemplates:Exception while setting 'minreq.sysvmtemplate.version' to 4.11.3", e);
 -                    }
 -                } else {
 -                    if (hypervisorsListInUse.contains(hypervisorAndTemplateName.getKey())) {
 -                        throw new CloudRuntimeException(getUpgradedVersion() + hypervisorAndTemplateName.getKey() + " SystemVm template not found. Cannot upgrade system Vms");
 -                    } else {
 -                        LOG.warn(getUpgradedVersion() + 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 (final SQLException e) {
 -                            LOG.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 (final SQLException e) {
 -                LOG.error("updateSystemVmTemplates:Exception while getting ids of templates: " + e.getMessage());
 -                throw new CloudRuntimeException("updateSystemVmTemplates:Exception while getting ids of templates", e);
 -            }
 -        }
 -        LOG.debug("Updating System Vm Template IDs Complete");
      }
  
      @Override
diff --cc engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41200to41300.java
index f7e968c,c2750d3..2f6faf2
--- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41200to41300.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41200to41300.java
@@@ -22,11 -29,11 +29,12 @@@ import java.util.Set
  
  import org.apache.log4j.Logger;
  
+ import com.cloud.hypervisor.Hypervisor;
  import com.cloud.utils.exception.CloudRuntimeException;
  
 -public class Upgrade41120to41130 implements DbUpgrade {
 -    final static Logger LOG = Logger.getLogger(Upgrade41120to41130.class);
 +public class Upgrade41200to41300 implements DbUpgrade {
 +
 +    final static Logger LOG = Logger.getLogger(Upgrade41200to41300.class);
  
      @Override
      public String[] getUpgradableVersionRange() {