From d3647fcd26b164e2afee9725c7d9241e1271f48d Mon Sep 17 00:00:00 2001 From: Dajeong-Park Date: Tue, 14 Jan 2025 15:38:51 +0900 Subject: [PATCH 01/13] Update UserVmManagerImpl.java --- server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index 64949a95a85d..696f18506c02 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -4411,7 +4411,7 @@ private UserVm getUncheckedUserVmResource(DataCenter zone, String hostName, Stri if (template.getTemplateType().equals(TemplateType.SYSTEM) && !CKS_NODE.equals(vmType) && !SHAREDFSVM.equals(vmType)) { throw new InvalidParameterValueException(String.format("Unable to use system template %s to deploy a user vm", template)); } - + List listZoneTemplate = _templateZoneDao.listByZoneTemplate(zone.getId(), template.getId()); if (listZoneTemplate == null || listZoneTemplate.isEmpty()) { throw new InvalidParameterValueException(String.format("The template %s is not available for use", template)); From 0199af27a5d658a98d8969ce581689f68d83a8de Mon Sep 17 00:00:00 2001 From: Dajeong-Park Date: Tue, 14 Jan 2025 15:41:11 +0900 Subject: [PATCH 02/13] Update UserVmManagerImpl.java --- server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index 696f18506c02..7bd6cf1347fd 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -330,6 +330,7 @@ import com.cloud.storage.StoragePool; import com.cloud.storage.StoragePoolStatus; import com.cloud.storage.VMTemplateStorageResourceAssoc; +import com.cloud.storage.VMTemplateZoneVO; import com.cloud.storage.VMTemplateVO; import com.cloud.storage.Volume; import com.cloud.storage.VolumeApiService; From 680ff568b2baeff6b6046278e5ff570cb05af516 Mon Sep 17 00:00:00 2001 From: Dajeong-Park Date: Tue, 14 Jan 2025 16:01:59 +0900 Subject: [PATCH 03/13] Update SnapshotObject.java --- .../org/apache/cloudstack/storage/snapshot/SnapshotObject.java | 1 + 1 file changed, 1 insertion(+) diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java index be6bf4e77fb0..b4fe8ab8e228 100644 --- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java +++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java @@ -476,6 +476,7 @@ public void setVmSnapshotName(String vmSnapshotName) { @Override public String getVmSnapshotName() { return vmSnapshotName; + } @Override public String toString() { From e7281ac3e2ee489d76c209d529474826a89e160b Mon Sep 17 00:00:00 2001 From: Dajeong-Park Date: Tue, 14 Jan 2025 16:09:10 +0900 Subject: [PATCH 04/13] Update VolumeObject.java --- .../org/apache/cloudstack/storage/volume/VolumeObject.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java index 8061d8fef626..61ae82cec8d2 100644 --- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java +++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java @@ -998,7 +998,8 @@ public Long getUsedPhysicalSize() { @Override public void setUsedPhysicalSize(Long usedPhysicalSize) { volumeVO.setUsedPhysicalSize(usedPhysicalSize); - + } + @Override public String toString() { return String.format("VolumeObject %s", From c43f3f2d44e7d280d185ea746a2b1efea937efa9 Mon Sep 17 00:00:00 2001 From: Dajeong-Park Date: Tue, 14 Jan 2025 16:16:17 +0900 Subject: [PATCH 05/13] Update DesktopClusterResourceModifierActionWorker.java --- .../DesktopClusterResourceModifierActionWorker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/integrations/desktop-service/src/main/java/com/cloud/desktop/cluster/actionworkers/DesktopClusterResourceModifierActionWorker.java b/plugins/integrations/desktop-service/src/main/java/com/cloud/desktop/cluster/actionworkers/DesktopClusterResourceModifierActionWorker.java index 4cb06aeb4cf9..c94735f641b7 100644 --- a/plugins/integrations/desktop-service/src/main/java/com/cloud/desktop/cluster/actionworkers/DesktopClusterResourceModifierActionWorker.java +++ b/plugins/integrations/desktop-service/src/main/java/com/cloud/desktop/cluster/actionworkers/DesktopClusterResourceModifierActionWorker.java @@ -160,7 +160,7 @@ protected DeployDestination plan(final long nodesCount, final DataCenter zone, f if (logger.isDebugEnabled()) { logger.debug(String.format("Checking host : %s for capacity already reserved %d", h.getName(), reserved)); } - if (capacityManager.checkIfHostHasCapacity(h.getId(), cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) { + if (capacityManager.checkIfHostHasCapacity(h, cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) { if (logger.isDebugEnabled()) { logger.debug(String.format("Found host : %s for with enough capacity, CPU=%d RAM=%s", h.getName(), cpu_requested * reserved, toHumanReadableSize(ram_requested * reserved))); } From 3addec4c9af5efcaed00341ea56d3c568a7d7a3c Mon Sep 17 00:00:00 2001 From: Dajeong-Park Date: Tue, 14 Jan 2025 16:20:45 +0900 Subject: [PATCH 06/13] Update AutomationControllerActionWorker.java --- .../actionworkers/AutomationControllerActionWorker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/integrations/automation-service/src/main/java/com/cloud/automation/controller/actionworkers/AutomationControllerActionWorker.java b/plugins/integrations/automation-service/src/main/java/com/cloud/automation/controller/actionworkers/AutomationControllerActionWorker.java index 7ca275879139..c473e67c5236 100644 --- a/plugins/integrations/automation-service/src/main/java/com/cloud/automation/controller/actionworkers/AutomationControllerActionWorker.java +++ b/plugins/integrations/automation-service/src/main/java/com/cloud/automation/controller/actionworkers/AutomationControllerActionWorker.java @@ -403,7 +403,7 @@ protected DeployDestination plan(final long nodesCount, final DataCenter zone, f if (logger.isDebugEnabled()) { logger.debug(String.format("Checking host : %s for capacity already reserved %d", h.getName(), reserved)); } - if (capacityManager.checkIfHostHasCapacity(h.getId(), cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) { + if (capacityManager.checkIfHostHasCapacity(h, cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) { if (logger.isDebugEnabled()) { logger.debug(String.format("Found host : %s for with enough capacity, CPU=%d RAM=%s", h.getName(), cpu_requested * reserved, toHumanReadableSize(ram_requested * reserved))); } From 667b4982a4d7b89363dc713992a539fb7bc1d717 Mon Sep 17 00:00:00 2001 From: Dajeong-Park Date: Tue, 14 Jan 2025 16:25:04 +0900 Subject: [PATCH 07/13] Update AutomationControllerResourceModifierActionWorker.java --- .../AutomationControllerResourceModifierActionWorker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/integrations/automation-service/src/main/java/com/cloud/automation/controller/actionworkers/AutomationControllerResourceModifierActionWorker.java b/plugins/integrations/automation-service/src/main/java/com/cloud/automation/controller/actionworkers/AutomationControllerResourceModifierActionWorker.java index 4f3abce494e6..d27a7083bd70 100644 --- a/plugins/integrations/automation-service/src/main/java/com/cloud/automation/controller/actionworkers/AutomationControllerResourceModifierActionWorker.java +++ b/plugins/integrations/automation-service/src/main/java/com/cloud/automation/controller/actionworkers/AutomationControllerResourceModifierActionWorker.java @@ -157,7 +157,7 @@ protected DeployDestination plan(final long nodesCount, final DataCenter zone, f if (logger.isDebugEnabled()) { logger.debug(String.format("Checking host : %s for capacity already reserved %d", h.getName(), reserved)); } - if (capacityManager.checkIfHostHasCapacity(h.getId(), cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) { + if (capacityManager.checkIfHostHasCapacity(h, cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) { if (logger.isDebugEnabled()) { logger.debug(String.format("Found host : %s for with enough capacity, CPU=%d RAM=%s", h.getName(), cpu_requested * reserved, toHumanReadableSize(ram_requested * reserved))); } From 9789fc0dfe80f2c2ad54c5b295810a9be1a0da41 Mon Sep 17 00:00:00 2001 From: Dajeong-Park Date: Tue, 14 Jan 2025 16:31:50 +0900 Subject: [PATCH 08/13] Update AblestackPrimaryDataStoreLifeCycleImpl.java --- .../lifecycle/AblestackPrimaryDataStoreLifeCycleImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/storage/volume/ablestack/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/AblestackPrimaryDataStoreLifeCycleImpl.java b/plugins/storage/volume/ablestack/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/AblestackPrimaryDataStoreLifeCycleImpl.java index c8fe3e88f76a..dd7969190409 100644 --- a/plugins/storage/volume/ablestack/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/AblestackPrimaryDataStoreLifeCycleImpl.java +++ b/plugins/storage/volume/ablestack/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/AblestackPrimaryDataStoreLifeCycleImpl.java @@ -234,7 +234,7 @@ public boolean attachCluster(DataStore store, ClusterScope scope) { List poolHosts = new ArrayList(); for (HostVO h : allHosts) { try { - storageMgr.connectHostToSharedPool(h.getId(), primarystore.getId()); + storageMgr.connectHostToSharedPool(h, primarystore.getId()); poolHosts.add(h); } catch (StorageConflictException se) { primaryDataStoreDao.expunge(primarystore.getId()); @@ -261,7 +261,7 @@ public boolean attachZone(DataStore dataStore, ZoneScope scope, HypervisorType h List poolHosts = new ArrayList(); for (HostVO host : hosts) { try { - storageMgr.connectHostToSharedPool(host.getId(), dataStore.getId()); + storageMgr.connectHostToSharedPool(host, dataStore.getId()); poolHosts.add(host); } catch (StorageConflictException se) { primaryDataStoreDao.expunge(dataStore.getId()); From d84f75b4668ea5b197f80c764b7bc33f56aac028 Mon Sep 17 00:00:00 2001 From: Dajeong-Park Date: Tue, 14 Jan 2025 17:41:33 +0900 Subject: [PATCH 09/13] Update UserVmManagerImpl.java --- server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index 7bd6cf1347fd..a7151e9a3e2a 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -330,8 +330,8 @@ import com.cloud.storage.StoragePool; import com.cloud.storage.StoragePoolStatus; import com.cloud.storage.VMTemplateStorageResourceAssoc; -import com.cloud.storage.VMTemplateZoneVO; import com.cloud.storage.VMTemplateVO; +import com.cloud.storage.VMTemplateZoneVO; import com.cloud.storage.Volume; import com.cloud.storage.VolumeApiService; import com.cloud.storage.VolumeVO; From 31007da3b2adbf69f34906be9ff37ff41a8556ad Mon Sep 17 00:00:00 2001 From: Dajeong-Park Date: Tue, 14 Jan 2025 17:42:51 +0900 Subject: [PATCH 10/13] Update UserVmManagerImpl.java --- server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index a7151e9a3e2a..c9942ce47866 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -4412,7 +4412,6 @@ private UserVm getUncheckedUserVmResource(DataCenter zone, String hostName, Stri if (template.getTemplateType().equals(TemplateType.SYSTEM) && !CKS_NODE.equals(vmType) && !SHAREDFSVM.equals(vmType)) { throw new InvalidParameterValueException(String.format("Unable to use system template %s to deploy a user vm", template)); } - List listZoneTemplate = _templateZoneDao.listByZoneTemplate(zone.getId(), template.getId()); if (listZoneTemplate == null || listZoneTemplate.isEmpty()) { throw new InvalidParameterValueException(String.format("The template %s is not available for use", template)); From 59d64ab19b7cfa30e4cde4092fcc2b77cc410a03 Mon Sep 17 00:00:00 2001 From: Dajeong-Park Date: Thu, 16 Jan 2025 12:12:31 +0900 Subject: [PATCH 11/13] Update SecondaryStorageManagerImpl.java --- .../secondarystorage/SecondaryStorageManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 d8728510d472..bd85ab4dc196 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 @@ -402,11 +402,11 @@ private List getAllowedInternalSiteCidrs() { for (String cidr : cidrs) { if (NetUtils.isValidIp4Cidr(cidr) && !cidr.startsWith("0.0.0.0")) { if (! NetUtils.getCleanIp4Cidr(cidr).equals(cidr)) { - s_logger.warn(String.format("Invalid CIDR %s in %s", cidr, SecStorageAllowedInternalDownloadSites.key())); + logger.warn(String.format("Invalid CIDR %s in %s", cidr, SecStorageAllowedInternalDownloadSites.key())); } allowedCidrs.add(NetUtils.getCleanIp4Cidr(cidr)); } else if (NetUtils.isValidIp4(cidr) && !cidr.startsWith("0.0.0.0")) { - s_logger.warn(String.format("Ip address is not a valid CIDR; %s consider using %s/32", cidr, cidr)); + logger.warn(String.format("Ip address is not a valid CIDR; %s consider using %s/32", cidr, cidr)); allowedCidrs.add(cidr); } } From d5c751bcaece97b79de42e378c1b715721d1323d Mon Sep 17 00:00:00 2001 From: Dajeong-Park Date: Fri, 17 Jan 2025 09:45:59 +0900 Subject: [PATCH 12/13] =?UTF-8?q?Glue=20=EC=9D=B4=EB=AF=B8=EC=A7=80?= =?UTF-8?q?=EB=A1=9C=20=EA=B0=80=EC=83=81=EB=A8=B8=EC=8B=A0=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cloud/vm/UserVmManagerImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index 535409ef5ea0..63b565e7c041 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -4413,10 +4413,12 @@ private UserVm getUncheckedUserVmResource(DataCenter zone, String hostName, Stri if (template.getTemplateType().equals(TemplateType.SYSTEM) && !CKS_NODE.equals(vmType) && !SHAREDFSVM.equals(vmType)) { throw new InvalidParameterValueException(String.format("Unable to use system template %s to deploy a user vm", template)); } - List listZoneTemplate = _templateZoneDao.listByZoneTemplate(zone.getId(), template.getId()); - if (listZoneTemplate == null || listZoneTemplate.isEmpty()) { - throw new InvalidParameterValueException(String.format("The template %s is not available for use", template)); - } + + // apache#9873 ) kvm-default-vm-import-dummy-template 을 이용한 가상머신 생성을 위해 임시 주석처리 + // List listZoneTemplate = _templateZoneDao.listByZoneTemplate(zone.getId(), template.getId()); + // if (listZoneTemplate == null || listZoneTemplate.isEmpty()) { + // throw new InvalidParameterValueException(String.format("The template %s is not available for use", template)); + // } if (isIso && !template.isBootable()) { throw new InvalidParameterValueException(String.format("Installing from ISO requires an ISO that is bootable: %s", template)); From 1713c795cad88229a9419ab414ecd7837ea396db Mon Sep 17 00:00:00 2001 From: Dajeong-Park Date: Fri, 17 Jan 2025 09:51:03 +0900 Subject: [PATCH 13/13] Update UserVmManagerImpl.java --- server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index 63b565e7c041..0314794d7400 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -332,7 +332,6 @@ import com.cloud.storage.StoragePoolStatus; import com.cloud.storage.VMTemplateStorageResourceAssoc; import com.cloud.storage.VMTemplateVO; -import com.cloud.storage.VMTemplateZoneVO; import com.cloud.storage.Volume; import com.cloud.storage.VolumeApiService; import com.cloud.storage.VolumeVO;