From 8f92815679a6517df4f4a4b9e41e9a2c66c8a056 Mon Sep 17 00:00:00 2001 From: JS Choi <77760789+jschoiRR@users.noreply.github.com> Date: Thu, 26 Feb 2026 10:01:40 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=ED=95=9C=EA=B8=80=ED=99=94=20=EB=88=84?= =?UTF-8?q?=EB=9D=BD=20=EB=B0=98=EC=98=81=20=EB=B0=8F=20=EC=86=8C=EC=8A=A4?= =?UTF-8?q?=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/package.json | 7 +++++-- ui/public/locales/ko_KR.json | 5 ++++- ui/src/views/compute/EditVM.vue | 1 - 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ui/package.json b/ui/package.json index c2ca77e81791..370934da10da 100644 --- a/ui/package.json +++ b/ui/package.json @@ -107,9 +107,12 @@ "vue-jest": "^5.0.0-0", "vue-svg-loader": "^0.17.0-beta.2", "webpack": "^4.46.0", - "node-gyp": "10.0.1", "nan": "2.18.0" + "node-gyp": "10.0.1", + "nan": "2.18.0" + }, + "resolutions": { + "nan": "2.18.0" }, - "resolutions": { "nan": "2.18.0" }, "eslintConfig": { "root": true, "env": { diff --git a/ui/public/locales/ko_KR.json b/ui/public/locales/ko_KR.json index a260826cf04f..74dcfdd9126f 100644 --- a/ui/public/locales/ko_KR.json +++ b/ui/public/locales/ko_KR.json @@ -2367,7 +2367,7 @@ "label.snapshot": "\uc2a4\ub0c5\uc0f7", "label.snapshot.name": "\uc2a4\ub0c5\uc0f7 \uc774\ub984", "label.snapshotlimit": "\uc2a4\ub0c5\uc0f7 \uc81c\ud55c", -"label.snapshotmemory": "\uc2a4\ub0c5\uc0f7 \uba54\ubaa8\ub9ac", +"label.snapshotmemory": "\uba54\ubaa8\ub9ac \uc2a4\ub0c5\uc0f7", "label.snapshotpolicy": "\uc2a4\ub0c5\uc0f7 \uc815\ucc45", "label.snapshotpolicies": "\uc2a4\ub0c5\uc0f7 \uc815\ucc45", "label.snapshots": "\uc2a4\ub0c5\uc0f7", @@ -4315,6 +4315,7 @@ "GB*Month": "GB * \uc6d4", "IP*Month": "IP * \uc6d4\uac04", "Policy*Month": "\uc815\ucc45 * \uc6d4", + "label.desktop.service": "\ub370\uc2a4\ud06c\ud1b1", "title.desktop.cluster": "\ud074\ub7ec\uc2a4\ud130", "title.desktop.controller": "\ucee8\ud2b8\ub864\ub7ec \ud15c\ud50c\ub9bf", @@ -4861,6 +4862,8 @@ "backup.schedule.delete": "\ubc31\uc5c5 \uc77c\uc815 \uc0ad\uc81c", "backup.usage.metric": "\ubc31\uc5c5 \uc0ac\uc6a9\ub7c9 \uba54\ud2b8\ub9ad", "backup.offering.edit": "\ubc31\uc5c5 \uc624\ud37c\ub9c1 \ud3b8\uc9d1", +"backup.repository.add": "\ubc31\uc5c5 \uc800\uc7a5\uc18c \ucd94\uac00", +"backup.repository.update": "\ubc31\uc5c5 \uc800\uc7a5\uc18c \ud3b8\uc9d1", "physical.nvpcontroller.add": "\ubb3c\ub9ac NVP\ucee8\ud2b8\ub864\ub7ec \ucd94\uac00", "physical.nvpcontroller.delete": "\ubb3c\ub9ac NVP\ucee8\ud2b8\ub864\ub7ec \uc0ad\uc81c", "physical.nvpcontroller.configure": "\ubb3c\ub9ac NVP\ucee8\ud2b8\ub864\ub7ec \uad6c\uc131", diff --git a/ui/src/views/compute/EditVM.vue b/ui/src/views/compute/EditVM.vue index 9f08a3368a2b..174dce238081 100644 --- a/ui/src/views/compute/EditVM.vue +++ b/ui/src/views/compute/EditVM.vue @@ -100,7 +100,6 @@ Date: Thu, 26 Feb 2026 12:53:34 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=EB=B8=94=ED=95=84=EC=9A=94=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=A0=95=EB=B3=B4=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/src/views/tools/ImportUnmanagedInstance.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui/src/views/tools/ImportUnmanagedInstance.vue b/ui/src/views/tools/ImportUnmanagedInstance.vue index fcb92f30bcd1..676d3c0aedc3 100644 --- a/ui/src/views/tools/ImportUnmanagedInstance.vue +++ b/ui/src/views/tools/ImportUnmanagedInstance.vue @@ -800,8 +800,6 @@ export default { return meta }, getMinCpu () { - console.log('this.resource.cpunumber :>> ', this.resource.cpunumber) - console.log('this.computeOffering.serviceofferingdetails.mincpunumber :>> ', this.computeOffering.serviceofferingdetails.mincpunumber) if (this.isVmRunning) { return this.resource.cpunumber } From 65a7e97a491f2db8c03b13b45e8941cebbf001cb Mon Sep 17 00:00:00 2001 From: JS Choi <77760789+jschoiRR@users.noreply.github.com> Date: Thu, 26 Feb 2026 16:44:43 +0900 Subject: [PATCH 3/9] =?UTF-8?q?Agent=20=EC=8A=A4=EB=A0=88=EB=93=9C=20?= =?UTF-8?q?=EB=B6=84=EB=A5=98=EC=A4=91=20stats=20=EC=97=90=20=ED=8F=AC?= =?UTF-8?q?=ED=95=A8=EB=90=A0=20=ED=95=AD=EB=AA=A9=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=20("NetworkUsageCommand")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agent/src/main/java/com/cloud/agent/Agent.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agent/src/main/java/com/cloud/agent/Agent.java b/agent/src/main/java/com/cloud/agent/Agent.java index 0d8fd095a5b7..cec0c4e9c729 100644 --- a/agent/src/main/java/com/cloud/agent/Agent.java +++ b/agent/src/main/java/com/cloud/agent/Agent.java @@ -78,6 +78,7 @@ import com.cloud.agent.api.MaintainCommand; import com.cloud.agent.api.MigrateAgentConnectionAnswer; import com.cloud.agent.api.MigrateAgentConnectionCommand; +import com.cloud.agent.api.NetworkUsageCommand; import com.cloud.agent.api.PingAnswer; import com.cloud.agent.api.PingCommand; import com.cloud.agent.api.ReadyCommand; @@ -417,7 +418,7 @@ private boolean requestContainsStatsCommand(Request request) { return false; } for (Command command : commands) { - if (command != null && command.getClass().getSimpleName().contains("StatsCommand")) { + if (command != null && (command.getClass().getSimpleName().contains("StatsCommand") || command instanceof NetworkUsageCommand)) { return true; } } From 12676afc409dc9aab0e1e1f28e750de7ae24fe8f Mon Sep 17 00:00:00 2001 From: JS Choi <77760789+jschoiRR@users.noreply.github.com> Date: Fri, 27 Feb 2026 10:04:41 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=ED=95=9C=EA=B8=80=ED=99=94=20=EB=AC=B8?= =?UTF-8?q?=EA=B5=AC=20=EC=88=98=EC=A0=95=20=EC=82=AC=EC=9A=A9=EB=90=A8=20?= =?UTF-8?q?>=20=20=EC=82=AC=EC=9A=A9,=20=ED=95=A0=EB=8B=B9=EB=90=A8=20>=20?= =?UTF-8?q?=ED=95=A0=EB=8B=B9=20)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/public/locales/ko_KR.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/public/locales/ko_KR.json b/ui/public/locales/ko_KR.json index 74dcfdd9126f..2e4eb1c88575 100644 --- a/ui/public/locales/ko_KR.json +++ b/ui/public/locales/ko_KR.json @@ -404,7 +404,7 @@ "label.all.available.data": "\uc0ac\uc6a9 \uac00\ub2a5\ud55c \ubaa8\ub4e0 \ub370\uc774\ud130", "label.all.ipv6": "\ubaa8\ub4e0 IPv6", "label.all.zone": "\ubaa8\ub4e0 Zones", -"label.allocated": "\ud560\ub2f9\ub428", +"label.allocated": "\ud560\ub2f9", "label.allocatedonly": "\ud560\ub2f9", "label.allocationstate": "\ud560\ub2f9 \uc0c1\ud0dc", "label.allow": "\ud5c8\uc6a9", @@ -2725,7 +2725,7 @@ "label.use.kubectl.access.cluster": "\ud074\ub7ec\uc2a4\ud130\uc5d0 \uc561\uc138\uc2a4\ud558\uae30\uc704\ud55c kubectl \ubc0f kubeconfig \ud30c\uc77c", "label.use.local.timezone": "\ub85c\uceec \uc2dc\uac04\ub300 \uc0ac\uc6a9", "label.use.router.ip.resolver": "\uac00\uc0c1 \ub77c\uc6b0\ud130 IP\ub97c Resolver\ub85c \uc0ac\uc6a9", -"label.used": "\uc0ac\uc6a9\ub428", +"label.used": "\uc0ac\uc6a9", "label.usehttps": "HTTPS \uc0ac\uc6a9", "label.usenewdiskoffering": "\ub514\uc2a4\ud06c \uc624\ud37c\ub9c1\uc744 \ubcc0\uacbd\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?", "label.user": "\uc0ac\uc6a9\uc790", From 444a895d14136add57c732ab25068790d249a0bd Mon Sep 17 00:00:00 2001 From: JS Choi <77760789+jschoiRR@users.noreply.github.com> Date: Tue, 3 Mar 2026 12:18:35 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=EB=B9=8C=EB=93=9C=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java | 2 +- .../storage/resource/HttpUploadServerHandler.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java index 9cd3cd36a402..a2562af32888 100644 --- a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java @@ -210,7 +210,7 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager { private static final List forceConvertToPoolAllowedTypes = Arrays.asList(Storage.StoragePoolType.NetworkFilesystem, Storage.StoragePoolType.Filesystem, - Storage.StoragePoolType.SharedMountPoint); + Storage.StoragePoolType.SharedMountPoint, Storage.StoragePoolType.RBD); ConfigKey ConvertVmwareInstanceToKvmExtraParamsAllowed = new ConfigKey<>(Boolean.class, "convert.vmware.instance.to.kvm.extra.params.allowed", diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java index 1e0fe3189c1b..a580105d52a5 100644 --- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java +++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Map.Entry; +import io.netty.util.IllegalReferenceCountException; import org.apache.cloudstack.storage.template.UploadEntity; import org.apache.cloudstack.utils.imagestore.ImageStoreUtil; import org.apache.commons.lang3.StringUtils; @@ -61,7 +62,6 @@ import io.netty.handler.codec.http.multipart.HttpPostRequestDecoder.ErrorDataDecoderException; import io.netty.handler.codec.http.multipart.InterfaceHttpData; import io.netty.handler.codec.http.multipart.InterfaceHttpData.HttpDataType; -import io.netty.util.IllegalReferenceCountException; import io.netty.util.CharsetUtil; public class HttpUploadServerHandler extends SimpleChannelInboundHandler { @@ -85,7 +85,7 @@ enum UploadHeader { SIGNATURE("x-signature"), METADATA("x-metadata"), EXPIRES("x-expires"), - HOST("x-host"), + HOST("x-forwarded-host"), CONTENT_LENGTH("content-length"); private final String name; @@ -127,7 +127,9 @@ public HttpUploadServerHandler(NfsSecondaryStorageResource storageResource) { @Override public void channelUnregistered(ChannelHandlerContext ctx) throws Exception { - destroyDecoder(); + if (decoder != null) { + decoder.cleanFiles(); + } requestProcessed = false; } From df67d870ebd72286657ae9db72914184832f4053 Mon Sep 17 00:00:00 2001 From: JS Choi <77760789+jschoiRR@users.noreply.github.com> Date: Tue, 3 Mar 2026 12:36:27 +0900 Subject: [PATCH 6/9] =?UTF-8?q?UI=20=EB=B9=8C=EB=93=9C=20=EC=98=A4?= =?UTF-8?q?=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 --- ui/src/components/page/GlobalLayout.vue | 44 ++++++++++--------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/ui/src/components/page/GlobalLayout.vue b/ui/src/components/page/GlobalLayout.vue index 0f244ebff999..6817c13ee1eb 100644 --- a/ui/src/components/page/GlobalLayout.vue +++ b/ui/src/components/page/GlobalLayout.vue @@ -13,36 +13,24 @@ - -
-