Skip to content

<feature>[host]: revert CPU core license backport #4422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ZStack-Robot wants to merge 1 commit into from
Closed

<feature>[host]: revert CPU core license backport #4422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions compute/src/main/java/org/zstack/compute/allocator/HostAllocatorManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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);
Expand All @@ -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) {
Expand Down
3 changes: 0 additions & 3 deletions conf/db/upgrade/V4.8.38__schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 0 additions & 10 deletions header/src/main/java/org/zstack/header/allocator/HostCapacityInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand All @@ -44,14 +42,6 @@ public static List<HostCapacityInventory> valueOf(Collection<HostCapacityVO> vos
return invs;
}

public Integer getCpuCoreNum() {
return cpuCoreNum;
}

public void setCpuCoreNum(Integer cpuCoreNum) {
this.cpuCoreNum = cpuCoreNum;
}

public Integer getCpuSockets() {
return cpuSockets;
}
Expand Down
11 changes: 0 additions & 11 deletions header/src/main/java/org/zstack/header/allocator/HostCapacityVO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ public class HostCapacityVO {
@Column
private int cpuSockets;

@Column
private int cpuCoreNum;

@Column
@Index
private long availableMemory;
Expand All @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion header/src/main/java/org/zstack/header/allocator/HostCapacityVO_.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ public class HostCapacityVO_ {
public static volatile SingularAttribute<HostCapacityVO, Long> totalCpu;
public static volatile SingularAttribute<HostCapacityVO, Integer> cpuNum;
public static volatile SingularAttribute<HostCapacityVO, Integer> cpuSockets;
public static volatile SingularAttribute<HostCapacityVO, Integer> cpuCoreNum;
public static volatile SingularAttribute<HostCapacityVO, Long> availableMemory;
public static volatile SingularAttribute<HostCapacityVO, Long> availableCpu;
public static volatile SingularAttribute<HostCapacityVO, Long> totalPhysicalMemory;
Expand Down
9 changes: 0 additions & 9 deletions header/src/main/java/org/zstack/header/cluster/ReportHostCapacityMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 0 additions & 10 deletions plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions sdk/src/main/java/org/zstack/sdk/LicenseInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sdk/src/main/java/org/zstack/sdk/license/api/server/RequestLicenseCapacityAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 0 additions & 9 deletions ...t/groovy/org/zstack/test/integration/kvm/capacity/CheckHostCapacityWhenAddHostCase.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -84,7 +81,6 @@ class CheckHostCapacityWhenAddHostCase extends SubCase {

env.afterSimulator(KVMConstant.KVM_HOST_CAPACITY_PATH) { rsp, HttpEntity<String> e ->
rsp as KVMAgentCommands.HostCapacityResponse
rsp.setCpuCoreNum(20)
rsp.setTotalMemory(SizeUnit.GIGABYTE.toByte(10))
return rsp
}
Expand All @@ -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
}
Expand Down