diff --git a/compute/src/main/java/org/zstack/compute/allocator/HostAllocatorManagerImpl.java b/compute/src/main/java/org/zstack/compute/allocator/HostAllocatorManagerImpl.java index 814cf91b83a..134b0bd6766 100755 --- a/compute/src/main/java/org/zstack/compute/allocator/HostAllocatorManagerImpl.java +++ b/compute/src/main/java/org/zstack/compute/allocator/HostAllocatorManagerImpl.java @@ -286,7 +286,6 @@ private void handle(ReportHostCapacityMessage msg) { vo.setAvailablePhysicalMemory(availMem); vo.setCpuNum(msg.getCpuNum()); vo.setCpuSockets(msg.getCpuSockets()); - vo.setCpuCoreNum(msg.getCpuCoreNum()); HostCapacityStruct s = new HostCapacityStruct(); s.setCpuSockets(vo.getCpuSockets()); @@ -309,7 +308,6 @@ private void handle(ReportHostCapacityMessage msg) { vo.setAvailablePhysicalMemory(availMem); vo.setTotalMemory(msg.getTotalMemory()); vo.setCpuSockets(msg.getCpuSockets()); - vo.setCpuCoreNum(msg.getCpuCoreNum()); HostCapacityStruct s = new HostCapacityStruct(); s.setCapacityVO(vo); @@ -332,7 +330,7 @@ private boolean needUpdateCapacity(HostCapacityVO vo, ReportHostCapacityMessage return vo.getCpuNum() != msg.getCpuNum() || vo.getTotalCpu() != totalCpu || vo.getAvailableCpu() != avaliCpu || vo.getTotalPhysicalMemory() != msg.getTotalMemory() || vo.getAvailablePhysicalMemory() != availMem || vo.getTotalMemory() != msg.getTotalMemory() - || vo.getCpuSockets() != msg.getCpuSockets() || vo.getCpuCoreNum() != msg.getCpuCoreNum(); + || vo.getCpuSockets() != msg.getCpuSockets(); } private void handle(final AllocateHostMsg msg) { diff --git a/conf/db/upgrade/V4.8.38__schema.sql b/conf/db/upgrade/V4.8.38__schema.sql index d6d24123895..c0faa002de3 100644 --- a/conf/db/upgrade/V4.8.38__schema.sql +++ b/conf/db/upgrade/V4.8.38__schema.sql @@ -1,6 +1,3 @@ -CALL ADD_COLUMN('LicenseHistoryVO', 'quotaType', 'varchar(64)', 1, 'None'); -CALL ADD_COLUMN('HostCapacityVO', 'cpuCoreNum', 'int unsigned', 0, '0'); - UPDATE VolumeSnapshotVO AS sp, PrimaryStorageVO AS ps SET sp.primaryStorageInstallPath = REPLACE(sp.primaryStorageInstallPath, '/dev/', 'sharedblock://') WHERE sp.primaryStorageUuid = ps.uuid diff --git a/header/src/main/java/org/zstack/header/allocator/HostCapacityInventory.java b/header/src/main/java/org/zstack/header/allocator/HostCapacityInventory.java index ca76b7234ff..8fd888110f2 100755 --- a/header/src/main/java/org/zstack/header/allocator/HostCapacityInventory.java +++ b/header/src/main/java/org/zstack/header/allocator/HostCapacityInventory.java @@ -15,7 +15,6 @@ public class HostCapacityInventory { private Long totalCpu; private Integer cpuNum; private Integer cpuSockets; - private Integer cpuCoreNum; private Long availableMemory; private Long availableCpu; private Long totalPhysicalMemory; @@ -32,7 +31,6 @@ public static HostCapacityInventory valueOf(HostCapacityVO vo) { inv.setTotalPhysicalMemory(vo.getTotalPhysicalMemory()); inv.setCpuNum(vo.getCpuNum()); inv.setCpuSockets(vo.getCpuSockets()); - inv.setCpuCoreNum(vo.getCpuCoreNum()); return inv; } @@ -44,14 +42,6 @@ public static List valueOf(Collection vos return invs; } - public Integer getCpuCoreNum() { - return cpuCoreNum; - } - - public void setCpuCoreNum(Integer cpuCoreNum) { - this.cpuCoreNum = cpuCoreNum; - } - public Integer getCpuSockets() { return cpuSockets; } diff --git a/header/src/main/java/org/zstack/header/allocator/HostCapacityVO.java b/header/src/main/java/org/zstack/header/allocator/HostCapacityVO.java index b6a17d1a91f..18a66f7af99 100755 --- a/header/src/main/java/org/zstack/header/allocator/HostCapacityVO.java +++ b/header/src/main/java/org/zstack/header/allocator/HostCapacityVO.java @@ -40,9 +40,6 @@ public class HostCapacityVO { @Column private int cpuSockets; - @Column - private int cpuCoreNum; - @Column @Index private long availableMemory; @@ -66,14 +63,6 @@ public int getCpuSockets() { return cpuSockets; } - public int getCpuCoreNum() { - return cpuCoreNum; - } - - public void setCpuCoreNum(int cpuCoreNum) { - this.cpuCoreNum = cpuCoreNum; - } - public void setCpuSockets(int cpuSockets) { this.cpuSockets = cpuSockets; } diff --git a/header/src/main/java/org/zstack/header/allocator/HostCapacityVO_.java b/header/src/main/java/org/zstack/header/allocator/HostCapacityVO_.java index d521909ad5a..0e256752159 100755 --- a/header/src/main/java/org/zstack/header/allocator/HostCapacityVO_.java +++ b/header/src/main/java/org/zstack/header/allocator/HostCapacityVO_.java @@ -10,7 +10,6 @@ public class HostCapacityVO_ { public static volatile SingularAttribute totalCpu; public static volatile SingularAttribute cpuNum; public static volatile SingularAttribute cpuSockets; - public static volatile SingularAttribute cpuCoreNum; public static volatile SingularAttribute availableMemory; public static volatile SingularAttribute availableCpu; public static volatile SingularAttribute totalPhysicalMemory; diff --git a/header/src/main/java/org/zstack/header/cluster/ReportHostCapacityMessage.java b/header/src/main/java/org/zstack/header/cluster/ReportHostCapacityMessage.java index e2d069c6a10..bd41d6a2cca 100755 --- a/header/src/main/java/org/zstack/header/cluster/ReportHostCapacityMessage.java +++ b/header/src/main/java/org/zstack/header/cluster/ReportHostCapacityMessage.java @@ -10,15 +10,6 @@ public class ReportHostCapacityMessage extends NeedReplyMessage { private String hostUuid; private int cpuNum; private int cpuSockets; - private int cpuCoreNum; - - public int getCpuCoreNum() { - return cpuCoreNum; - } - - public void setCpuCoreNum(int cpuCoreNum) { - this.cpuCoreNum = cpuCoreNum; - } public int getCpuSockets() { return cpuSockets; 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 a13a7bf1ef7..958af431eff 100755 --- a/plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java +++ b/plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java @@ -806,16 +806,6 @@ public static class HostCapacityResponse extends AgentResponse { private long usedMemory; @GrayVersion(value = "5.0.0") private int cpuSockets; - @GrayVersion(value = "5.4.0") - private int cpuCoreNum; - - public int getCpuCoreNum() { - return cpuCoreNum; - } - - public void setCpuCoreNum(int cpuCoreNum) { - this.cpuCoreNum = cpuCoreNum; - } public int getCpuSockets() { return cpuSockets; diff --git a/plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java b/plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java index 49b8ef06563..a6fdc9cc929 100755 --- a/plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java +++ b/plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java @@ -1706,7 +1706,6 @@ public void run(MessageReply reply) { rmsg.setTotalMemory(rsp.getTotalMemory()); rmsg.setUsedMemory(rsp.getUsedMemory()); rmsg.setCpuSockets(rsp.getCpuSockets()); - rmsg.setCpuCoreNum(rsp.getCpuCoreNum()); rmsg.setServiceId(bus.makeLocalServiceId(HostAllocatorConstant.SERVICE_ID)); bus.send(rmsg, new CloudBusCallBack(msg) { @Override diff --git a/sdk/src/main/java/org/zstack/sdk/LicenseInventory.java b/sdk/src/main/java/org/zstack/sdk/LicenseInventory.java index d4217d9b607..204094611e3 100644 --- a/sdk/src/main/java/org/zstack/sdk/LicenseInventory.java +++ b/sdk/src/main/java/org/zstack/sdk/LicenseInventory.java @@ -68,14 +68,6 @@ public java.lang.String getLicenseType() { return this.licenseType; } - public java.lang.String quotaType; - public void setQuotaType(java.lang.String quotaType) { - this.quotaType = quotaType; - } - public java.lang.String getQuotaType() { - return this.quotaType; - } - public java.lang.String expiredDate; public void setExpiredDate(java.lang.String expiredDate) { this.expiredDate = expiredDate; diff --git a/sdk/src/main/java/org/zstack/sdk/license/api/server/RequestLicenseCapacityAction.java b/sdk/src/main/java/org/zstack/sdk/license/api/server/RequestLicenseCapacityAction.java index 8e632d9428c..3a5805d0b44 100644 --- a/sdk/src/main/java/org/zstack/sdk/license/api/server/RequestLicenseCapacityAction.java +++ b/sdk/src/main/java/org/zstack/sdk/license/api/server/RequestLicenseCapacityAction.java @@ -28,7 +28,7 @@ public Result throwExceptionIfError() { @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) public java.lang.String resourceUuid; - @Param(required = true, validValues = {"CPU_Socket","CPU_Core","VM","Host","Capacity","None"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + @Param(required = true, validValues = {"CPU","VM","Host","Capacity","None"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) public java.lang.String quotaType; @Param(required = true, nonempty = false, nullElements = false, emptyString = true, numberRange = {0L,9223372036854775807L}, noTrim = false) diff --git a/test/src/test/groovy/org/zstack/test/integration/kvm/capacity/CheckHostCapacityWhenAddHostCase.groovy b/test/src/test/groovy/org/zstack/test/integration/kvm/capacity/CheckHostCapacityWhenAddHostCase.groovy index 021b5eaf823..b8c046775a2 100755 --- a/test/src/test/groovy/org/zstack/test/integration/kvm/capacity/CheckHostCapacityWhenAddHostCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/kvm/capacity/CheckHostCapacityWhenAddHostCase.groovy @@ -1,9 +1,6 @@ package org.zstack.test.integration.kvm.capacity import org.springframework.http.HttpEntity -import org.zstack.core.db.Q -import org.zstack.header.allocator.HostCapacityVO -import org.zstack.header.allocator.HostCapacityVO_ import org.zstack.kvm.KVMAgentCommands import org.zstack.kvm.KVMConstant import org.zstack.kvm.KVMGlobalConfig @@ -84,7 +81,6 @@ class CheckHostCapacityWhenAddHostCase extends SubCase { env.afterSimulator(KVMConstant.KVM_HOST_CAPACITY_PATH) { rsp, HttpEntity e -> rsp as KVMAgentCommands.HostCapacityResponse - rsp.setCpuCoreNum(20) rsp.setTotalMemory(SizeUnit.GIGABYTE.toByte(10)) return rsp } @@ -105,11 +101,6 @@ class CheckHostCapacityWhenAddHostCase extends SubCase { res = action.call() assert res.error == null - retryInSecs { - Integer cpuCoreNum = Q.New(HostCapacityVO.class).eq(HostCapacityVO_.uuid, res.value.getInventory().uuid).select(HostCapacityVO_.cpuCoreNum).findValue() - assert cpuCoreNum == 20 - } - deleteHost { uuid = res.value.inventory.uuid }