diff --git a/conf/db/upgrade/V5.5.18__schema.sql b/conf/db/upgrade/V5.5.18__schema.sql index 25ddef86a4d..c5935f648d9 100644 --- a/conf/db/upgrade/V5.5.18__schema.sql +++ b/conf/db/upgrade/V5.5.18__schema.sql @@ -19,8 +19,9 @@ CREATE TABLE IF NOT EXISTS `HostCacheStoreCapacityVO` ( `uuid` VARCHAR(32) NOT NULL, `totalCapacity` BIGINT NOT NULL DEFAULT 0, `availableCapacity` BIGINT NOT NULL DEFAULT 0, - `allocated` BIGINT NOT NULL DEFAULT 0, - `dirty` BIGINT NOT NULL DEFAULT 0, + `totalPhysicalCapacity` BIGINT NOT NULL DEFAULT 0, + `availablePhysicalCapacity` BIGINT NOT NULL DEFAULT 0, + `systemUsedCapacity` BIGINT NOT NULL DEFAULT 0, PRIMARY KEY (`uuid`), CONSTRAINT `fkHostCacheStoreCapacityVOHostCacheStoreVO` FOREIGN KEY (`uuid`) REFERENCES `HostCacheStoreVO` (`uuid`) diff --git a/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreCapacityInventory.java b/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreCapacityInventory.java index 805cc4eef0c..e602abd90c0 100644 --- a/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreCapacityInventory.java +++ b/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreCapacityInventory.java @@ -14,8 +14,9 @@ public class HostCacheStoreCapacityInventory implements Serializable { private String uuid; private long totalCapacity; private long availableCapacity; - private long allocated; - private long dirty; + private long totalPhysicalCapacity; + private long availablePhysicalCapacity; + private long systemUsedCapacity; public static HostCacheStoreCapacityInventory valueOf(HostCacheStoreCapacityVO vo) { if (vo == null) { @@ -26,8 +27,9 @@ public static HostCacheStoreCapacityInventory valueOf(HostCacheStoreCapacityVO v inv.setUuid(vo.getUuid()); inv.setTotalCapacity(vo.getTotalCapacity()); inv.setAvailableCapacity(vo.getAvailableCapacity()); - inv.setAllocated(vo.getAllocated()); - inv.setDirty(vo.getDirty()); + inv.setTotalPhysicalCapacity(vo.getTotalPhysicalCapacity()); + inv.setAvailablePhysicalCapacity(vo.getAvailablePhysicalCapacity()); + inv.setSystemUsedCapacity(vo.getSystemUsedCapacity()); return inv; } @@ -67,19 +69,27 @@ public void setAvailableCapacity(long availableCapacity) { this.availableCapacity = availableCapacity; } - public long getAllocated() { - return allocated; + public long getTotalPhysicalCapacity() { + return totalPhysicalCapacity; } - public void setAllocated(long allocated) { - this.allocated = allocated; + public void setTotalPhysicalCapacity(long totalPhysicalCapacity) { + this.totalPhysicalCapacity = totalPhysicalCapacity; } - public long getDirty() { - return dirty; + public long getAvailablePhysicalCapacity() { + return availablePhysicalCapacity; } - public void setDirty(long dirty) { - this.dirty = dirty; + public void setAvailablePhysicalCapacity(long availablePhysicalCapacity) { + this.availablePhysicalCapacity = availablePhysicalCapacity; + } + + public long getSystemUsedCapacity() { + return systemUsedCapacity; + } + + public void setSystemUsedCapacity(long systemUsedCapacity) { + this.systemUsedCapacity = systemUsedCapacity; } } diff --git a/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreCapacityVO.java b/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreCapacityVO.java index 6ba371fa1d8..da3f6b64584 100644 --- a/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreCapacityVO.java +++ b/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreCapacityVO.java @@ -29,10 +29,13 @@ public class HostCacheStoreCapacityVO { private long availableCapacity; @Column - private long allocated; + private long totalPhysicalCapacity; @Column - private long dirty; + private long availablePhysicalCapacity; + + @Column + private long systemUsedCapacity; public HostCacheStoreCapacityVO() { } @@ -61,19 +64,27 @@ public void setAvailableCapacity(long availableCapacity) { this.availableCapacity = availableCapacity; } - public long getAllocated() { - return allocated; + public long getTotalPhysicalCapacity() { + return totalPhysicalCapacity; + } + + public void setTotalPhysicalCapacity(long totalPhysicalCapacity) { + this.totalPhysicalCapacity = totalPhysicalCapacity; + } + + public long getAvailablePhysicalCapacity() { + return availablePhysicalCapacity; } - public void setAllocated(long allocated) { - this.allocated = allocated; + public void setAvailablePhysicalCapacity(long availablePhysicalCapacity) { + this.availablePhysicalCapacity = availablePhysicalCapacity; } - public long getDirty() { - return dirty; + public long getSystemUsedCapacity() { + return systemUsedCapacity; } - public void setDirty(long dirty) { - this.dirty = dirty; + public void setSystemUsedCapacity(long systemUsedCapacity) { + this.systemUsedCapacity = systemUsedCapacity; } } diff --git a/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreCapacityVO_.java b/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreCapacityVO_.java index 312ec0d9f3d..e4133639573 100644 --- a/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreCapacityVO_.java +++ b/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreCapacityVO_.java @@ -8,6 +8,7 @@ public class HostCacheStoreCapacityVO_ { public static volatile SingularAttribute uuid; public static volatile SingularAttribute totalCapacity; public static volatile SingularAttribute availableCapacity; - public static volatile SingularAttribute allocated; - public static volatile SingularAttribute dirty; + public static volatile SingularAttribute totalPhysicalCapacity; + public static volatile SingularAttribute availablePhysicalCapacity; + public static volatile SingularAttribute systemUsedCapacity; } diff --git a/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreInventory.java b/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreInventory.java index 22a1cef274b..41478fcfeb8 100644 --- a/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreInventory.java +++ b/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreInventory.java @@ -28,12 +28,16 @@ public class HostCacheStoreInventory implements Serializable { private long availableCapacity; @Queryable(mappingClass = HostCacheStoreCapacityInventory.class, - joinColumn = @JoinColumn(name = "uuid", referencedColumnName = "allocated")) - private long allocated; + joinColumn = @JoinColumn(name = "uuid", referencedColumnName = "totalPhysicalCapacity")) + private long totalPhysicalCapacity; @Queryable(mappingClass = HostCacheStoreCapacityInventory.class, - joinColumn = @JoinColumn(name = "uuid", referencedColumnName = "dirty")) - private long dirty; + joinColumn = @JoinColumn(name = "uuid", referencedColumnName = "availablePhysicalCapacity")) + private long availablePhysicalCapacity; + + @Queryable(mappingClass = HostCacheStoreCapacityInventory.class, + joinColumn = @JoinColumn(name = "uuid", referencedColumnName = "systemUsedCapacity")) + private long systemUsedCapacity; private HostCacheStoreState state; private HostCacheStoreStatus status; @@ -52,8 +56,9 @@ public static HostCacheStoreInventory valueOf(HostCacheStoreVO vo) { if (vo.getCapacity() != null) { inv.setTotalCapacity(vo.getCapacity().getTotalCapacity()); inv.setAvailableCapacity(vo.getCapacity().getAvailableCapacity()); - inv.setAllocated(vo.getCapacity().getAllocated()); - inv.setDirty(vo.getCapacity().getDirty()); + inv.setTotalPhysicalCapacity(vo.getCapacity().getTotalPhysicalCapacity()); + inv.setAvailablePhysicalCapacity(vo.getCapacity().getAvailablePhysicalCapacity()); + inv.setSystemUsedCapacity(vo.getCapacity().getSystemUsedCapacity()); } inv.setState(vo.getState()); inv.setStatus(vo.getStatus()); @@ -143,20 +148,28 @@ public void setAvailableCapacity(long availableCapacity) { this.availableCapacity = availableCapacity; } - public long getAllocated() { - return allocated; + public long getTotalPhysicalCapacity() { + return totalPhysicalCapacity; + } + + public void setTotalPhysicalCapacity(long totalPhysicalCapacity) { + this.totalPhysicalCapacity = totalPhysicalCapacity; } - public void setAllocated(long allocated) { - this.allocated = allocated; + public long getAvailablePhysicalCapacity() { + return availablePhysicalCapacity; } - public long getDirty() { - return dirty; + public void setAvailablePhysicalCapacity(long availablePhysicalCapacity) { + this.availablePhysicalCapacity = availablePhysicalCapacity; } - public void setDirty(long dirty) { - this.dirty = dirty; + public long getSystemUsedCapacity() { + return systemUsedCapacity; + } + + public void setSystemUsedCapacity(long systemUsedCapacity) { + this.systemUsedCapacity = systemUsedCapacity; } public HostCacheStoreState getState() { @@ -207,4 +220,3 @@ public void setLastOpDate(Timestamp lastOpDate) { this.lastOpDate = lastOpDate; } } - diff --git a/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreInventoryDoc_zh_cn.groovy b/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreInventoryDoc_zh_cn.groovy index 8dd75b46d21..057dd10f693 100644 --- a/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreInventoryDoc_zh_cn.groovy +++ b/header/src/main/java/org/zstack/header/volumeCache/HostCacheStoreInventoryDoc_zh_cn.groovy @@ -51,6 +51,24 @@ doc { type "long" since "5.5.6" } + field { + name "totalPhysicalCapacity" + desc "主机缓存存储的物理总容量，单位为字节" + type "long" + since "5.5.6" + } + field { + name "availablePhysicalCapacity" + desc "主机缓存存储的物理可用容量，单位为字节" + type "long" + since "5.5.6" + } + field { + name "systemUsedCapacity" + desc "主机缓存存储中非缓存文件占用的容量，单位为字节" + type "long" + since "5.5.6" + } ref { name "state" path "org.zstack.header.volumeCache.HostCacheStoreInventory.state" diff --git a/plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java b/plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java index 64a4a6cbc0f..84cac77e1bb 100755 --- a/plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java +++ b/plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java @@ -5272,19 +5272,21 @@ public static class DetachVolumeCacheCmd extends AgentCommand implements HasThre public static class PoolRsp extends AgentResponse { public String poolUuid; public String mountPoint; + public Long totalCapacity; + public Long availableCapacity; + public Long totalPhysicalCapacity; + public Long availablePhysicalCapacity; + public Long systemUsedCapacity; } public static class PoolHealthRsp extends AgentResponse { + public String poolUuid; + public String mountPoint; public Boolean healthy; public String reason; } - public static class PoolCapacityRsp extends AgentResponse { - public Long total; - public Long used; - public Long available; - public Long allocated; - public Long dirty; + public static class PoolCapacityRsp extends PoolRsp { } public static class CacheRsp extends AgentResponse { @@ -5293,7 +5295,7 @@ public static class CacheRsp extends AgentResponse { public Long actualSize; } - public static class GCPoolRsp extends AgentResponse { + public static class GCPoolRsp extends PoolRsp { public List gcFiles; public Integer gcCount; } diff --git a/sdk/src/main/java/org/zstack/sdk/HostCacheStoreInventory.java b/sdk/src/main/java/org/zstack/sdk/HostCacheStoreInventory.java index db8bc096610..02a55a67759 100644 --- a/sdk/src/main/java/org/zstack/sdk/HostCacheStoreInventory.java +++ b/sdk/src/main/java/org/zstack/sdk/HostCacheStoreInventory.java @@ -61,20 +61,28 @@ public long getAvailableCapacity() { return this.availableCapacity; } - public long allocated; - public void setAllocated(long allocated) { - this.allocated = allocated; + public long totalPhysicalCapacity; + public void setTotalPhysicalCapacity(long totalPhysicalCapacity) { + this.totalPhysicalCapacity = totalPhysicalCapacity; } - public long getAllocated() { - return this.allocated; + public long getTotalPhysicalCapacity() { + return this.totalPhysicalCapacity; } - public long dirty; - public void setDirty(long dirty) { - this.dirty = dirty; + public long availablePhysicalCapacity; + public void setAvailablePhysicalCapacity(long availablePhysicalCapacity) { + this.availablePhysicalCapacity = availablePhysicalCapacity; } - public long getDirty() { - return this.dirty; + public long getAvailablePhysicalCapacity() { + return this.availablePhysicalCapacity; + } + + public long systemUsedCapacity; + public void setSystemUsedCapacity(long systemUsedCapacity) { + this.systemUsedCapacity = systemUsedCapacity; + } + public long getSystemUsedCapacity() { + return this.systemUsedCapacity; } public HostCacheStoreState state;