Merge remote-tracking branch 'origin/4.17'

yadvr · yadvr · commit 3fc825e246ae · 2022-06-30T12:17:29.000+05:30
diff --git a/api/src/main/java/com/cloud/user/ResourceLimitService.java b/api/src/main/java/com/cloud/user/ResourceLimitService.java
@@ -27,7 +27,11 @@
 
 public interface ResourceLimitService {
 
-    static final ConfigKey<Long> ResourceCountCheckInterval = new ConfigKey<Long>("Advanced", Long.class, "resourcecount.check.interval", "300",
+    static final ConfigKey<Long> MaxAccountSecondaryStorage = new ConfigKey<>("Account Defaults", Long.class, "max.account.secondary.storage", "400",
+            "The default maximum secondary storage space (in GiB) that can be used for an account", false);
+    static final ConfigKey<Long> MaxProjectSecondaryStorage = new ConfigKey<>("Project Defaults", Long.class, "max.project.secondary.storage", "400",
+            "The default maximum secondary storage space (in GiB) that can be used for a project", false);
+    static final ConfigKey<Long> ResourceCountCheckInterval = new ConfigKey<>("Advanced", Long.class, "resourcecount.check.interval", "300",
             "Time (in seconds) to wait before running resource recalculation and fixing task. Default is 300 seconds, Setting this to 0 disables execution of the task", false);
 
     /**
diff --git a/core/src/main/java/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java b/core/src/main/java/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java
@@ -49,7 +49,7 @@ public class TemplateOrVolumePostUploadCommand {
 
     String description;
 
-    private String defaultMaxAccountSecondaryStorage;
+    private long defaultMaxSecondaryStorageInGB;
 
     private long processTimeout;
 
@@ -185,12 +185,12 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    public void setDefaultMaxAccountSecondaryStorage(String defaultMaxAccountSecondaryStorage) {
-        this.defaultMaxAccountSecondaryStorage = defaultMaxAccountSecondaryStorage;
+    public void setDefaultMaxSecondaryStorageInGB(long defaultMaxSecondaryStorageInGB) {
+        this.defaultMaxSecondaryStorageInGB = defaultMaxSecondaryStorageInGB;
     }
 
-    public String getDefaultMaxAccountSecondaryStorage() {
-        return defaultMaxAccountSecondaryStorage;
+    public long getDefaultMaxSecondaryStorageInGB() {
+        return defaultMaxSecondaryStorageInGB;
     }
 
     public void setAccountId(long accountId) {
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
@@ -588,6 +588,7 @@ public KubernetesClusterResponse createKubernetesClusterResponse(long kubernetes
         response.setAutoscalingEnabled(kubernetesCluster.getAutoscalingEnabled());
         response.setMinSize(kubernetesCluster.getMinSize());
         response.setMaxSize(kubernetesCluster.getMaxSize());
+        response.setCreated(kubernetesCluster.getCreated());
         return response;
     }
 
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesSupportedVersion.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesSupportedVersion.java
@@ -20,6 +20,8 @@
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
+import java.util.Date;
+
 /**
  * KubernetesSupportedVersion describes the properties of supported kubernetes version
  *
@@ -36,6 +38,7 @@ public enum State {
     long getIsoId();
     Long getZoneId();
     State getState();
+    Date getCreated();
 
     /**
      * @return minimum # of cpu.
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesSupportedVersionVO.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesSupportedVersionVO.java
@@ -158,6 +158,7 @@ public void setMinimumRamSize(int minimumRamSize) {
         this.minimumRamSize = minimumRamSize;
     }
 
+    @Override
     public Date getCreated() {
         return created;
     }
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionManagerImpl.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionManagerImpl.java
@@ -105,6 +105,7 @@ private KubernetesSupportedVersionResponse createKubernetesSupportedVersionRespo
             response.setIsoName(template.getName());
             response.setIsoState(template.getState().toString());
         }
+        response.setCreated(kubernetesSupportedVersion.getCreated());
         return response;
     }
 
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesClusterResponse.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesClusterResponse.java
@@ -16,6 +16,7 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
+import java.util.Date;
 import java.util.List;
 
 import org.apache.cloudstack.api.ApiConstants;
@@ -158,6 +159,10 @@ public class KubernetesClusterResponse extends BaseResponseWithAnnotations imple
     @Param(description = "Maximum size of the cluster")
     private Long maxSize;
 
+    @SerializedName(ApiConstants.CREATED)
+    @Param(description = "the date when this Kubernetes cluster was created")
+    private Date created;
+
     public KubernetesClusterResponse() {
     }
 
@@ -377,4 +382,8 @@ public void setMinSize(Long minSize) {
     public void setMaxSize(Long maxSize) {
         this.maxSize = maxSize;
     }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
 }
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesSupportedVersionResponse.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesSupportedVersionResponse.java
@@ -25,6 +25,8 @@
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 
+import java.util.Date;
+
 @SuppressWarnings("unused")
 @EntityReference(value = {KubernetesSupportedVersion.class})
 public class KubernetesSupportedVersionResponse extends BaseResponse {
@@ -80,6 +82,10 @@ public class KubernetesSupportedVersionResponse extends BaseResponse {
     @Param(description = "the minimum RAM size in MB needed for the Kubernetes supported version")
     private Integer minimumRamSize;
 
+    @SerializedName(ApiConstants.CREATED)
+    @Param(description = "the date when this Kubernetes supported version was created")
+    private Date created;
+
     public String getId() {
         return id;
     }
@@ -183,4 +189,8 @@ public Boolean getSupportsAutoscaling() {
     public void setSupportsAutoscaling(Boolean supportsAutoscaling) {
         this.supportsAutoscaling = supportsAutoscaling;
     }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
 }
diff --git a/server/src/main/java/com/cloud/configuration/Config.java b/server/src/main/java/com/cloud/configuration/Config.java
@@ -1361,14 +1361,6 @@ public enum Config {
             "200",
             "The default maximum primary storage space (in GiB) that can be used for an account",
             null),
-    DefaultMaxAccountSecondaryStorage(
-            "Account Defaults",
-            ManagementServer.class,
-            Long.class,
-            "max.account.secondary.storage",
-            "400",
-            "The default maximum secondary storage space (in GiB) that can be used for an account",
-            null),
 
     //disabling lb as cluster sync does not work with distributed cluster
     SubDomainNetworkAccess(
@@ -1497,14 +1489,6 @@ public enum Config {
             "200",
             "The default maximum primary storage space (in GiB) that can be used for an project",
             null),
-    DefaultMaxProjectSecondaryStorage(
-            "Project Defaults",
-            ManagementServer.class,
-            Long.class,
-            "max.project.secondary.storage",
-            "400",
-            "The default maximum secondary storage space (in GiB) that can be used for an project",
-            null),
 
     ProjectInviteRequired(
             "Project Defaults",
diff --git a/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -47,6 +47,7 @@
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.lb.ApplicationLoadBalancerRuleVO;
 import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
 import com.cloud.agent.api.to.LoadBalancerTO;
@@ -2105,6 +2106,7 @@ public LoadBalancer updateLoadBalancerRule(UpdateLoadBalancerRuleCmd cmd) {
         LoadBalancerVO lbBackup = _lbDao.findById(lbRuleId);
         String customId = cmd.getCustomId();
         Boolean forDisplay = cmd.getDisplay();
+        String lbProtocol = cmd.getLbProtocol();
 
         if (lb == null) {
             throw new InvalidParameterValueException("Unable to find lb rule by id=" + lbRuleId);
@@ -2133,6 +2135,10 @@ public LoadBalancer updateLoadBalancerRule(UpdateLoadBalancerRuleCmd cmd) {
             lb.setDisplay(forDisplay);
         }
 
+        if (StringUtils.isNotBlank(lbProtocol)) {
+            lb.setLbProtocol(lbProtocol);
+        }
+
         // Validate rule in LB provider
         LoadBalancingRule rule = getLoadBalancerRuleToApply(lb);
         if (!validateLbRule(rule)) {
diff --git a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
@@ -226,7 +226,7 @@ public boolean configure(final String name, final Map<String, Object> params) th
             projectResourceLimitMap.put(Resource.ResourceType.cpu, Long.parseLong(_configDao.getValue(Config.DefaultMaxProjectCpus.key())));
             projectResourceLimitMap.put(Resource.ResourceType.memory, Long.parseLong(_configDao.getValue(Config.DefaultMaxProjectMemory.key())));
             projectResourceLimitMap.put(Resource.ResourceType.primary_storage, Long.parseLong(_configDao.getValue(Config.DefaultMaxProjectPrimaryStorage.key())));
-            projectResourceLimitMap.put(Resource.ResourceType.secondary_storage, Long.parseLong(_configDao.getValue(Config.DefaultMaxProjectSecondaryStorage.key())));
+            projectResourceLimitMap.put(Resource.ResourceType.secondary_storage, MaxProjectSecondaryStorage.value());
 
             accountResourceLimitMap.put(Resource.ResourceType.public_ip, Long.parseLong(_configDao.getValue(Config.DefaultMaxAccountPublicIPs.key())));
             accountResourceLimitMap.put(Resource.ResourceType.snapshot, Long.parseLong(_configDao.getValue(Config.DefaultMaxAccountSnapshots.key())));
@@ -238,7 +238,7 @@ public boolean configure(final String name, final Map<String, Object> params) th
             accountResourceLimitMap.put(Resource.ResourceType.cpu, Long.parseLong(_configDao.getValue(Config.DefaultMaxAccountCpus.key())));
             accountResourceLimitMap.put(Resource.ResourceType.memory, Long.parseLong(_configDao.getValue(Config.DefaultMaxAccountMemory.key())));
             accountResourceLimitMap.put(Resource.ResourceType.primary_storage, Long.parseLong(_configDao.getValue(Config.DefaultMaxAccountPrimaryStorage.key())));
-            accountResourceLimitMap.put(Resource.ResourceType.secondary_storage, Long.parseLong(_configDao.getValue(Config.DefaultMaxAccountSecondaryStorage.key())));
+            accountResourceLimitMap.put(Resource.ResourceType.secondary_storage, MaxAccountSecondaryStorage.value());
 
             domainResourceLimitMap.put(Resource.ResourceType.public_ip, Long.parseLong(_configDao.getValue(Config.DefaultMaxDomainPublicIPs.key())));
             domainResourceLimitMap.put(Resource.ResourceType.snapshot, Long.parseLong(_configDao.getValue(Config.DefaultMaxDomainSnapshots.key())));
@@ -1100,7 +1100,7 @@ public String getConfigComponentName() {
 
     @Override
     public ConfigKey<?>[] getConfigKeys() {
-        return new ConfigKey<?>[] {ResourceCountCheckInterval};
+        return new ConfigKey<?>[] {ResourceCountCheckInterval, MaxAccountSecondaryStorage, MaxProjectSecondaryStorage};
     }
 
     protected class ResourceCountCheckTask extends ManagedContextRunnable {
diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -456,8 +456,13 @@ public GetUploadParamsResponse doInTransaction(TransactionStatus status) throws
                 //using the existing max upload size configuration
                 command.setProcessTimeout(NumbersUtil.parseLong(_configDao.getValue("vmware.package.ova.timeout"), 3600));
                 command.setMaxUploadSize(_configDao.getValue(Config.MaxUploadVolumeSize.key()));
-                command.setDefaultMaxAccountSecondaryStorage(_configDao.getValue(Config.DefaultMaxAccountSecondaryStorage.key()));
                 command.setAccountId(vol.getAccountId());
+                Account account = _accountDao.findById(vol.getAccountId());
+                if (account.getType().equals(Account.Type.PROJECT)) {
+                    command.setDefaultMaxSecondaryStorageInGB(ResourceLimitService.MaxProjectSecondaryStorage.value());
+                } else {
+                    command.setDefaultMaxSecondaryStorageInGB(ResourceLimitService.MaxAccountSecondaryStorage.value());
+                }
                 Gson gson = new GsonBuilder().create();
                 String metadata = EncryptionUtil.encodeData(gson.toJson(command), key);
                 response.setMetadata(metadata);
diff --git a/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java
@@ -93,6 +93,7 @@
 import com.cloud.storage.download.DownloadMonitor;
 import com.cloud.template.VirtualMachineTemplate.State;
 import com.cloud.user.Account;
+import com.cloud.user.ResourceLimitService;
 import com.cloud.utils.Pair;
 import com.cloud.utils.UriUtils;
 import com.cloud.utils.db.DB;
@@ -398,8 +399,13 @@ public List<TemplateOrVolumePostUploadCommand> doInTransaction(TransactionStatus
                             templateOnStore.getDataStore().getRole().toString());
                     //using the existing max template size configuration
                     payload.setMaxUploadSize(_configDao.getValue(Config.MaxTemplateAndIsoSize.key()));
-                    payload.setDefaultMaxAccountSecondaryStorage(_configDao.getValue(Config.DefaultMaxAccountSecondaryStorage.key()));
                     payload.setAccountId(template.getAccountId());
+                    Account account = _accountDao.findById(template.getAccountId());
+                    if (account.getType().equals(Account.Type.PROJECT)) {
+                        payload.setDefaultMaxSecondaryStorageInGB(ResourceLimitService.MaxProjectSecondaryStorage.value());
+                    } else {
+                        payload.setDefaultMaxSecondaryStorageInGB(ResourceLimitService.MaxAccountSecondaryStorage.value());
+                    }
                     payload.setRemoteEndPoint(ep.getPublicAddr());
                     payload.setRequiresHvm(template.requiresHvm());
                     payload.setDescription(template.getDisplayText());
diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -3275,12 +3275,12 @@ private synchronized void checkSecondaryStorageResourceLimit(TemplateOrVolumePos
                 "accountTemplateDirSize: " + accountTemplateDirSize + " accountSnapshotDirSize: " + accountSnapshotDirSize + " accountVolumeDirSize: " + accountVolumeDirSize);
 
         int accountDirSizeInGB = getSizeInGB(accountTemplateDirSize + accountSnapshotDirSize + accountVolumeDirSize);
-        int defaultMaxAccountSecondaryStorageInGB = Integer.parseInt(cmd.getDefaultMaxAccountSecondaryStorage());
+        long defaultMaxSecondaryStorageInGB = cmd.getDefaultMaxSecondaryStorageInGB();
 
-        if (defaultMaxAccountSecondaryStorageInGB != Resource.RESOURCE_UNLIMITED && (accountDirSizeInGB + contentLengthInGB) > defaultMaxAccountSecondaryStorageInGB) {
-            s_logger.error("accountDirSizeInGb: " + accountDirSizeInGB + " defaultMaxAccountSecondaryStorageInGB: " + defaultMaxAccountSecondaryStorageInGB + " contentLengthInGB:"
+        if (defaultMaxSecondaryStorageInGB != Resource.RESOURCE_UNLIMITED && (accountDirSizeInGB + contentLengthInGB) > defaultMaxSecondaryStorageInGB) {
+            s_logger.error("accountDirSizeInGb: " + accountDirSizeInGB + " defaultMaxSecondaryStorageInGB: " + defaultMaxSecondaryStorageInGB + " contentLengthInGB:"
                     + contentLengthInGB); // extra attention
-            String errorMessage = "Maximum number of resources of type secondary_storage for account has exceeded";
+            String errorMessage = "Maximum number of resources of type secondary_storage for account/project has exceeded";
             updateStateMapWithError(cmd.getEntityUUID(), errorMessage);
             throw new InvalidParameterValueException(errorMessage);
         }
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js
diff --git a/ui/src/config/section/image.js b/ui/src/config/section/image.js

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public class TemplateOrVolumePostUploadCommand {`
`49`	`49`
`50`	`50`	`String description;`
`51`	`51`
`52`		`- private String defaultMaxAccountSecondaryStorage;`
	`52`	`+ private long defaultMaxSecondaryStorageInGB;`
`53`	`53`
`54`	`54`	`private long processTimeout;`
`55`	`55`
`@@ -185,12 +185,12 @@ public void setDescription(String description) {`
`185`	`185`	`this.description = description;`
`186`	`186`	`}`
`187`	`187`
`188`		`- public void setDefaultMaxAccountSecondaryStorage(String defaultMaxAccountSecondaryStorage) {`
`189`		`- this.defaultMaxAccountSecondaryStorage = defaultMaxAccountSecondaryStorage;`
	`188`	`+ public void setDefaultMaxSecondaryStorageInGB(long defaultMaxSecondaryStorageInGB) {`
	`189`	`+ this.defaultMaxSecondaryStorageInGB = defaultMaxSecondaryStorageInGB;`
`190`	`190`	`}`
`191`	`191`
`192`		`- public String getDefaultMaxAccountSecondaryStorage() {`
`193`		`- return defaultMaxAccountSecondaryStorage;`
	`192`	`+ public long getDefaultMaxSecondaryStorageInGB() {`
	`193`	`+ return defaultMaxSecondaryStorageInGB;`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`public void setAccountId(long accountId) {`
Original file line number	Diff line number	Diff line change
`@@ -588,6 +588,7 @@ public KubernetesClusterResponse createKubernetesClusterResponse(long kubernetes`
`588`	`588`	`response.setAutoscalingEnabled(kubernetesCluster.getAutoscalingEnabled());`
`589`	`589`	`response.setMinSize(kubernetesCluster.getMinSize());`
`590`	`590`	`response.setMaxSize(kubernetesCluster.getMaxSize());`
	`591`	`+ response.setCreated(kubernetesCluster.getCreated());`
`591`	`592`	`return response;`
`592`	`593`	`}`
`593`	`594`
Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ public void setMinimumRamSize(int minimumRamSize) {`
`158`	`158`	`this.minimumRamSize = minimumRamSize;`
`159`	`159`	`}`
`160`	`160`
	`161`	`+ @Override`
`161`	`162`	`public Date getCreated() {`
`162`	`163`	`return created;`
`163`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ private KubernetesSupportedVersionResponse createKubernetesSupportedVersionRespo`
`105`	`105`	`response.setIsoName(template.getName());`
`106`	`106`	`response.setIsoState(template.getState().toString());`
`107`	`107`	`}`
	`108`	`+ response.setCreated(kubernetesSupportedVersion.getCreated());`
`108`	`109`	`return response;`
`109`	`110`	`}`
`110`	`111`