From 4ec337fd2a9c93f2a8072d885791e18152c39fcc Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Sat, 29 May 2021 16:15:40 +0530 Subject: [PATCH 1/2] ui: pass requireshvm param for register/upload template API (#5050) Signed-off-by: Abhishek Kumar --- ui/src/views/image/RegisterOrUploadTemplate.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui/src/views/image/RegisterOrUploadTemplate.vue b/ui/src/views/image/RegisterOrUploadTemplate.vue index 704cda59ef6..0f65cb56e4b 100644 --- a/ui/src/views/image/RegisterOrUploadTemplate.vue +++ b/ui/src/views/image/RegisterOrUploadTemplate.vue @@ -837,6 +837,9 @@ export default { } } } + if (!('requireshvm' in params)) { // handled as default true by API + params.requireshvm = false + } if (this.currentForm === 'Create') { this.loading = true api('registerTemplate', params).then(json => { From dafa377086ecfefd320e2152e93012a6243b28e0 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Sat, 29 May 2021 22:31:04 +0530 Subject: [PATCH 2/2] secondary-storage: fix account template directory size (#5048) Signed-off-by: Abhishek Kumar --- .../storage/resource/NfsSecondaryStorageResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 0b6e844d0bb..251b48243b8 100644 --- 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 @@ -3258,7 +3258,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S long accountTemplateDirSize = 0; File accountTemplateDir = new File(rootDir + getTemplatePathForAccount(accountId)); if (accountTemplateDir.exists()) { - FileUtils.sizeOfDirectory(accountTemplateDir); + accountTemplateDirSize = FileUtils.sizeOfDirectory(accountTemplateDir); } long accountVolumeDirSize = 0; File accountVolumeDir = new File(rootDir + getVolumePathForAccount(accountId));