Skip to content

<fix>[compute]: fix VM clone quota check fail #3590

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

Open
zstack-robot-1 wants to merge 1 commit into
base: 5.5.12
Choose a base branch
from
Open

<fix>[compute]: fix VM clone quota check fail #3590

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
3 changes: 3 additions & 0 deletions compute/src/main/java/org/zstack/compute/allocator/HostAllocatorChain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.zstack.core.db.Q;
import org.zstack.core.errorcode.ErrorFacade;
import org.zstack.header.allocator.*;
import org.zstack.header.apimediator.ApiMessageInterceptionException;
import org.zstack.header.core.ReturnValueCompletion;
import org.zstack.header.errorcode.ErrorCode;
import org.zstack.header.errorcode.OperationFailureException;
Expand Down Expand Up @@ -144,6 +145,8 @@ private void runFlow(AbstractHostAllocatorFlow flow) {
} else {
fail(ofe.getErrorCode());
}
} catch (ApiMessageInterceptionException e) {
fail(e.getError());
} catch (Throwable t) {
logger.warn("unhandled throwable", t);
String errMsg = t != null ? t.toString() : "unknown error";
Expand Down
7 changes: 7 additions & 0 deletions compute/src/main/java/org/zstack/compute/allocator/QuotaAllocatorFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@ public void allocate() {

throwExceptionIfIAmTheFirstFlow();

// skip quota check if the operator is admin
String sessionAccountUuid = spec.getSessionAccountUuid();
if (sessionAccountUuid != null && AccountConstant.isAdminPermission(sessionAccountUuid)) {
next(candidates);
return;
}

final String vmInstanceUuid = spec.getVmInstance().getUuid();
final String accountUuid = Account.getAccountUuidOfResource(vmInstanceUuid);
if (accountUuid == null || AccountConstant.isAdminPermission(accountUuid)) {
Expand Down
9 changes: 9 additions & 0 deletions header/src/main/java/org/zstack/header/allocator/AllocateHostMsg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public class AllocateHostMsg extends NeedReplyMessage {
private long oldMemoryCapacity = 0;
private AllocationScene allocationScene;
private String architecture;
private String sessionAccountUuid;

public List<Set<String>> getOptionalPrimaryStorageUuids() {
return optionalPrimaryStorageUuids;
Expand Down Expand Up @@ -211,4 +212,12 @@ public String getArchitecture() {
public void setArchitecture(String architecture) {
this.architecture = architecture;
}

public String getSessionAccountUuid() {
return sessionAccountUuid;
}

public void setSessionAccountUuid(String sessionAccountUuid) {
this.sessionAccountUuid = sessionAccountUuid;
}
}
10 changes: 10 additions & 0 deletions header/src/main/java/org/zstack/header/allocator/HostAllocatorSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public class HostAllocatorSpec {
private long oldMemoryCapacity = 0;
private AllocationScene allocationScene;
private String architecture;
private String sessionAccountUuid;

public AllocationScene getAllocationScene() {
return allocationScene;
Expand Down Expand Up @@ -222,6 +223,14 @@ public void setArchitecture(String architecture) {
this.architecture = architecture;
}

public String getSessionAccountUuid() {
return sessionAccountUuid;
}

public void setSessionAccountUuid(String sessionAccountUuid) {
this.sessionAccountUuid = sessionAccountUuid;
}

public static HostAllocatorSpec fromAllocationMsg(AllocateHostMsg msg) {
HostAllocatorSpec spec = new HostAllocatorSpec();
spec.setAllocatorStrategy(msg.getAllocatorStrategy());
Expand Down Expand Up @@ -250,6 +259,7 @@ public static HostAllocatorSpec fromAllocationMsg(AllocateHostMsg msg) {
msg.getOptionalPrimaryStorageUuids().forEach(spec::addOptionalPrimaryStorageUuids);
spec.setAllocationScene(msg.getAllocationScene());
spec.setArchitecture(msg.getArchitecture());
spec.setSessionAccountUuid(msg.getSessionAccountUuid());
if (msg.getSystemTags() != null && !msg.getSystemTags().isEmpty()){
spec.setSystemTags(new ArrayList<String>(msg.getSystemTags()));
}
Expand Down