Uh oh!
There was an error while loading. Please reload this page.
Adding AutoScaling for cks + CKS CoreOS EOL update + systemvmtemplate improvements#4329
Uh oh!
There was an error while loading. Please reload this page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -412,6 +412,10 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac | ||
| static final ConfigKey<Boolean> HaVmRestartHostUp = new ConfigKey<Boolean>("Advanced", Boolean.class, "ha.vm.restart.hostup", "true", | ||
| "If an out-of-band stop of a VM is detected and its host is up, then power on the VM", true); | ||
| static final ConfigKey<Long> SystemVmRootDiskSize = new ConfigKey<Long>("Advanced", | ||
| Long.class, "systemvm.root.disk.size", "-1", | ||
yadvr marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| "Size of root volume (in GB) of system VMs and virtual routers", true); | ||
| ScheduledExecutorService _executor = null; | ||
| private long _nodeId; | ||
| @@ -460,6 +464,12 @@ public void allocate(final String vmInstanceName, final VirtualMachineTemplate t | ||
| final VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vmFinal, template, serviceOffering, null, null); | ||
| Long rootDiskSize = rootDiskOfferingInfo.getSize(); | ||
| if (vm.getType().isUsedBySystem() && SystemVmRootDiskSize.value() != null && SystemVmRootDiskSize.value() > 0L) { | ||
yadvr marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| rootDiskSize = SystemVmRootDiskSize.value(); | ||
| } | ||
| final Long rootDiskSizeFinal = rootDiskSize; | ||
Comment on lines
+467
to
+471
Contributor There was a problem hiding this comment. nice little utility method | ||
| Transaction.execute(new TransactionCallbackWithExceptionNoReturn<InsufficientCapacityException>() { | ||
| @Override | ||
| public void doInTransactionWithoutResult(final TransactionStatus status) throws InsufficientCapacityException { | ||
| @@ -485,7 +495,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) throws | ||
| } else if (template.getFormat() == ImageFormat.BAREMETAL) { | ||
| // Do nothing | ||
| } else { | ||
| volumeMgr.allocateTemplatedVolumes(Type.ROOT, "ROOT-" + vmFinal.getId(), rootDiskOfferingInfo.getDiskOffering(), rootDiskSizeFinal, | ||
| rootDiskOfferingInfo.getMinIops(), rootDiskOfferingInfo.getMaxIops(), template, vmFinal, owner); | ||
| } | ||
| @@ -1728,7 +1738,7 @@ protected boolean sendStop(final VirtualMachineGuru guru, final VirtualMachinePr | ||
| final UserVmVO userVm = _userVmDao.findById(vm.getId()); | ||
| if (vm.getType() == VirtualMachine.Type.User) { | ||
| if (userVm != null){ | ||
| userVm.setPowerState(PowerState.PowerOff); | ||
| _userVmDao.update(userVm.getId(), userVm); | ||
| } | ||
| @@ -4829,7 +4839,7 @@ public ConfigKey<?>[] getConfigKeys() { | ||
| return new ConfigKey<?>[] { ClusterDeltaSyncInterval, StartRetry, VmDestroyForcestop, VmOpCancelInterval, VmOpCleanupInterval, VmOpCleanupWait, | ||
| VmOpLockStateRetry, VmOpWaitInterval, ExecuteInSequence, VmJobCheckInterval, VmJobTimeout, VmJobStateReportInterval, | ||
| VmConfigDriveLabel, VmConfigDriveOnPrimaryPool, VmConfigDriveForceHostCacheUse, VmConfigDriveUseHostCacheOnUnsupportedPool, | ||
| HaVmRestartHostUp, ResourceCountRunningVMsonly, AllowExposeHypervisorHostname, AllowExposeHypervisorHostnameAccountLevel, SystemVmRootDiskSize }; | ||
| } | ||
| public List<StoragePoolAllocator> getStoragePoolAllocators() { | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -52,5 +52,175 @@ | ||
| <groupId>mysql</groupId> | ||
| <artifactId>mysql-connector-java</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.ini4j</groupId> | ||
| <artifactId>ini4j</artifactId> | ||
| <version>${cs.ini.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.codehaus.gmaven</groupId> | ||
| <artifactId>gmaven-plugin</artifactId> | ||
| <version>1.5</version> | ||
| <executions> | ||
| <execution> | ||
| <id>setproperty</id> | ||
| <phase>validate</phase> | ||
| <goals> | ||
| <goal>execute</goal> | ||
| </goals> | ||
| <configuration> | ||
| <source> | ||
| def projectVersion = project.version | ||
| String[] versionParts = projectVersion.tokenize('.') | ||
| pom.properties['cs.version'] = versionParts[0] + "." + versionParts[1] | ||
| pom.properties['patch.version'] = versionParts[2] | ||
| </source> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>com.googlecode.maven-download-plugin</groupId> | ||
| <artifactId>download-maven-plugin</artifactId> | ||
| <version>1.6.3</version> | ||
| <executions> | ||
| <execution> | ||
| <id>download-checksums</id> | ||
| <phase>validate</phase> | ||
| <goals> | ||
| <goal>wget</goal> | ||
| </goals> | ||
| <configuration> | ||
| <url>https://download.cloudstack.org/systemvm/${cs.version}/md5sum.txt</url> | ||
| <outputDirectory>${basedir}/dist/systemvm-templates/</outputDirectory> | ||
| <skipCache>true</skipCache> | ||
yadvr marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| <overwrite>true</overwrite> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.codehaus.gmaven</groupId> | ||
| <artifactId>gmaven-plugin</artifactId> | ||
| <version>1.5</version> | ||
| <executions> | ||
| <execution> | ||
| <id>set-properties</id> | ||
| <phase>generate-sources</phase> | ||
| <goals> | ||
| <goal>execute</goal> | ||
| </goals> | ||
| <configuration> | ||
| <source> | ||
| def csVersion = pom.properties['cs.version'] | ||
| def patch = pom.properties['patch.version'] | ||
| def templateList = [] | ||
| templateList.add("systemvmtemplate-${csVersion}.${patch}-kvm") | ||
| templateList.add("systemvmtemplate-${csVersion}.${patch}-vmware") | ||
| templateList.add("systemvmtemplate-${csVersion}.${patch}-xen") | ||
| templateList.add("systemvmtemplate-${csVersion}.${patch}-ovm") | ||
| templateList.add("systemvmtemplate-${csVersion}.${patch}-hyperv") | ||
| File file = new File("./engine/schema/dist/systemvm-templates/md5sum.txt") | ||
| def lines = file.readLines() | ||
| for (template in templateList) { | ||
| def data = lines.findAll { it.contains(template) } | ||
| if (data != null) { | ||
| def hypervisor = template.tokenize('-')[-1] | ||
| pom.properties["$hypervisor" + ".checksum"] = data[0].tokenize(' ')[0] | ||
| } | ||
| } | ||
| </source> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>exec-maven-plugin</artifactId> | ||
| <version>1.2.1</version> | ||
| <executions> | ||
| <execution> | ||
| <id>systemvm-template-metadata</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>exec</goal> | ||
| </goals> | ||
| <configuration> | ||
| <workingDirectory>${basedir}/</workingDirectory> | ||
| <executable>bash</executable> | ||
| <arguments> | ||
| <argument>templateConfig.sh</argument> | ||
| <armument>${project.version}</armument> | ||
| </arguments> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <profiles> | ||
| <profile> | ||
| <id>template-create</id> | ||
| <activation> | ||
| <property> | ||
| <name>noredist</name> | ||
| </property> | ||
| </activation> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-resources-plugin</artifactId> | ||
| <version>${cs.resources-plugin.version}</version> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>com.googlecode.maven-download-plugin</groupId> | ||
| <artifactId>download-maven-plugin</artifactId> | ||
| <version>1.6.3</version> | ||
| <executions> | ||
| <execution> | ||
| <id>download-kvm-template</id> | ||
| <goals> | ||
| <goal>wget</goal> | ||
| </goals> | ||
| <configuration> | ||
| <checkSignature>true</checkSignature> | ||
| <url>https://download.cloudstack.org/systemvm/${cs.version}/systemvmtemplate-${cs.version}.${patch.version}-kvm.qcow2.bz2</url> | ||
| <outputDirectory>${basedir}/dist/systemvm-templates/</outputDirectory> | ||
yadvr marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| <md5>${kvm.checksum}</md5> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>download-vmware-template</id> | ||
| <goals> | ||
| <goal>wget</goal> | ||
| </goals> | ||
| <configuration> | ||
| <checkSignature>true</checkSignature> | ||
| <url>https://download.cloudstack.org/systemvm/${cs.version}/systemvmtemplate-${cs.version}.${patch.version}-vmware.ova</url> | ||
| <outputDirectory>${basedir}/dist/systemvm-templates/</outputDirectory> | ||
| <md5>${vmware.checksum}</md5> | ||
| </configuration> | ||
Pearl1594 marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| </execution> | ||
| <execution> | ||
| <id>download-xenserver-template</id> | ||
| <goals> | ||
| <goal>wget</goal> | ||
| </goals> | ||
| <configuration> | ||
| <checkSignature>true</checkSignature> | ||
| <url>https://download.cloudstack.org/systemvm/${cs.version}/systemvmtemplate-${cs.version}.${patch.version}-xen.vhd.bz2</url> | ||
| <outputDirectory>${basedir}/dist/systemvm-templates/</outputDirectory> | ||
Pearl1594 marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| <md5>${xen.checksum}</md5> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
| </profiles> | ||
| </project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -39,8 +39,10 @@ | ||||||
| import java.sql.SQLException; | ||||||
| import java.util.ArrayList; | ||||||
| import java.util.HashMap; | ||||||
| import java.util.HashSet; | ||||||
| import java.util.List; | ||||||
| import java.util.Map; | ||||||
| import java.util.Set; | ||||||
| @Component | ||||||
| public class ClusterDaoImpl extends GenericDaoBase<ClusterVO, Long> implements ClusterDao { | ||||||
| @@ -51,6 +53,7 @@ public class ClusterDaoImpl extends GenericDaoBase<ClusterVO, Long> implements C | ||||||
| protected final SearchBuilder<ClusterVO> ZoneSearch; | ||||||
| protected final SearchBuilder<ClusterVO> ZoneHyTypeSearch; | ||||||
| protected final SearchBuilder<ClusterVO> ZoneClusterSearch; | ||||||
| protected final SearchBuilder<ClusterVO> ClusterSearch; | ||||||
| protected GenericSearchBuilder<ClusterVO, Long> ClusterIdSearch; | ||||||
| @@ -97,6 +100,10 @@ public ClusterDaoImpl() { | ||||||
| ClusterIdSearch.selectFields(ClusterIdSearch.entity().getId()); | ||||||
| ClusterIdSearch.and("dataCenterId", ClusterIdSearch.entity().getDataCenterId(), Op.EQ); | ||||||
| ClusterIdSearch.done(); | ||||||
| ClusterSearch = createSearchBuilder(); | ||||||
| ClusterSearch.select(null, Func.DISTINCT, ClusterSearch.entity().getHypervisorType()); | ||||||
| ClusterIdSearch.done(); | ||||||
| } | ||||||
| @Override | ||||||
| @@ -154,6 +161,17 @@ public List<HypervisorType> getAvailableHypervisorInZone(Long zoneId) { | ||||||
| return hypers; | ||||||
| } | ||||||
| @Override | ||||||
| public Set<HypervisorType> getDistictAvailableHypervisorsAcrossClusters() { | ||||||
| SearchCriteria<ClusterVO> sc = ClusterSearch.create(); | ||||||
| List<ClusterVO> clusters = listBy(sc); | ||||||
| Set<HypervisorType> hypers = new HashSet<>(); | ||||||
Contributor There was a problem hiding this comment.
Suggested change
| ||||||
| for (ClusterVO cluster : clusters) { | ||||||
| hypers.add(cluster.getHypervisorType()); | ||||||
| } | ||||||
| return hypers; | ||||||
| } | ||||||
| @Override | ||||||
| public Map<Long, List<Long>> getPodClusterIdMap(List<Long> clusterIds) { | ||||||
| TransactionLegacy txn = TransactionLegacy.currentTxn(); | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -20,6 +20,7 @@ | ||
| import java.util.Map; | ||
| import com.cloud.hypervisor.Hypervisor.HypervisorType; | ||
| import com.cloud.storage.Storage; | ||
| import com.cloud.storage.VMTemplateVO; | ||
| import com.cloud.template.VirtualMachineTemplate; | ||
| import com.cloud.utils.db.GenericDao; | ||
| @@ -72,6 +73,8 @@ public interface VMTemplateDao extends GenericDao<VMTemplateVO, Long>, StateDao< | ||
| VMTemplateVO findRoutingTemplate(HypervisorType type, String templateName); | ||
| VMTemplateVO findLatestTemplateByTypeAndHypervisor(HypervisorType hypervisorType, Storage.TemplateType type); | ||
| public Long countTemplatesForAccount(long accountId); | ||
| public List<VMTemplateVO> listUnRemovedTemplatesByStates(VirtualMachineTemplate.State ...states); | ||
| @@ -81,4 +84,6 @@ public interface VMTemplateDao extends GenericDao<VMTemplateVO, Long>, StateDao< | ||
| void saveDetails(VMTemplateVO tmpl); | ||
| List<VMTemplateVO> listByParentTemplatetId(long parentTemplatetId); | ||
| VMTemplateVO findLatestTemplateByName(String name); | ||
| } | ||
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.