[cloudstack] branch main updated: Enable CPU cap for SSVMs and CPVMs (#6420)

[gutoveronezi]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 8448fe27a6 Enable CPU cap for SSVMs and CPVMs (#6420)
8448fe27a6 is described below

commit 8448fe27a617b9d3c8e69cc789f3bf009750e3af
Author: João Jandre <48719461+joaojan...@users.noreply.github.com>
AuthorDate: Fri Jun 24 16:56:29 2022 -0300

    Enable CPU cap for SSVMs and CPVMs (#6420)
    
    * Enable CPU cap for SSVMs and CPVMs
    
    * Resolve conflicts
    
    Co-authored-by: Joao <joaojan...@gitlab.com>
---
 .../schema/src/main/resources/META-INF/db/schema-41710to41800.sql  | 7 ++++++-
 .../main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java  | 1 +
 .../cloudstack/secondarystorage/SecondaryStorageManagerImpl.java   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git 
a/engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql 
b/engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql
index 7acb3e7c1a..2465dcc375 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql
@@ -17,4 +17,9 @@
 
 --;
 -- Schema upgrade from 4.17.1.0 to 4.18.0.0
---;
\ No newline at end of file
+--;
+
+-- Enable CPU cap for default system offerings;
+UPDATE `cloud`.`service_offering` so
+SET so.limit_cpu_use = 1
+WHERE so.default_use = 1 AND so.vm_type IN ('domainrouter', 
'secondarystoragevm', 'consoleproxy', 'internalloadbalancervm', 
'elasticloadbalancervm');
\ No newline at end of file
diff --git 
a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java 
b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 4b02e7f422..f984dab21b 100644
--- a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -695,6 +695,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase 
implements ConsoleProxy
             new ConsoleProxyVO(id, serviceOffering.getId(), name, 
template.getId(), template.getHypervisorType(), template.getGuestOSId(), 
dataCenterId,
                 systemAcct.getDomainId(), systemAcct.getId(), 
accountManager.getSystemUser().getId(), 0, serviceOffering.isOfferHA());
         proxy.setDynamicallyScalable(template.isDynamicallyScalable());
+        proxy.setLimitCpuUse(serviceOffering.getLimitCpuUse());
         proxy = consoleProxyDao.persist(proxy);
         try {
             virtualMachineManager.allocate(name, template, serviceOffering, 
networks, plan, null);
diff --git 
a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
 
b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index 10229ae17d..a6d425c060 100644
--- 
a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ 
b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -631,6 +631,7 @@ public class SecondaryStorageManagerImpl extends 
ManagerBase implements Secondar
             new SecondaryStorageVmVO(id, serviceOffering.getId(), name, 
template.getId(), template.getHypervisorType(), template.getGuestOSId(), 
dataCenterId,
                 systemAcct.getDomainId(), systemAcct.getId(), 
_accountMgr.getSystemUser().getId(), role, serviceOffering.isOfferHA());
         secStorageVm.setDynamicallyScalable(template.isDynamicallyScalable());
+        secStorageVm.setLimitCpuUse(serviceOffering.getLimitCpuUse());
         secStorageVm = _secStorageVmDao.persist(secStorageVm);
         try {
             _itMgr.allocate(name, template, serviceOffering, networks, plan, 
null);