Merge branch 'fix/ZSTAC-74683' into '5.5.12'

gitlab · gitlab · commit addec8c0aa77 · 2026-02-16T01:30:40.000Z
&lt;fix&gt;[vm]: use max of virtual and actual size for root disk allocation

See merge request zstackio/zstack!9155
diff --git a/header/src/main/java/org/zstack/header/vm/VmInstanceSpec.java b/header/src/main/java/org/zstack/header/vm/VmInstanceSpec.java
@@ -847,7 +847,9 @@ public void setBootMode(String bootMode) {
 
     public long getRootDiskAllocateSize() {
         if (rootDiskOffering == null) {
-            return this.getImageSpec().getInventory().getSize();
+            long virtualSize = this.getImageSpec().getInventory().getSize();
+            long actualSize = this.getImageSpec().getInventory().getActualSize();
+            return Math.max(virtualSize, actualSize);
         }
         return rootDiskOffering.getDiskSize();
     }

Original file line number	Diff line number	Diff line change
`@@ -847,7 +847,9 @@ public void setBootMode(String bootMode) {`
`847`	`847`
`848`	`848`	`public long getRootDiskAllocateSize() {`
`849`	`849`	`if (rootDiskOffering == null) {`
`850`		`- return this.getImageSpec().getInventory().getSize();`
	`850`	`+ long virtualSize = this.getImageSpec().getInventory().getSize();`
	`851`	`+ long actualSize = this.getImageSpec().getInventory().getActualSize();`
	`852`	`+ return Math.max(virtualSize, actualSize);`
`851`	`853`	`}`
`852`	`854`	`return rootDiskOffering.getDiskSize();`
`853`	`855`	`}`