Skip to content

plugin/shutdown: use mgmt server uuid in the shutdown response #10717

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

Merged
DaanHoogland merged 1 commit into from
Apr 18, 2025
Merged

plugin/shutdown: use mgmt server uuid in the shutdown response #10717

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
14 changes: 3 additions & 11 deletions ...s/shutdown/src/main/java/org/apache/cloudstack/api/response/ReadyForShutdownResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ public class ReadyForShutdownResponse extends BaseResponse {

@SerializedName(ApiConstants.MANAGEMENT_SERVER_ID)
@Param(description = "The id of the management server")
private Long msId;
private String msUuid;

public ReadyForShutdownResponse(Long msId, Boolean shutdownTriggered, Boolean readyForShutdown, long pendingJobsCount) {
this.msId = msId;
public ReadyForShutdownResponse(String msUuid, Boolean shutdownTriggered, Boolean readyForShutdown, long pendingJobsCount) {
this.msUuid = msUuid;
this.shutdownTriggered = shutdownTriggered;
this.readyForShutdown = readyForShutdown;
this.pendingJobsCount = pendingJobsCount;
Expand Down Expand Up @@ -70,12 +70,4 @@ public Long getPendingJobsCount() {
public void setPendingJobsCount(Long pendingJobsCount) {
this.pendingJobsCount = pendingJobsCount;
}

public Long getMsId() {
return msId;
}

public void setMsId(Long msId) {
this.msId = msId;
}
}
4 changes: 3 additions & 1 deletion plugins/shutdown/src/main/java/org/apache/cloudstack/shutdown/ShutdownManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ public void cancelShutdown() {
public ReadyForShutdownResponse readyForShutdown(Long managementserverid) {
Long[] msIds = null;
boolean shutdownTriggeredAnywhere = false;
String msUuid = null;
State[] shutdownTriggeredStates = {State.ShuttingDown, State.PreparingToShutDown, State.ReadyToShutDown};
if (managementserverid == null) {
List<ManagementServerHostVO> msHosts = msHostDao.listBy(shutdownTriggeredStates);
Expand All @@ -149,11 +150,12 @@ public ReadyForShutdownResponse readyForShutdown(Long managementserverid) {
}
} else {
ManagementServerHostVO msHost = msHostDao.findById(managementserverid);
msUuid = msHost.getUuid();
msIds = new Long[]{msHost.getMsid()};
shutdownTriggeredAnywhere = Arrays.asList(shutdownTriggeredStates).contains(msHost.getState());
}
long pendingJobCount = countPendingJobs(msIds);
return new ReadyForShutdownResponse(managementserverid, shutdownTriggeredAnywhere, pendingJobCount == 0, pendingJobCount);
return new ReadyForShutdownResponse(msUuid, shutdownTriggeredAnywhere, pendingJobCount == 0, pendingJobCount);
}

@Override
Expand Down