diff --git a/api/src/com/cloud/api/commands/UpgradeSystemVMCmd.java b/api/src/com/cloud/api/commands/UpgradeSystemVMCmd.java new file mode 100644 index 00000000000..b690ab23d0a --- /dev/null +++ b/api/src/com/cloud/api/commands/UpgradeSystemVMCmd.java @@ -0,0 +1,104 @@ +/** + * Copyright (C) 2012 Citrix Systems, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ +package com.cloud.api.commands; + +import org.apache.log4j.Logger; + +import com.cloud.api.ApiConstants; +import com.cloud.api.BaseCmd; +import com.cloud.api.IdentityMapper; +import com.cloud.api.Implementation; +import com.cloud.api.Parameter; +import com.cloud.api.ServerApiException; +import com.cloud.api.response.SystemVmResponse; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.offering.ServiceOffering; +import com.cloud.user.Account; +import com.cloud.user.UserContext; +import com.cloud.vm.VirtualMachine; + +@Implementation(responseObject=SystemVmResponse.class, description="Changes the service offering for a system vm (console proxy or secondary storage). " + + "The system vm must be in a \"Stopped\" state for " + + "this command to take effect.") +public class UpgradeSystemVMCmd extends BaseCmd { + public static final Logger s_logger = Logger.getLogger(UpgradeVMCmd.class.getName()); + private static final String s_name = "changeserviceforsystemvmresponse"; + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + + @IdentityMapper(entityTableName="vm_instance") + @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="The ID of the system vm") + private Long id; + + @IdentityMapper(entityTableName="disk_offering") + @Parameter(name=ApiConstants.SERVICE_OFFERING_ID, type=CommandType.LONG, required=true, + description="the service offering ID to apply to the system vm") + private Long serviceOfferingId; + + ///////////////////////////////////////////////////// + /////////////////// Accessors /////////////////////// + ///////////////////////////////////////////////////// + + public Long getId() { + return id; + } + + public Long getServiceOfferingId() { + return serviceOfferingId; + } + + ///////////////////////////////////////////////////// + /////////////// API Implementation/////////////////// + ///////////////////////////////////////////////////// + + @Override + public String getCommandName() { + return s_name; + } + + @Override + public long getEntityOwnerId() { + Account account = UserContext.current().getCaller(); + if (account != null) { + return account.getId(); + } + + return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked + } + + @Override + public void execute(){ + UserContext.current().setEventDetails("Vm Id: "+getId()); + + ServiceOffering serviceOffering = _configService.getServiceOffering(serviceOfferingId); + if (serviceOffering == null) { + throw new InvalidParameterValueException("Unable to find service offering: " + serviceOfferingId); + } + + VirtualMachine result = _mgr.upgradeSystemVM(this); + if (result != null) { + SystemVmResponse response = _responseGenerator.createSystemVmResponse(result); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Fail to reboot system vm"); + } + } +} diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java index d7313454711..e36cc81b19a 100755 --- a/api/src/com/cloud/server/ManagementService.java +++ b/api/src/com/cloud/server/ManagementService.java @@ -56,6 +56,7 @@ import com.cloud.api.commands.UpdateHostPasswordCmd; import com.cloud.api.commands.UpdateIsoCmd; import com.cloud.api.commands.UpdateTemplateCmd; import com.cloud.api.commands.UpdateVMGroupCmd; +import com.cloud.api.commands.UpgradeSystemVMCmd; import com.cloud.api.commands.UploadCustomCertificateCmd; import com.cloud.async.AsyncJob; import com.cloud.capacity.Capacity; @@ -205,6 +206,8 @@ public interface ManagementService { VirtualMachine rebootSystemVM(RebootSystemVmCmd cmd); VirtualMachine destroySystemVM(DestroySystemVmCmd cmd); + + VirtualMachine upgradeSystemVM(UpgradeSystemVMCmd cmd); /** * update an existing domain diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index 7d65341db99..4204b9b083a 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -149,6 +149,7 @@ stopSystemVm=com.cloud.api.commands.StopSystemVmCmd;1 destroySystemVm=com.cloud.api.commands.DestroySystemVmCmd;1 listSystemVms=com.cloud.api.commands.ListSystemVMsCmd;3 migrateSystemVm=com.cloud.api.commands.MigrateSystemVMCmd;1 +changeServiceForSystemVm=com.cloud.api.commands.UpgradeSystemVMCmd;1 #### configuration commands updateConfiguration=com.cloud.api.commands.UpdateCfgCmd;1 diff --git a/core/src/com/cloud/vm/DomainRouterVO.java b/core/src/com/cloud/vm/DomainRouterVO.java index c7cc2eb6e04..42c14c64e1a 100755 --- a/core/src/com/cloud/vm/DomainRouterVO.java +++ b/core/src/com/cloud/vm/DomainRouterVO.java @@ -215,10 +215,6 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter { public void setRedundantState(RedundantState redundantState) { this.redundantState = redundantState; } - - public void setServiceOfferingId(long serviceOfferingId) { - this.serviceOfferingId = serviceOfferingId; - } public boolean getIsPriorityBumpUp() { return this.isPriorityBumpUp; diff --git a/core/src/com/cloud/vm/UserVmVO.java b/core/src/com/cloud/vm/UserVmVO.java index 9a706295b05..7c65065c924 100755 --- a/core/src/com/cloud/vm/UserVmVO.java +++ b/core/src/com/cloud/vm/UserVmVO.java @@ -58,10 +58,6 @@ public class UserVmVO extends VMInstanceVO implements UserVm { public long getServiceOfferingId() { return serviceOfferingId; } - - public void setServiceOfferingId(long serviceOfferingId) { - this.serviceOfferingId = serviceOfferingId; - } public UserVmVO(long id, String instanceName, diff --git a/core/src/com/cloud/vm/VMInstanceVO.java b/core/src/com/cloud/vm/VMInstanceVO.java index 496c1ef746a..f9c57f5931e 100644 --- a/core/src/com/cloud/vm/VMInstanceVO.java +++ b/core/src/com/cloud/vm/VMInstanceVO.java @@ -453,5 +453,10 @@ public class VMInstanceVO implements VirtualMachine, FiniteStateObject allocateTo(VirtualMachineTemplate template, ServiceOfferingVO offering, DataCenterVO zone, long accountId, Set avoids) { long zoneId = zone.getId(); @@ -254,17 +250,9 @@ public class UserConcentratedAllocator implements PodAllocator { if (userVm == null) { continue; } - so = _offeringDao.findById(userVm.getServiceOfferingId()); - } else if (vm.getType() == VirtualMachine.Type.ConsoleProxy) { - so = new ServiceOfferingVO("Fake Offering For DomP", 1, _proxyRamSize, 0, 0, 0, false, null, false, true, null, true, VirtualMachine.Type.ConsoleProxy, false); - } else if (vm.getType() == VirtualMachine.Type.SecondaryStorageVm) { - so = new ServiceOfferingVO("Fake Offering For Secondary Storage VM", 1, _secStorageVmRamSize, 0, 0, 0, true, null, false, true, null, true, VirtualMachine.Type.SecondaryStorageVm, false); - } else if (vm.getType() == VirtualMachine.Type.DomainRouter) { - so = new ServiceOfferingVO("Fake Offering For DomR", 1, _routerRamSize, 0, 0, 0, true, null, false, true, null, true, VirtualMachine.Type.DomainRouter, false); - } else { - assert (false) : "Unsupported system vm type"; - so = new ServiceOfferingVO("Fake Offering For unknow system VM", 1, 128, 0, 0, 0, false, null, false, true, null, true, null, false); - } + } + + so = _offeringDao.findById(vm.getServiceOfferingId()); if (capacityType == CapacityVO.CAPACITY_TYPE_MEMORY) { usedCapacity += so.getRamSize() * 1024L * 1024L; @@ -325,11 +313,6 @@ public class UserConcentratedAllocator implements PodAllocator { _secondsToSkipStoppedVMs = NumbersUtil.parseInt(stoppedValue, 86400); _secondsToSkipDestroyedVMs = NumbersUtil.parseInt(destroyedValue, 0); - // TODO this is not good, there should be one place to get these values - _secStorageVmRamSize = NumbersUtil.parseInt(configs.get("secstorage.vm.ram.size"), 256); - _routerRamSize = NumbersUtil.parseInt(configs.get("router.ram.size"), 128); - _proxyRamSize = NumbersUtil.parseInt(configs.get("consoleproxy.ram.size"), 1024); - /* * ComponentLocator locator = ComponentLocator.getCurrentLocator(); _vmDao = locator.getDao(UserVmDao.class); if (_vmDao * == null) { throw new ConfigurationException("Unable to find UserVMDao."); } diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index 0459fcc017d..9c7674981be 100755 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -113,8 +113,6 @@ public enum Config { ConsoleProxyRestart("Console Proxy", AgentManager.class, Boolean.class, "consoleproxy.restart", "true", "Console proxy restart flag, defaulted to true", null), ConsoleProxyUrlDomain("Console Proxy", AgentManager.class, String.class, "consoleproxy.url.domain", "realhostip.com", "Console proxy url domain", null), ConsoleProxyLoadscanInterval("Console Proxy", AgentManager.class, String.class, "consoleproxy.loadscan.interval", "10000", "The time interval(in milliseconds) to scan console proxy working-load info", null), - ConsoleProxyRamSize("Console Proxy", AgentManager.class, Integer.class, "consoleproxy.ram.size", String.valueOf(ConsoleProxyManager.DEFAULT_PROXY_VM_RAMSIZE), "RAM size (in MB) used to create new console proxy VMs", null), - ConsoleProxyCpuMHz("Console Proxy", AgentManager.class, Integer.class, "consoleproxy.cpu.mhz", String.valueOf(ConsoleProxyManager.DEFAULT_PROXY_VM_CPUMHZ), "CPU speed (in MHz) used to create new console proxy VMs", null), ConsoleProxySessionMax("Console Proxy", AgentManager.class, Integer.class, "consoleproxy.session.max", String.valueOf(ConsoleProxyManager.DEFAULT_PROXY_CAPACITY), "The max number of viewer sessions console proxy is configured to serve for", null), ConsoleProxySessionTimeout("Console Proxy", AgentManager.class, Integer.class, "consoleproxy.session.timeout", "300000", "Timeout(in milliseconds) that console proxy tries to maintain a viewer session before it times out the session for no activity", null), ConsoleProxyDisableRpFilter("Console Proxy", AgentManager.class, Integer.class, "consoleproxy.disable.rpfilter", "true", "disable rp_filter on console proxy VM public interface", null), @@ -186,9 +184,7 @@ public enum Config { ManagementNetwork("Advanced", ManagementServer.class, String.class, "management.network.cidr", null, "The cidr of management server network", null), EventPurgeDelay("Advanced", ManagementServer.class, Integer.class, "event.purge.delay", "15", "Events older than specified number days will be purged. Set this value to 0 to never delete events", null), UseLocalStorage("Advanced", ManagementServer.class, Boolean.class, "use.local.storage", "false", "Should we use the local storage if it's available?", null), - SecStorageVmRamSize("Advanced", AgentManager.class, Integer.class, "secstorage.vm.ram.size", String.valueOf(SecondaryStorageVmManager.DEFAULT_SS_VM_RAMSIZE), "RAM size (in MB) used to create new secondary storage vms", null), SecStorageVmMTUSize("Advanced", AgentManager.class, Integer.class, "secstorage.vm.mtu.size", String.valueOf(SecondaryStorageVmManager.DEFAULT_SS_VM_MTUSIZE), "MTU size (in Byte) of storage network in secondary storage vms", null), - SecStorageVmCpuMHz("Advanced", AgentManager.class, Integer.class, "secstorage.vm.cpu.mhz", String.valueOf(SecondaryStorageVmManager.DEFAULT_SS_VM_CPUMHZ), "CPU speed (in MHz) used to create new secondary storage vms", null), MaxTemplateAndIsoSize("Advanced", ManagementServer.class, Long.class, "max.template.iso.size", "50", "The maximum size for a downloaded template or ISO (in GB).", null), SecStorageAllowedInternalDownloadSites("Advanced", ManagementServer.class, String.class, "secstorage.allowed.internal.sites", null, "Comma separated list of cidrs internal to the datacenter that can host template download servers", null), SecStorageEncryptCopy("Advanced", ManagementServer.class, Boolean.class, "secstorage.encrypt.copy", "false", "Use SSL method used to encrypt copy traffic between zones", "true,false"), @@ -333,7 +329,9 @@ public enum Config { DefaultExternalLoadBalancerCapacity("Advanced", ManagementServer.class, String.class, "external.lb.default.capacity", "50", "default number of networks permitted per external load balancer device", null), DefaultExternalFirewallCapacity("Advanced", ManagementServer.class, String.class, "external.firewall.default.capacity", "50", "default number of networks permitted per external load firewall device", null), CustomDiskOfferingMinSize("Advanced", ManagementServer.class, Integer.class, "custom.diskoffering.size.min", "1", "Minimum size in GB for custom disk offering", null), - CustomDiskOfferingMaxSize("Advanced", ManagementServer.class, Integer.class, "custom.diskoffering.size.max", "1024", "Maximum size in GB for custom disk offering", null); + CustomDiskOfferingMaxSize("Advanced", ManagementServer.class, Integer.class, "custom.diskoffering.size.max", "1024", "Maximum size in GB for custom disk offering", null), + ConsoleProxyServiceOffering("Advanced", ManagementServer.class, Long.class, "consoleproxy.service.offering", null, "Service offering used by console proxy; if NULL - system offering will be used", null), + SecondaryStorageServiceOffering("Advanced", ManagementServer.class, Long.class, "secstorage.service.offering", null, "Service offering used by secondary storage; if NULL - system offering will be used", null); private final String _category; private final Class _componentClass; diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index 2608e55af74..c5438229457 100755 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -229,8 +229,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx private int _capacityPerProxy = ConsoleProxyManager.DEFAULT_PROXY_CAPACITY; private int _standbyCapacity = ConsoleProxyManager.DEFAULT_STANDBY_CAPACITY; - private int _proxyRamSize; - private int _proxyCpuMHz; + private boolean _use_lvm; private boolean _use_storage_vm; private boolean _disable_rp_filter = false; @@ -1385,9 +1384,6 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx Map configs = configDao.getConfiguration("management-server", params); - _proxyRamSize = NumbersUtil.parseInt(configs.get(Config.ConsoleProxyRamSize.key()), DEFAULT_PROXY_VM_RAMSIZE); - _proxyCpuMHz = NumbersUtil.parseInt(configs.get(Config.ConsoleProxyCpuMHz.key()), DEFAULT_PROXY_VM_CPUMHZ); - String value = configs.get(Config.ConsoleProxyCmdPort.key()); value = configs.get("consoleproxy.sslEnabled"); if (value != null && value.equalsIgnoreCase("true")) { @@ -1453,15 +1449,28 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx _itMgr.registerGuru(VirtualMachine.Type.ConsoleProxy, this); boolean useLocalStorage = Boolean.parseBoolean(configs.get(Config.SystemVMUseLocalStorage.key())); - _serviceOffering = new ServiceOfferingVO("System Offering For Console Proxy", 1, _proxyRamSize, _proxyCpuMHz, 0, 0, false, null, useLocalStorage, true, null, true, VirtualMachine.Type.ConsoleProxy, true); - _serviceOffering.setUniqueName(ServiceOffering.consoleProxyDefaultOffUniqueName); - _serviceOffering = _offeringDao.persistSystemServiceOffering(_serviceOffering); + + //check if there is a default service offering configured + String cpvmSrvcOffIdStr = configs.get(Config.ConsoleProxyServiceOffering.key()); + if (cpvmSrvcOffIdStr != null) { + Long cpvmSrvcOffId = Long.parseLong(cpvmSrvcOffIdStr); + _serviceOffering = _offeringDao.findById(cpvmSrvcOffId); + if (_serviceOffering == null || !_serviceOffering.getSystemUse()) { + String msg = "Can't find system service offering id=" + cpvmSrvcOffId + " for console proxy vm"; + s_logger.error(msg); + throw new ConfigurationException(msg); + } + } else { + _serviceOffering = new ServiceOfferingVO("System Offering For Console Proxy", 1, DEFAULT_PROXY_VM_RAMSIZE, DEFAULT_PROXY_VM_CPUMHZ, 0, 0, false, null, useLocalStorage, true, null, true, VirtualMachine.Type.ConsoleProxy, true); + _serviceOffering.setUniqueName(ServiceOffering.consoleProxyDefaultOffUniqueName); + _serviceOffering = _offeringDao.persistSystemServiceOffering(_serviceOffering); - // this can sometimes happen, if DB is manually or programmatically manipulated - if (_serviceOffering == null) { - String msg = "Data integrity problem : System Offering For Console Proxy has been removed?"; - s_logger.error(msg); - throw new ConfigurationException(msg); + // this can sometimes happen, if DB is manually or programmatically manipulated + if (_serviceOffering == null) { + String msg = "Data integrity problem : System Offering For Console Proxy has been removed?"; + s_logger.error(msg); + throw new ConfigurationException(msg); + } } _loadScanner = new SystemVmLoadScanner(this); diff --git a/server/src/com/cloud/migration/Db20to21MigrationUtil.java b/server/src/com/cloud/migration/Db20to21MigrationUtil.java deleted file mode 100644 index 64edc3ed849..00000000000 --- a/server/src/com/cloud/migration/Db20to21MigrationUtil.java +++ /dev/null @@ -1,943 +0,0 @@ -// Copyright 2012 Citrix Systems, Inc. Licensed under the -// Apache License, Version 2.0 (the "License"); you may not use this -// file except in compliance with the License. Citrix Systems, Inc. -// reserves all rights not expressly granted by the License. -// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -// Automatically generated by addcopyright.py at 04/03/2012 -package com.cloud.migration; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.security.NoSuchAlgorithmException; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; -import java.util.NoSuchElementException; -import java.util.Properties; -import java.util.Random; -import java.util.Scanner; - -import javax.crypto.KeyGenerator; -import javax.crypto.SecretKey; - -import org.apache.commons.codec.binary.Base64; -import org.apache.log4j.Logger; -import org.apache.log4j.xml.DOMConfigurator; - -import com.cloud.configuration.Config; -import com.cloud.configuration.ConfigurationVO; -import com.cloud.configuration.dao.ConfigurationDao; -import com.cloud.consoleproxy.ConsoleProxyManager; -import com.cloud.dc.ClusterVO; -import com.cloud.dc.DataCenterVO; -import com.cloud.dc.HostPodVO; -import com.cloud.dc.dao.ClusterDao; -import com.cloud.dc.dao.DataCenterDao; -import com.cloud.dc.dao.HostPodDao; -import com.cloud.domain.DomainVO; -import com.cloud.domain.dao.DomainDao; -import com.cloud.host.Host; -import com.cloud.host.HostVO; -import com.cloud.host.dao.HostDao; -import com.cloud.migration.DiskOffering21VO.Type; -import com.cloud.offering.ServiceOffering; -import com.cloud.storage.Storage.StoragePoolType; -import com.cloud.storage.StoragePoolVO; -import com.cloud.storage.Volume; -import com.cloud.storage.VolumeVO; -import com.cloud.storage.dao.StoragePoolDao; -import com.cloud.storage.dao.VolumeDao; -import com.cloud.storage.secondary.SecondaryStorageVmManager; -import com.cloud.utils.NumbersUtil; -import com.cloud.utils.PropertiesUtil; -import com.cloud.utils.component.ComponentLocator; -import com.cloud.utils.db.Filter; -import com.cloud.utils.db.GenericSearchBuilder; -import com.cloud.utils.db.SearchBuilder; -import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.SearchCriteria.Func; -import com.cloud.utils.db.SearchCriteria.Op; -import com.cloud.utils.db.Transaction; -import com.cloud.utils.net.NetUtils; -import com.cloud.utils.script.Script; -import com.cloud.vm.ConsoleProxyVO; -import com.cloud.vm.DomainRouterVO; -import com.cloud.vm.SecondaryStorageVmVO; -import com.cloud.vm.UserVmVO; -import com.cloud.vm.VMInstanceVO; -import com.cloud.vm.VirtualMachine; -import com.cloud.vm.VirtualMachine.State; -import com.cloud.vm.dao.ConsoleProxyDao; -import com.cloud.vm.dao.DomainRouterDao; -import com.cloud.vm.dao.SecondaryStorageVmDao; -import com.cloud.vm.dao.UserVmDao; -import com.cloud.vm.dao.VMInstanceDao; - -public class Db20to21MigrationUtil { - private static final Logger s_logger = Logger.getLogger(Db20to21MigrationUtil.class); - - protected DataCenterDao _dcDao; - protected HostPodDao _podDao; - protected ConfigurationDao _configDao; - protected ClusterDao _clusterDao; - protected HostDao _hostDao; - protected StoragePoolDao _spDao; - protected DomainDao _domainDao; - protected ServiceOffering20Dao _serviceOffering20Dao; - protected DiskOffering20Dao _diskOffering20Dao; - protected ServiceOffering21Dao _serviceOffering21Dao; - protected DiskOffering21Dao _diskOffering21Dao; - protected ConsoleProxyDao _consoleProxyDao; - protected SecondaryStorageVmDao _secStorageVmDao; - protected VMInstanceDao _vmInstanceDao; - protected VolumeDao _volumeDao; - protected UserVmDao _userVmDao; - protected DomainRouterDao _routerDao; - protected StoragePoolDao _poolDao; - - protected long _consoleProxyServiceOfferingId; - protected long _secStorageServiceOfferingId; - protected long _domRServiceOfferingId; - protected boolean _isPremium = false; - - protected static class DcPod { - long id; - String name; - long count; - - public DcPod() { - } - } - - private void migrateZones() { - boolean createCluster = false; - String value = _configDao.getValue("xen.create.pools.in.pod"); - if (value == null || !value.equalsIgnoreCase("true")) { - s_logger.info("System is not configured to use Xen server pool, we will skip creating cluster for pods"); - } else { - createCluster = true; - } - - // Displaying summarize data center/pod configuration from old DB before we continue - GenericSearchBuilder sb = _dcDao.createSearchBuilder(DcPod.class); - sb.selectField(sb.entity().getId()); - sb.selectField(sb.entity().getName()); - sb.select("count", Func.COUNT, null); - sb.groupBy(sb.entity().getId(), sb.entity().getName()); - sb.done(); - - SearchCriteria sc = sb.create(); - List results = _dcDao.customSearchIncludingRemoved(sc, (Filter) null); - if (results.size() > 0) { - System.out.println("We've found following zones are deployed in your database"); - for (DcPod cols : results) { - System.out.println("\tid: " + cols.id + ",\tname: " + cols.name + ",\tpods in zone: " + cols.count); - } - System.out.println("From 2.0 to 2.1, pod is required to have gateway configuration"); - - for (DcPod cols : results) { - migrateZonePods(cols.id, cols.name, createCluster); - - s_logger.info("Set system VM guest MAC in zone" + cols.name); - migrateSystemVmGuestMacAndState(cols.id); - } - } else { - System.out.println("We couldn't find any zone being deployed. Skip Zone/Pod migration"); - } - } - - private void migrateZonePods(long zoneId, String zoneName, boolean createCluster) { - SearchBuilder sb = _podDao.createSearchBuilder(); - sb.and("zoneId", sb.entity().getDataCenterId(), Op.EQ); - sb.done(); - - SearchCriteria sc = sb.create(); - sc.setParameters("zoneId", zoneId); - - List pods = _podDao.searchIncludingRemoved(sc, null, false, false); - if (pods.size() > 0) { - for (HostPodVO pod : pods) { - System.out.println("Migrating pod " + pod.getName() + " in zone " + zoneName + "..."); - System.out.println("Current pod " + pod.getName() + " configuration as"); - System.out.println("\tCIDR: " + pod.getCidrAddress() + "/" + pod.getCidrSize()); - System.out.println("\tGateway: " + pod.getGateway()); - System.out.print("Please type your gateway address for the pod: "); - - String gateway = readInput(); - pod.setGateway(gateway); - _podDao.update(pod.getId(), pod); - if (createCluster) { - migrateHostsInPod(zoneId, pod.getId(), pod.getName()); - } - - System.out.println("Set last_host_id for VMs in pod " + pod.getName()); - migrateVmInstanceLastHostId(zoneId, pod.getId()); - - System.out.println("Setup link local addresses, it will take a while, please wait..."); - String ipNums = _configDao.getValue("linkLocalIp.nums"); - int nums = Integer.parseInt(ipNums); - if (nums > 16 || nums <= 0) { - nums = 10; - } - - /* local link ip address starts from 169.254.0.2 - 169.254.(nums) */ - String[] ipRanges = NetUtils.getLinkLocalIPRange(nums); - _dcDao.addLinkLocalIpAddress(zoneId, pod.getId(), ipRanges[0], ipRanges[1]); - } - } - } - - private void migrateHostsInPod(long zoneId, long podId, String podName) { - System.out.println("Creating cluster for pod " + podName); - - ClusterVO cluster = null; - - SearchBuilder sb = _hostDao.createSearchBuilder(); - sb.and("dc", sb.entity().getDataCenterId(), Op.EQ); - sb.and("pod", sb.entity().getPodId(), Op.EQ); - sb.and("type", sb.entity().getType(), Op.EQ); - sb.done(); - - SearchCriteria sc = sb.create(); - sc.setParameters("dc", zoneId); - sc.setParameters("pod", podId); - sc.setParameters("type", Host.Type.Routing); - - // join cluster for hosts in pod - List hostsInPod = _hostDao.searchIncludingRemoved(sc, null, false, false); - if (hostsInPod.size() > 0) { - if (cluster == null) { - cluster = new ClusterVO(zoneId, podId, String.valueOf(podId)); - cluster = _clusterDao.persist(cluster); - } - - for (HostVO host : hostsInPod) { - host.setClusterId(cluster.getId()); - _hostDao.update(host.getId(), host); - - System.out.println("Join host " + host.getName() + " to auto-formed cluster"); - } - } - - SearchBuilder sbPool = _spDao.createSearchBuilder(); - sbPool.and("dc", sbPool.entity().getDataCenterId(), Op.EQ); - sbPool.and("pod", sbPool.entity().getPodId(), Op.EQ); - sbPool.and("poolType", sbPool.entity().getPoolType(), Op.IN); - sbPool.done(); - - SearchCriteria scPool = sbPool.create(); - scPool.setParameters("dc", zoneId); - scPool.setParameters("pod", podId); - scPool.setParameters("poolType", StoragePoolType.NetworkFilesystem.toString(), StoragePoolType.IscsiLUN.toString()); - - List sPoolsInPod = _spDao.searchIncludingRemoved(scPool, null, false, false); - if (sPoolsInPod.size() > 0) { - if (cluster == null) { - cluster = new ClusterVO(zoneId, podId, String.valueOf(podId)); - cluster = _clusterDao.persist(cluster); - } - - for (StoragePoolVO spool : sPoolsInPod) { - spool.setClusterId(cluster.getId()); - _spDao.update(spool.getId(), spool); - - System.out.println("Join host " + spool.getName() + " to auto-formed cluster"); - } - } - } - - private void composeDomainPath(DomainVO domain, StringBuilder sb) { - if (domain.getParent() == null) { - sb.append("/"); - } else { - DomainVO parent = _domainDao.findById(domain.getParent()); - composeDomainPath(parent, sb); - - if (domain.getName().contains("/")) { - System.out.println("Domain " + domain.getName() + " contains invalid domain character, replace it with -"); - sb.append(domain.getName().replace('/', '-')); - } else { - sb.append(domain.getName()); - } - sb.append("/"); - } - } - - private void migrateDomains() { - System.out.println("Migrating domains..."); - - // we shouldn't have too many domains in the system, use a very dumb way to setup domain path - List domains = _domainDao.listAllIncludingRemoved(); - for (DomainVO domain : domains) { - StringBuilder path = new StringBuilder(); - composeDomainPath(domain, path); - - System.out.println("Convert domain path, domin: " + domain.getId() + ", path:" + path.toString()); - - domain.setPath(path.toString()); - _domainDao.update(domain.getId(), domain); - } - - System.out.println("All domains have been migrated to 2.1 format"); - } - - private void migrateServiceOfferings() { - System.out.println("Migrating service offering..."); - - long seq = getServiceOfferingStartSequence(); - - List oldServiceOfferings = _serviceOffering20Dao.listAllIncludingRemoved(); - for (ServiceOffering20VO so20 : oldServiceOfferings) { - ServiceOffering21VO so21 = new ServiceOffering21VO(so20.getName(), so20.getCpu(), so20.getRamSize(), so20.getSpeed(), so20.getRateMbps(), - so20.getMulticastRateMbps(), so20.getOfferHA(), so20.getDisplayText(), so20.getUseLocalStorage(), - false, null); - so21.setId(seq++); - so21.setDiskSize(0); - so21 = _serviceOffering21Dao.persist(so21); - - if (so20.getId().longValue() != so21.getId()) { - // Update all foreign reference from old value to new value, need to be careful with foreign key -// constraints - updateServiceOfferingReferences(so20.getId().longValue(), so21.getId()); - } - } - - boolean useLocalStorage = Boolean.parseBoolean(_configDao.getValue(Config.SystemVMUseLocalStorage.key())); - - // create service offering for system VMs and update references - int proxyRamSize = NumbersUtil.parseInt( - _configDao.getValue(Config.ConsoleProxyRamSize.key()), - ConsoleProxyManager.DEFAULT_PROXY_VM_RAMSIZE); - ServiceOffering21VO soConsoleProxy = new ServiceOffering21VO("Fake Offering For DomP", 1, - proxyRamSize, 0, 0, 0, false, null, useLocalStorage, - true, null); - soConsoleProxy.setId(seq++); - soConsoleProxy.setUniqueName(ServiceOffering.consoleProxyDefaultOffUniqueName); - soConsoleProxy = _serviceOffering21Dao.persist(soConsoleProxy); - _consoleProxyServiceOfferingId = soConsoleProxy.getId(); - - int secStorageVmRamSize = NumbersUtil.parseInt( - _configDao.getValue(Config.SecStorageVmRamSize.key()), - SecondaryStorageVmManager.DEFAULT_SS_VM_RAMSIZE); - ServiceOffering21VO soSecondaryVm = new ServiceOffering21VO("Fake Offering For Secondary Storage VM", 1, - secStorageVmRamSize, 0, 0, 0, false, null, useLocalStorage, true, null); - soSecondaryVm.setId(seq++); - soSecondaryVm.setUniqueName(ServiceOffering.ssvmDefaultOffUniqueName); - soSecondaryVm = _serviceOffering21Dao.persist(soSecondaryVm); - _secStorageServiceOfferingId = soSecondaryVm.getId(); - - int routerRamSize = NumbersUtil.parseInt(_configDao.getValue("router.ram.size"), 128); - ServiceOffering21VO soDomainRouter = new ServiceOffering21VO("Fake Offering For DomR", 1, - routerRamSize, 0, 0, 0, false, null, useLocalStorage, true, null); - soDomainRouter.setId(seq++); - soDomainRouter.setUniqueName(ServiceOffering.routerDefaultOffUniqueName); - soDomainRouter = _serviceOffering21Dao.persist(soDomainRouter); - _domRServiceOfferingId = soDomainRouter.getId(); - - System.out.println("Service offering has been migrated to 2.1 format"); - } - - private long getServiceOfferingStartSequence() { - Transaction txn = Transaction.open(Transaction.CLOUD_DB); - long seq = 0; - try { - PreparedStatement pstmt = null; - pstmt = txn.prepareAutoCloseStatement("SELECT max(id) FROM service_offering"); - ResultSet rs = pstmt.executeQuery(); - rs.next(); - seq = rs.getLong(1); - pstmt.close(); - - pstmt = txn.prepareAutoCloseStatement("SELECT max(id) FROM disk_offering"); - rs = pstmt.executeQuery(); - rs.next(); - seq += rs.getLong(1); - pstmt.close(); - - seq += 100; // add a gap - return seq; - } catch (SQLException e) { - s_logger.error("Unhandled exception: ", e); - } finally { - txn.close(); - } - - return 10000; - } - - private void updateConsoleProxyServiceOfferingReferences(long serviceOfferingId) { - Transaction txn = Transaction.open(Transaction.CLOUD_DB); - try { - PreparedStatement pstmt = null; - pstmt = txn.prepareAutoCloseStatement( - "UPDATE volumes SET disk_offering_id=? WHERE instance_id IN (SELECT id FROM vm_instance WHERE type='ConsoleProxy')"); - pstmt.setLong(1, serviceOfferingId); - - int rows = pstmt.executeUpdate(); - s_logger.info("Update volumes for console proxy service offering change, affected rows: " + rows); - } catch (SQLException e) { - s_logger.error("Unhandled exception: ", e); - } finally { - txn.close(); - } - } - - private void updateSecondaryStorageServiceOfferingReferences(long serviceOfferingId) { - Transaction txn = Transaction.open(Transaction.CLOUD_DB); - try { - PreparedStatement pstmt = null; - pstmt = txn.prepareAutoCloseStatement( - "UPDATE volumes SET disk_offering_id=? WHERE instance_id IN (SELECT id FROM vm_instance WHERE type='SecondaryStorageVm')"); - pstmt.setLong(1, serviceOfferingId); - - int rows = pstmt.executeUpdate(); - s_logger.info("Update volumes for secondary storage service offering change, affected rows: " + rows); - } catch (SQLException e) { - s_logger.error("Unhandled exception: ", e); - } finally { - txn.close(); - } - } - - private void updateDomainRouterServiceOfferingReferences(long serviceOfferingId) { - Transaction txn = Transaction.open(Transaction.CLOUD_DB); - try { - PreparedStatement pstmt = null; - pstmt = txn.prepareAutoCloseStatement( - "UPDATE volumes SET disk_offering_id=? WHERE instance_id IN (SELECT id FROM vm_instance WHERE type='DomainRouter')"); - pstmt.setLong(1, serviceOfferingId); - - int rows = pstmt.executeUpdate(); - s_logger.info("Update volumes for secondary storage service offering change, affected rows: " + rows); - } catch (SQLException e) { - s_logger.error("Unhandled exception: ", e); - } finally { - txn.close(); - } - } - - private void updateServiceOfferingReferences(long oldServiceOfferingId, long newServiceOfferingId) { - Transaction txn = Transaction.open(Transaction.CLOUD_DB); - try { - PreparedStatement pstmt = null; - pstmt = txn.prepareAutoCloseStatement("UPDATE user_vm SET service_offering_id=? WHERE service_offering_id=?"); - - pstmt.setLong(1, newServiceOfferingId); - pstmt.setLong(2, oldServiceOfferingId); - - int rows = pstmt.executeUpdate(); - s_logger.info("Update user_vm for service offering change (" + oldServiceOfferingId + "->" + newServiceOfferingId + "), affected rows: " + rows); - - } catch (SQLException e) { - s_logger.error("Unhandled exception: ", e); - } finally { - txn.close(); - } - } - - private void migrateDiskOfferings() { - System.out.println("Migrating disk offering..."); - - List oldDiskOfferings = _diskOffering20Dao.listAllIncludingRemoved(); - long maxDiskOfferingId = _domRServiceOfferingId; - maxDiskOfferingId += 100; - - for (DiskOffering20VO do20 : oldDiskOfferings) { - DiskOffering21VO do21 = new DiskOffering21VO(do20.getDomainId(), do20.getName(), do20.getDisplayText(), do20.getDiskSize(), - do20.getMirrored(), null); - do21.setType(Type.Disk); - do21.setId(maxDiskOfferingId++); - - do21 = _diskOffering21Dao.persist(do21); - if (do20.getId().longValue() != do21.getId()) { - updateDiskOfferingReferences(do20.getId().longValue(), do21.getId()); - } - } - - FixupNullDiskOfferingInVolumes(); - - System.out.println("Disk offering has been migrated to 2.1 format"); - } - - private void FixupNullDiskOfferingInVolumes() { - System.out.println("Fixup NULL disk_offering_id references in volumes table ..."); - - SearchCriteria scDiskOffering = _diskOffering21Dao.createSearchCriteria(); - List offeringList = _diskOffering21Dao.searchIncludingRemoved(scDiskOffering, - new Filter(DiskOffering21VO.class, "diskSize", true, null, null), false, false); - - for (DiskOffering21VO offering : offeringList) { - s_logger.info("Disk offering name: " + offering.getName() + ", disk size: " + offering.getDiskSizeInBytes()); - } - - SearchBuilder sb = _volumeDao.createSearchBuilder(); - sb.and("diskOfferingId", sb.entity().getDiskOfferingId(), Op.NULL); - sb.done(); - - SearchCriteria sc = sb.create(); - List volumes = _volumeDao.searchIncludingRemoved(sc, null, false, false); - - if (volumes.size() > 0) { - for (VolumeVO vol : volumes) { - if (vol.getInstanceId() != null) { - VMInstanceVO vmInstance = _vmInstanceDao.findById(vol.getInstanceId()); - - if (vmInstance.getType() == VirtualMachine.Type.User) { - // if the volume is for user VM, we can retrieve the information from service_offering_id - UserVmVO userVm = _userVmDao.findById(vol.getInstanceId()); - if (userVm != null) { - // following operation requires that all service offerings should have been fixed up already - vol.setDiskOfferingId(userVm.getServiceOfferingId()); - } else { - System.out.println("Data integrity could not be fixed up for volume: " + vol.getId() + " because its owner user vm no longer exists"); - } - } else if (vmInstance.getType() == VirtualMachine.Type.ConsoleProxy) { - vol.setDiskOfferingId(this._consoleProxyServiceOfferingId); - } else if (vmInstance.getType() == VirtualMachine.Type.SecondaryStorageVm) { - vol.setDiskOfferingId(this._secStorageServiceOfferingId); - } else if (vmInstance.getType() == VirtualMachine.Type.DomainRouter) { - vol.setDiskOfferingId(this._domRServiceOfferingId); - } - } else { - System.out.println("volume: " + vol.getId() + " is standalone, fix disck_offering_id based on volume size"); - - // try to guess based on volume size and fill it in - boolean found = false; - for (DiskOffering21VO do21 : offeringList) { - if (do21.getType() == Type.Disk && vol.getSize() > do21.getDiskSizeInBytes()) { - found = true; - System.out.println("volume: " + vol.getId() + " disck_offering_id is fixed to " + do21.getId()); - vol.setDiskOfferingId(do21.getId()); - break; - } - } - - if (!found) { - System.out.println("volume: " + vol.getId() + " disck_offering_id is fixed to " + offeringList.get(offeringList.size() - 1).getId()); - vol.setDiskOfferingId(offeringList.get(offeringList.size() - 1).getId()); - } - } - - _volumeDao.update(vol.getId(), vol); - } - } - - System.out.println("Disk offering fixup is done"); - } - - private void updateDiskOfferingReferences(long oldDiskOfferingId, long newDiskOfferingId) { - Transaction txn = Transaction.open(Transaction.CLOUD_DB); - try { - PreparedStatement pstmt = null; - pstmt = txn.prepareAutoCloseStatement("UPDATE vm_disk SET disk_offering_id=? WHERE disk_offering_id=?"); - - pstmt.setLong(1, newDiskOfferingId); - pstmt.setLong(2, oldDiskOfferingId); - - int rows = pstmt.executeUpdate(); - pstmt.close(); - - s_logger.info("Update vm_disk for disk offering change (" + oldDiskOfferingId + "->" + newDiskOfferingId + "), affected rows: " + rows); - - pstmt = txn.prepareAutoCloseStatement("UPDATE volumes SET disk_offering_id=? WHERE disk_offering_id=?"); - pstmt.setLong(1, newDiskOfferingId); - pstmt.setLong(2, oldDiskOfferingId); - rows = pstmt.executeUpdate(); - pstmt.close(); - s_logger.info("Update volumes for disk offering change (" + oldDiskOfferingId + "->" + newDiskOfferingId + "), affected rows: " + rows); - } catch (SQLException e) { - s_logger.error("Unhandled exception: ", e); - } finally { - txn.close(); - } - } - - private void migrateSystemVmGuestMacAndState(long zoneId) { - // for console proxy VMs - SearchBuilder sb = _consoleProxyDao.createSearchBuilder(); - sb.and("zoneId", sb.entity().getDataCenterIdToDeployIn(), Op.EQ); - sb.done(); - - SearchCriteria sc = sb.create(); - sc.setParameters("zoneId", zoneId); - - List proxies = _consoleProxyDao.searchIncludingRemoved(sc, null, false, false); - for (ConsoleProxyVO proxy : proxies) { - String[] macAddresses = _dcDao.getNextAvailableMacAddressPair(zoneId, (1L << 31)); - String guestMacAddress = macAddresses[0]; - - if (proxy.getState() == State.Running || proxy.getState() == State.Starting) { - System.out.println("System VM " + proxy.getHostName() + " is in active state, mark it to Stopping state for migration"); - proxy.setState(State.Stopping); - } - - String guestIpAddress = _dcDao.allocateLinkLocalIpAddress(proxy.getDataCenterIdToDeployIn(), proxy.getPodIdToDeployIn(), proxy.getId(), null); - - System.out.println("Assign link loal address to proxy " + proxy.getHostName() + ", link local address: " + guestIpAddress); - _consoleProxyDao.update(proxy.getId(), proxy); - } - - // for secondary storage VMs - SearchBuilder sb2 = _secStorageVmDao.createSearchBuilder(); - sb2.and("zoneId", sb2.entity().getDataCenterIdToDeployIn(), Op.EQ); - sb2.done(); - - SearchCriteria sc2 = sb2.create(); - sc2.setParameters("zoneId", zoneId); - - List secStorageVms = _secStorageVmDao.searchIncludingRemoved(sc2, null, false, false); - for (SecondaryStorageVmVO secStorageVm : secStorageVms) { - String[] macAddresses = _dcDao.getNextAvailableMacAddressPair(zoneId, (1L << 31)); - String guestMacAddress = macAddresses[0]; - - if (secStorageVm.getState() == State.Running || secStorageVm.getState() == State.Starting) { - System.out.println("System VM " + secStorageVm.getHostName() + " is in active state, mark it to Stopping state for migration"); - secStorageVm.setState(State.Stopping); - } - - String guestIpAddress = _dcDao.allocateLinkLocalIpAddress(secStorageVm.getDataCenterIdToDeployIn(), secStorageVm.getPodIdToDeployIn(), secStorageVm.getId(), null); - - System.out.println("Assign link loal address to secondary storage VM " + secStorageVm.getHostName() + ", link local address: " + guestIpAddress); - _secStorageVmDao.update(secStorageVm.getId(), secStorageVm); - } - - // for Domain Router VMs - // Although we can list those we are interested, but just too lazy, list all of them and check their states. - SearchBuilder sb3 = _routerDao.createSearchBuilder(); - sb3.and("zoneId", sb3.entity().getDataCenterIdToDeployIn(), Op.EQ); - sb3.done(); - - SearchCriteria sc3 = sb3.create(); - sc3.setParameters("zoneId", zoneId); - List domRs = _routerDao.searchIncludingRemoved(sc3, null, false, false); - for (DomainRouterVO router : domRs) { - if (router.getState() == State.Running || router.getState() == State.Starting) { - router.setState(State.Stopping); - - System.out.println("System VM " + router.getHostName() + " is in active state, mark it to Stopping state for migration"); - _routerDao.update(router.getId(), router); - } - } - } - - private void migrateVmInstanceLastHostId(long zoneId, long podId) { - SearchBuilder sb = _vmInstanceDao.createSearchBuilder(); - sb.and("zoneId", sb.entity().getDataCenterIdToDeployIn(), Op.EQ); - sb.and("podId", sb.entity().getPodIdToDeployIn(), Op.EQ); - sb.done(); - - Random rand = new Random(); - SearchCriteria sc = sb.create(); - sc.setParameters("zoneId", zoneId); - sc.setParameters("podId", podId); - List vmInstances = _vmInstanceDao.searchIncludingRemoved(sc, null, false, false); - List podHosts = getHostsInPod(zoneId, podId); - for (VMInstanceVO vm : vmInstances) { - if (vm.getHostId() != null) { - vm.setLastHostId(vm.getHostId()); - } else { - if (podHosts.size() > 0) { - int next = rand.nextInt(podHosts.size()); - vm.setLastHostId(podHosts.get(next).getId()); - } - } - _vmInstanceDao.update(vm.getId(), vm); - } - } - - private List getHostsInPod(long zoneId, long podId) { - SearchBuilder sb = _hostDao.createSearchBuilder(); - sb.and("zoneId", sb.entity().getDataCenterId(), Op.EQ); - sb.and("podId", sb.entity().getPodId(), Op.EQ); - sb.and("type", sb.entity().getType(), Op.EQ); - sb.done(); - - SearchCriteria sc = sb.create(); - sc.setParameters("zoneId", zoneId); - sc.setParameters("podId", podId); - sc.setParameters("type", Host.Type.Routing.toString()); - - return _hostDao.searchIncludingRemoved(sc, null, false, false); - } - - private void migrateVolumDeviceIds() { - System.out.println("Migrating device_id for volumes, this may take a while, please wait..."); - SearchCriteria sc = _vmInstanceDao.createSearchCriteria(); - List vmInstances = _vmInstanceDao.searchIncludingRemoved(sc, null, false, false); - - long deviceId = 1; - for (VMInstanceVO vm : vmInstances) { - SearchBuilder sb = _volumeDao.createSearchBuilder(); - sb.and("instanceId", sb.entity().getInstanceId(), Op.EQ); - sb.done(); - - SearchCriteria sc2 = sb.create(); - sc2.setParameters("instanceId", vm.getId()); - - List volumes = _volumeDao.searchIncludingRemoved(sc2, null, false, false); - deviceId = 1; // reset for each VM iteration - for (VolumeVO vol : volumes) { - if (vol.getVolumeType() == Volume.Type.ROOT) { - System.out.println("Setting root volume device id to zero, vol: " + vol.getName() + ", instance: " + vm.getHostName()); - - vol.setDeviceId(0L); - } else if (vol.getVolumeType() == Volume.Type.DATADISK) { - System.out.println("Setting data volume device id, vol: " + vol.getName() + ", instance: " + vm.getHostName() + ", device id: " + deviceId); - - vol.setDeviceId(deviceId); - - // don't use device ID 3 - if (++deviceId == 3) { - deviceId++; - } - } else { - System.out.println("Unsupported volume type found for volume: " + vol.getName()); - } - - _volumeDao.update(vol.getId(), vol); - } - } - - System.out.println("Migrating device_id for volumes done"); - } - - private void migrateVolumePoolType() { - System.out.println("Migrating pool type for volumes..."); - - SearchCriteria sc = _volumeDao.createSearchCriteria(); - List volumes = _volumeDao.searchIncludingRemoved(sc, null, false, false); - for (VolumeVO vol : volumes) { - if (vol.getPoolId() != null) { - StoragePoolVO pool = _poolDao.findById(vol.getPoolId()); - if (pool != null) { - vol.setPoolType(pool.getPoolType()); - - _volumeDao.update(vol.getId(), vol); - } else { - System.out.println("Unable to determine pool type for volume: " + vol.getName()); - } - } - } - - System.out.println("Migrating pool type for volumes done"); - } - - private void migrateConfiguration() { - System.out.println("Migrating 2.1 configuration variables..."); - - System.out.print("Are you migrating from 2.0 Premium Edition? (yes/no): "); - String answer = readInput(); - if (answer != null && answer.equalsIgnoreCase("yes")) { - _isPremium = true; - } - - // Save default Configuration Table values - List categories = Config.getCategories(); - for (String category : categories) { - // If this is not a premium environment, don't insert premium configuration values - if (!_isPremium && category.equals("Premium")) { - continue; - } - - List configs = Config.getConfigs(category); - for (Config c : configs) { - String name = c.key(); - - // If the value is already in the table, don't reinsert it - if (_configDao.getValue(name) != null) { - continue; - } - - String instance = "DEFAULT"; - String component = c.getComponent(); - String value = c.getDefaultValue(); - String description = c.getDescription(); - ConfigurationVO configVO = new ConfigurationVO(category, instance, component, name, value, description); - _configDao.persist(configVO); - } - - // If this is a premium environment, set the network type to be "vlan" - if (_isPremium) { - _configDao.update("network.type", "vlan"); - _configDao.update("hypervisor.type", "xenserver"); - _configDao.update("secondary.storage.vm", "true"); - _configDao.update("secstorage.encrypt.copy", "true"); - _configDao.update("secstorage.secure.copy.cert", "realhostip"); - } - - boolean externalIpAlloator = Boolean.parseBoolean(_configDao.getValue("direct.attach.network.externalIpAllocator.enabled")); - String hyperVisor = _configDao.getValue("hypervisor.type"); - if (hyperVisor.equalsIgnoreCase("KVM") && !externalIpAlloator) { - /* For KVM, it's enabled by default */ - _configDao.update("direct.attach.network.externalIpAllocator.enabled", "true"); - } - - // Save the mount parent to the configuration table - String mountParent = getMountParent(); - if (mountParent != null) { - _configDao.update("mount.parent", mountParent); - } - - if (_configDao.getValue("host") == null) { - String hostIpAdr = getHost(); - if (hostIpAdr != null) { - _configDao.update("host", hostIpAdr); - } - } - - // generate a single sign-on key - updateSSOKey(); - } - - System.out.println("Migrating 2.1 configuration done"); - } - - private String getEthDevice() { - String defaultRoute = Script.runSimpleBashScript("/sbin/route | grep default"); - - if (defaultRoute == null) { - return null; - } - - String[] defaultRouteList = defaultRoute.split("\\s+"); - - if (defaultRouteList.length != 8) { - return null; - } - - return defaultRouteList[7]; - } - - protected String getHost() { - NetworkInterface nic = null; - String pubNic = getEthDevice(); - - if (pubNic == null) { - return null; - } - - try { - nic = NetworkInterface.getByName(pubNic); - } catch (final SocketException e) { - return null; - } - - String[] info = NetUtils.getNetworkParams(nic); - return info[0]; - } - - private String getMountParent() { - return getEnvironmentProperty("mount.parent"); - } - - private String getEnvironmentProperty(String name) { - try { - final File propsFile = PropertiesUtil.findConfigFile("environment.properties"); - - if (propsFile == null) { - return null; - } else { - final FileInputStream finputstream = new FileInputStream(propsFile); - final Properties props = new Properties(); - props.load(finputstream); - finputstream.close(); - return props.getProperty("mount.parent"); - } - } catch (IOException e) { - return null; - } - } - - private void updateSSOKey() { - try { - String encodedKey = null; - - // Algorithm for SSO Keys is SHA1, should this be configuable? - KeyGenerator generator = KeyGenerator.getInstance("HmacSHA1"); - SecretKey key = generator.generateKey(); - encodedKey = Base64.encodeBase64URLSafeString(key.getEncoded()); - - _configDao.update("security.singlesignon.key", encodedKey); - } catch (NoSuchAlgorithmException ex) { - s_logger.error("error generating sso key", ex); - } - } - - private void doMigration() { - setupComponents(); - - migrateZones(); - migrateDomains(); - migrateServiceOfferings(); - migrateDiskOfferings(); - migrateVolumDeviceIds(); - migrateVolumePoolType(); - migrateConfiguration(); - - // update disk_offering_id for system VMs. As of the id-space collision for servercie_offering_ids - // before and after migration, this should be done in the last step - updateConsoleProxyServiceOfferingReferences(_consoleProxyServiceOfferingId); - updateSecondaryStorageServiceOfferingReferences(_secStorageServiceOfferingId); - updateDomainRouterServiceOfferingReferences(_domRServiceOfferingId); - - System.out.println("Migration done"); - } - - private String readInput() { - try { - Scanner in = new Scanner(System.in); - String input = in.nextLine(); - return input; - } catch (NoSuchElementException e) { - return ""; - } - } - - private void setupComponents() { - ComponentLocator.getLocator("migration", "migration-components.xml", "log4j-cloud.xml"); - ComponentLocator locator = ComponentLocator.getCurrentLocator(); - - _configDao = locator.getDao(ConfigurationDao.class); - _podDao = locator.getDao(HostPodDao.class); - _dcDao = locator.getDao(DataCenterDao.class); - _clusterDao = locator.getDao(ClusterDao.class); - _hostDao = locator.getDao(HostDao.class); - _spDao = locator.getDao(StoragePoolDao.class); - _domainDao = locator.getDao(DomainDao.class); - _serviceOffering20Dao = locator.getDao(ServiceOffering20Dao.class); - _diskOffering20Dao = locator.getDao(DiskOffering20Dao.class); - _serviceOffering21Dao = locator.getDao(ServiceOffering21Dao.class); - _diskOffering21Dao = locator.getDao(DiskOffering21Dao.class); - _consoleProxyDao = locator.getDao(ConsoleProxyDao.class); - _secStorageVmDao = locator.getDao(SecondaryStorageVmDao.class); - _vmInstanceDao = locator.getDao(VMInstanceDao.class); - _volumeDao = locator.getDao(VolumeDao.class); - _userVmDao = locator.getDao(UserVmDao.class); - _routerDao = locator.getDao(DomainRouterDao.class); - _poolDao = locator.getDao(StoragePoolDao.class); - } - - public static void main(String[] args) { - File file = PropertiesUtil.findConfigFile("log4j-cloud.xml"); - - if (file != null) { - System.out.println("Log4j configuration from : " + file.getAbsolutePath()); - DOMConfigurator.configureAndWatch(file.getAbsolutePath(), 10000); - } else { - System.out.println("Configure log4j with default properties"); - } - - new Db20to21MigrationUtil().doMigration(); - System.exit(0); - } -} diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 4dd2d24a42a..78a2b167e6a 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -91,6 +91,7 @@ import com.cloud.api.commands.UpdateIsoCmd; import com.cloud.api.commands.UpdateTemplateCmd; import com.cloud.api.commands.UpdateTemplateOrIsoCmd; import com.cloud.api.commands.UpdateVMGroupCmd; +import com.cloud.api.commands.UpgradeSystemVMCmd; import com.cloud.api.commands.UploadCustomCertificateCmd; import com.cloud.api.response.ExtractResponse; import com.cloud.async.AsyncJobExecutor; @@ -104,6 +105,7 @@ import com.cloud.capacity.CapacityVO; import com.cloud.capacity.dao.CapacityDao; import com.cloud.capacity.dao.CapacityDaoImpl.SummedCapacity; import com.cloud.configuration.Config; +import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.ConfigurationVO; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.consoleproxy.ConsoleProxyManagementState; @@ -294,6 +296,8 @@ public class ManagementServerImpl implements ManagementServer { private final LoadBalancerDao _loadbalancerDao; private final HypervisorCapabilitiesDao _hypervisorCapabilitiesDao; private final Adapters _hostAllocators; + private final ConfigurationManager _configMgr; + @Inject ProjectManager _projectMgr; private final ResourceManager _resourceMgr; @@ -363,6 +367,7 @@ public class ManagementServerImpl implements ManagementServer { _itMgr = locator.getManager(VirtualMachineManager.class); _ksMgr = locator.getManager(KeystoreManager.class); _resourceMgr = locator.getManager(ResourceManager.class); + _configMgr = locator.getManager(ConfigurationManager.class); _hypervisorCapabilitiesDao = locator.getDao(HypervisorCapabilitiesDao.class); @@ -696,13 +701,6 @@ public class ManagementServerImpl implements ManagementServer { sc.addAnd("vm_type", SearchCriteria.Op.EQ, vmTypeStr); } - if (isSystem && vmTypeStr == null) { - // don't return console proxy and ssvm offerings is not requested with vmTypeStr - sc.addAnd("uniqueName", SearchCriteria.Op.NIN, ServiceOffering.consoleProxyDefaultOffUniqueName, - ServiceOffering.ssvmDefaultOffUniqueName, ServiceOffering.elbVmDefaultOffUniqueName); - - } - sc.addAnd("systemUse", SearchCriteria.Op.EQ, isSystem); sc.addAnd("removed", SearchCriteria.Op.NULL); return _offeringsDao.search(sc, searchFilter); @@ -3339,4 +3337,58 @@ public class ManagementServerImpl implements ManagementServer { return null; } } + + + @Override + public VirtualMachine upgradeSystemVM(UpgradeSystemVMCmd cmd) { + Long systemVmId = cmd.getId(); + Long serviceOfferingId = cmd.getServiceOfferingId(); + Account caller = UserContext.current().getCaller(); + + VMInstanceVO systemVm = _vmInstanceDao.findByIdTypes(systemVmId, VirtualMachine.Type.ConsoleProxy, VirtualMachine.Type.SecondaryStorageVm); + if (systemVm == null) { + throw new InvalidParameterValueException("Unable to find SystemVm with id " + systemVmId); + } + + _accountMgr.checkAccess(caller, null, true, systemVm); + + if (systemVm.getServiceOfferingId() == serviceOfferingId) { + s_logger.debug("System vm id: " + systemVmId + "already has service offering: " + serviceOfferingId); + return systemVm; + } + + ServiceOffering newServiceOffering = _configMgr.getServiceOffering(serviceOfferingId); + if (newServiceOffering == null) { + throw new InvalidParameterValueException("Unable to find service offering with id " + serviceOfferingId); + } + + // check if it is a system service offering, if yes return with error as it cannot be used for user vms + if (!newServiceOffering.getSystemUse()) { + throw new InvalidParameterValueException("Cannot upgrade system vm to a non system service offering " + serviceOfferingId); + } + + // Check that the system vm is stopped + if (!systemVm.getState().equals(State.Stopped)) { + s_logger.warn("Unable to upgrade system vm " + systemVm + " in state " + systemVm.getState()); + throw new InvalidParameterValueException("Unable to upgrade system vm " + systemVm + " in state " + systemVm.getState() + + "; make sure the system vm is stopped and not in an error state before upgrading."); + } + + ServiceOffering currentServiceOffering = _configMgr.getServiceOffering(systemVm.getServiceOfferingId()); + + // Check that the service offering being upgraded to has the same storage pool preference as the VM's current service + // offering + if (currentServiceOffering.getUseLocalStorage() != newServiceOffering.getUseLocalStorage()) { + throw new InvalidParameterValueException("Can't upgrade, due to new local storage status : " + newServiceOffering.getUseLocalStorage() + " is different from " + + "curruent local storage status: " + currentServiceOffering.getUseLocalStorage()); + } + + systemVm.setServiceOfferingId(serviceOfferingId); + if (_vmInstanceDao.update(systemVmId, systemVm)) { + return _vmInstanceDao.findById(systemVmId); + } else { + throw new CloudRuntimeException("Unable to upgrade system vm " + systemVm); + } + + } } diff --git a/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java index bb9ce0d7233..28f28e8fce9 100644 --- a/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java +++ b/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java @@ -28,7 +28,6 @@ import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.offering.ServiceOffering; -import com.cloud.service.ServiceOfferingVO; import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.storage.StoragePool; import com.cloud.storage.StoragePoolHostVO; @@ -76,9 +75,6 @@ public class LocalStoragePoolAllocator extends FirstFitStoragePoolAllocator { protected GenericSearchBuilder VmsOnPoolSearch; private int _secondsToSkipStoppedVMs = 86400; - private int _secStorageVmRamSize = 1024; - private int _proxyRamSize = 256; - private int _routerRamSize = 128; @Override public boolean allocatorIsCorrectType(DiskProfile dskCh) { @@ -131,23 +127,7 @@ public class LocalStoragePoolAllocator extends FirstFitStoragePoolAllocator { // we don't need to check host capacity now, since hostAllocators will do that anyway private boolean hostHasCpuMemoryCapacity(long hostId, List vmOnHost, VMInstanceVO vm) { - ServiceOffering so = null; - if (vm.getType() == VirtualMachine.Type.User) { - UserVmVO userVm = _vmDao.findById(vm.getId()); - if (userVm != null) { - so = _offeringDao.findById(userVm.getServiceOfferingId()); - } - - } else if (vm.getType() == VirtualMachine.Type.ConsoleProxy) { - so = new ServiceOfferingVO("Fake Offering For DomP", 1, _proxyRamSize, 0, 0, 0, false, null, false, true, null, true, VirtualMachine.Type.ConsoleProxy, false); - } else if (vm.getType() == VirtualMachine.Type.SecondaryStorageVm) { - so = new ServiceOfferingVO("Fake Offering For Secondary Storage VM", 1, _secStorageVmRamSize, 0, 0, 0, true, null, false, true, null, true, VirtualMachine.Type.SecondaryStorageVm, false); - } else if (vm.getType() == VirtualMachine.Type.DomainRouter) { - so = new ServiceOfferingVO("Fake Offering For DomR", 1, _routerRamSize, 0, 0, 0, true, null, false, true, null, true, VirtualMachine.Type.DomainRouter, false); - } else { - assert (false) : "Unsupported system vm type"; - so = new ServiceOfferingVO("Fake Offering For unknow system VM", 1, 128, 0, 0, 0, false, null, false, true, null, false, null, false); - } + ServiceOffering so = _offeringDao.findById(vm.getServiceOfferingId()); long usedMemory = calcHostAllocatedCpuMemoryCapacity(vmOnHost, CapacityVO.CAPACITY_TYPE_MEMORY); if (s_logger.isDebugEnabled()) { @@ -235,23 +215,13 @@ public class LocalStoragePoolAllocator extends FirstFitStoragePoolAllocator { continue; } - ServiceOffering so = null; + ServiceOffering so = _offeringDao.findById(vm.getServiceOfferingId()); if (vm.getType() == VirtualMachine.Type.User) { UserVmVO userVm = _vmDao.findById(vm.getId()); if (userVm == null) { continue; } - so = _offeringDao.findById(userVm.getServiceOfferingId()); - } else if (vm.getType() == VirtualMachine.Type.ConsoleProxy) { - so = new ServiceOfferingVO("Fake Offering For DomP", 1, _proxyRamSize, 0, 0, 0, false, null, false, true, null, true, VirtualMachine.Type.ConsoleProxy, false); - } else if (vm.getType() == VirtualMachine.Type.SecondaryStorageVm) { - so = new ServiceOfferingVO("Fake Offering For Secondary Storage VM", 1, _secStorageVmRamSize, 0, 0, 0, true, null, false, true, null, true, VirtualMachine.Type.SecondaryStorageVm, false); - } else if (vm.getType() == VirtualMachine.Type.DomainRouter) { - so = new ServiceOfferingVO("Fake Offering For DomR", 1, _routerRamSize, 0, 0, 0, true, null, false, true, null, true, VirtualMachine.Type.DomainRouter, false); - } else { - assert (false) : "Unsupported system vm type"; - so = new ServiceOfferingVO("Fake Offering For unknow system VM", 1, 128, 0, 0, 0, false, null, false, true, null, false, null, false); - } + } if (capacityType == CapacityVO.CAPACITY_TYPE_MEMORY) { usedCapacity += so.getRamSize() * 1024L * 1024L; @@ -274,11 +244,6 @@ public class LocalStoragePoolAllocator extends FirstFitStoragePoolAllocator { String value = configs.get("vm.resource.release.interval"); _secondsToSkipStoppedVMs = NumbersUtil.parseInt(value, 86400); - // TODO this is not good, there should be one place to get these values - _secStorageVmRamSize = NumbersUtil.parseInt(configs.get("secstorage.vm.ram.size"), 256); - _routerRamSize = NumbersUtil.parseInt(configs.get("router.ram.size"), 128); - _proxyRamSize = NumbersUtil.parseInt(configs.get("consoleproxy.ram.size"), 1024); - VmsOnPoolSearch = _vmInstanceDao.createSearchBuilder(Long.class); VmsOnPoolSearch.select(null, Func.DISTINCT, VmsOnPoolSearch.entity().getId()); VmsOnPoolSearch.and("removed", VmsOnPoolSearch.entity().getRemoved(), SearchCriteria.Op.NULL); diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index 0ed563fa733..a8abf47f3f9 100755 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -220,9 +220,6 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V @Inject KeystoreManager _keystoreMgr; private long _capacityScanInterval = DEFAULT_CAPACITY_SCAN_INTERVAL; - - private int _secStorageVmRamSize; - private int _secStorageVmCpuMHz; private int _secStorageVmMtuSize; private String _instance; @@ -789,9 +786,7 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V } Map configs = configDao.getConfiguration("management-server", params); - - _secStorageVmRamSize = NumbersUtil.parseInt(configs.get("secstorage.vm.ram.size"), DEFAULT_SS_VM_RAMSIZE); - _secStorageVmCpuMHz = NumbersUtil.parseInt(configs.get("secstorage.vm.cpu.mhz"), DEFAULT_SS_VM_CPUMHZ); + _secStorageVmMtuSize = NumbersUtil.parseInt(configs.get("secstorage.vm.mtu.size"), DEFAULT_SS_VM_MTUSIZE); String useServiceVM = configDao.getValue("secondary.storage.vm"); boolean _useServiceVM = false; @@ -827,17 +822,29 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V _agentMgr.registerForHostEvents(_listener, true, false, true); _itMgr.registerGuru(VirtualMachine.Type.SecondaryStorageVm, this); - - _useLocalStorage = Boolean.parseBoolean(configs.get(Config.SystemVMUseLocalStorage.key())); - _serviceOffering = new ServiceOfferingVO("System Offering For Secondary Storage VM", 1, _secStorageVmRamSize, _secStorageVmCpuMHz, null, null, false, null, _useLocalStorage, true, null, true, VirtualMachine.Type.SecondaryStorageVm, true); - _serviceOffering.setUniqueName(ServiceOffering.ssvmDefaultOffUniqueName); - _serviceOffering = _offeringDao.persistSystemServiceOffering(_serviceOffering); - // this can sometimes happen, if DB is manually or programmatically manipulated - if(_serviceOffering == null) { - String msg = "Data integrity problem : System Offering For Secondary Storage VM has been removed?"; - s_logger.error(msg); - throw new ConfigurationException(msg); + //check if there is a default service offering configured + String ssvmSrvcOffIdStr = configs.get(Config.SecondaryStorageServiceOffering.key()); + if (ssvmSrvcOffIdStr != null) { + Long ssvmSrvcOffId = Long.parseLong(ssvmSrvcOffIdStr); + _serviceOffering = _offeringDao.findById(ssvmSrvcOffId); + if (_serviceOffering == null || !_serviceOffering.getSystemUse()) { + String msg = "Can't find system service offering id=" + ssvmSrvcOffId + " for secondary storage vm"; + s_logger.error(msg); + throw new ConfigurationException(msg); + } + } else { + _useLocalStorage = Boolean.parseBoolean(configs.get(Config.SystemVMUseLocalStorage.key())); + _serviceOffering = new ServiceOfferingVO("System Offering For Secondary Storage VM", 1, DEFAULT_SS_VM_RAMSIZE, DEFAULT_SS_VM_CPUMHZ, null, null, false, null, _useLocalStorage, true, null, true, VirtualMachine.Type.SecondaryStorageVm, true); + _serviceOffering.setUniqueName(ServiceOffering.ssvmDefaultOffUniqueName); + _serviceOffering = _offeringDao.persistSystemServiceOffering(_serviceOffering); + + // this can sometimes happen, if DB is manually or programmatically manipulated + if(_serviceOffering == null) { + String msg = "Data integrity problem : System Offering For Secondary Storage VM has been removed?"; + s_logger.error(msg); + throw new ConfigurationException(msg); + } } if (_useServiceVM) { diff --git a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java index 5b1dbf85278..71aaad92755 100755 --- a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java +++ b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java @@ -48,6 +48,7 @@ import com.cloud.upgrade.dao.Upgrade225to226; import com.cloud.upgrade.dao.Upgrade227to228; import com.cloud.upgrade.dao.Upgrade228to229; import com.cloud.upgrade.dao.Upgrade229to2210; +import com.cloud.upgrade.dao.Upgrade301to302; import com.cloud.upgrade.dao.Upgrade30to301; import com.cloud.upgrade.dao.UpgradeSnapshot217to224; import com.cloud.upgrade.dao.UpgradeSnapshot223to224; @@ -76,72 +77,74 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker { new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), - new Upgrade30to301() }); + new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.1.8", new DbUpgrade[] { new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), - new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.1.9", new DbUpgrade[] { new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), - new Upgrade30to301() }); + new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.1", new DbUpgrade[] { new Upgrade221to222(), new UpgradeSnapshot223to224(), new Upgrade222to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.2", new DbUpgrade[] { new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), - new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.3", new DbUpgrade[] { new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), - new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.4", new DbUpgrade[] { new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), - new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.5", new DbUpgrade[] { new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.6", new DbUpgrade[] { new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), - new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.7", new DbUpgrade[] { new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.8", new DbUpgrade[] { new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30() - , new Upgrade30to301() }); + , new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.9", new DbUpgrade[] { new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), - new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.10", new DbUpgrade[] { new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.11", new DbUpgrade[] { new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), - new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.12", new DbUpgrade[] { new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), - new Upgrade30to301() }); + new Upgrade30to301(), new Upgrade301to302() }); - _upgradeMap.put("2.2.13", new DbUpgrade[] { new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + _upgradeMap.put("2.2.13", new DbUpgrade[] { new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); - _upgradeMap.put("2.2.14", new DbUpgrade[] { new Upgrade2214to30(), new Upgrade30to301() }); + _upgradeMap.put("2.2.14", new DbUpgrade[] { new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); - _upgradeMap.put("3.0.0", new DbUpgrade[] { new Upgrade30to301() }); + _upgradeMap.put("3.0.0", new DbUpgrade[] { new Upgrade30to301(), new Upgrade301to302() }); + + _upgradeMap.put("3.0.1", new DbUpgrade[] { new Upgrade301to302() }); } protected void runScript(Connection conn, File file) { diff --git a/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java b/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java index bf6335b3764..f7c348bd368 100755 --- a/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java +++ b/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java @@ -30,6 +30,7 @@ import com.cloud.upgrade.dao.Upgrade225to226; import com.cloud.upgrade.dao.Upgrade227to228Premium; import com.cloud.upgrade.dao.Upgrade228to229; import com.cloud.upgrade.dao.Upgrade229to2210; +import com.cloud.upgrade.dao.Upgrade301to302; import com.cloud.upgrade.dao.Upgrade30to301; import com.cloud.upgrade.dao.UpgradeSnapshot217to224; import com.cloud.upgrade.dao.UpgradeSnapshot223to224; @@ -45,72 +46,79 @@ public class PremiumDatabaseUpgradeChecker extends DatabaseUpgradeChecker { new Upgrade221to222Premium(), new UpgradeSnapshot217to224(), new Upgrade222to224Premium(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), - new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302() }); _upgradeMap.put("2.1.8", new DbUpgrade[] { new Upgrade218to22Premium(), new Upgrade221to222Premium(), new UpgradeSnapshot217to224(), new Upgrade222to224Premium(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213() - , new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + , new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.1.9", new DbUpgrade[] { new Upgrade218to22Premium(), new Upgrade221to222Premium(), new UpgradeSnapshot217to224(), new Upgrade222to224Premium(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.1", new DbUpgrade[] { new Upgrade221to222Premium(), new Upgrade222to224Premium(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), - new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302() }); _upgradeMap.put("2.2.2", new DbUpgrade[] { new Upgrade222to224Premium(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.3", new DbUpgrade[] { new Upgrade222to224Premium(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.4", new DbUpgrade[] { new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), - new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302() }); _upgradeMap.put("2.2.5", new DbUpgrade[] { new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), - new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302() }); _upgradeMap.put("2.2.6", new DbUpgrade[] { new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.7", new DbUpgrade[] { new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.8", new DbUpgrade[] { new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), - new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.9", new DbUpgrade[] { new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), - new Upgrade30to301() }); + new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.10", new DbUpgrade[] { new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); _upgradeMap.put("2.2.11", new DbUpgrade[] { new Upgrade2211to2212Premium(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); _upgradeMap.put("2.2.12", new DbUpgrade[] { new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), - new Upgrade30to301() }); + new Upgrade30to301(), new Upgrade301to302() }); - _upgradeMap.put("2.2.13", new DbUpgrade[] { new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301() }); + _upgradeMap.put("2.2.13", new DbUpgrade[] { new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302() }); - _upgradeMap.put("2.2.14", new DbUpgrade[] { new Upgrade2214to30(), new Upgrade30to301() }); + _upgradeMap.put("2.2.14", new DbUpgrade[] { new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302() }); - _upgradeMap.put("3.0.0", new DbUpgrade[] { new Upgrade30to301() }); + _upgradeMap.put("3.0.0", new DbUpgrade[] { new Upgrade30to301(), new Upgrade301to302() }); + + _upgradeMap.put("3.0.1", new DbUpgrade[] { new Upgrade301to302() }); } } diff --git a/server/src/com/cloud/upgrade/dao/Upgrade301to302.java b/server/src/com/cloud/upgrade/dao/Upgrade301to302.java new file mode 100644 index 00000000000..0f835f103cd --- /dev/null +++ b/server/src/com/cloud/upgrade/dao/Upgrade301to302.java @@ -0,0 +1,67 @@ +/** + * Copyright (C) 2012 Citrix Systems, Inc. All rights reserved + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ +package com.cloud.upgrade.dao; + +/** + * @author Alena Prokharchyk + */ +import java.io.File; +import java.sql.Connection; + +import org.apache.log4j.Logger; + +import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.utils.script.Script; + +public class Upgrade301to302 implements DbUpgrade { + final static Logger s_logger = Logger.getLogger(Upgrade301to302.class); + + @Override + public String[] getUpgradableVersionRange() { + return new String[] { "3.0.1", "3.0.2" }; + } + + @Override + public String getUpgradedVersion() { + return "3.0.2"; + } + + @Override + public boolean supportsRollingUpgrade() { + return true; + } + + @Override + public File[] getPrepareScripts() { + String script = Script.findScript("", "db/schema-301to302.sql"); + if (script == null) { + throw new CloudRuntimeException("Unable to find db/schema-301to302.sql"); + } + + return new File[] { new File(script) }; + } + + @Override + public void performDataMigration(Connection conn) { + } + + @Override + public File[] getCleanupScripts() { + return null; + } +} diff --git a/server/src/com/cloud/upgrade/dao/Upgrade30to301.java b/server/src/com/cloud/upgrade/dao/Upgrade30to301.java index 864cdae1d2c..91c453abc94 100644 --- a/server/src/com/cloud/upgrade/dao/Upgrade30to301.java +++ b/server/src/com/cloud/upgrade/dao/Upgrade30to301.java @@ -25,7 +25,7 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; public class Upgrade30to301 implements DbUpgrade { - final static Logger s_logger = Logger.getLogger(Upgrade2214to30.class); + final static Logger s_logger = Logger.getLogger(Upgrade30to301.class); @Override public String[] getUpgradableVersionRange() { diff --git a/setup/db/db/schema-301to302.sql b/setup/db/db/schema-301to302.sql new file mode 100755 index 00000000000..7f2419f25f7 --- /dev/null +++ b/setup/db/db/schema-301to302.sql @@ -0,0 +1,27 @@ +# Copyright (C) 2012 Citrix Systems, Inc. All rights reserved +# +# This software is licensed under the GNU General Public License v3 or later. +# +# It is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + + +#Schema upgrade from 3.0.1 to 3.0.12; + +DELETE FROM `cloud`.`configuration` WHERE name='consoleproxy.cpu.mhz'; +DELETE FROM `cloud`.`configuration` WHERE name='secstorage.vm.cpu.mhz'; +DELETE FROM `cloud`.`configuration` WHERE name='consoleproxy.ram.size'; +DELETE FROM `cloud`.`configuration` WHERE name='secstorage.vm.ram.size'; + +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'consoleproxy.service.offering', NULL, 'Service offering used by console proxy; if NULL - system offering will be used'); + +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'secstorage.service.offering', NULL, 'Service offering used by secondary storage; if NULL - system offering will be used');