Skip to content

Commit bfc0af5

Browse files
plugin/shutdown: use mgmt server uuid in the shutdown response
Fixes #10669 Creates shutdown response to use management server UUID than internal DB ID. Signed-off-by: Rohit Yadav <[email protected]>
1 parent f13cf59 commit bfc0af5

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

plugins/shutdown/src/main/java/org/apache/cloudstack/api/response/ReadyForShutdownResponse.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ public class ReadyForShutdownResponse extends BaseResponse {
3838

3939
@SerializedName(ApiConstants.MANAGEMENT_SERVER_ID)
4040
@Param(description = "The id of the management server")
41-
private Long msId;
41+
private String msUuid;
4242

43-
public ReadyForShutdownResponse(Long msId, Boolean shutdownTriggered, Boolean readyForShutdown, long pendingJobsCount) {
44-
this.msId = msId;
43+
public ReadyForShutdownResponse(String msUuid, Boolean shutdownTriggered, Boolean readyForShutdown, long pendingJobsCount) {
44+
this.msUuid = msUuid;
4545
this.shutdownTriggered = shutdownTriggered;
4646
this.readyForShutdown = readyForShutdown;
4747
this.pendingJobsCount = pendingJobsCount;
@@ -70,12 +70,4 @@ public Long getPendingJobsCount() {
7070
public void setPendingJobsCount(Long pendingJobsCount) {
7171
this.pendingJobsCount = pendingJobsCount;
7272
}
73-
74-
public Long getMsId() {
75-
return msId;
76-
}
77-
78-
public void setMsId(Long msId) {
79-
this.msId = msId;
80-
}
8173
}

plugins/shutdown/src/main/java/org/apache/cloudstack/shutdown/ShutdownManagerImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ public void cancelShutdown() {
137137
public ReadyForShutdownResponse readyForShutdown(Long managementserverid) {
138138
Long[] msIds = null;
139139
boolean shutdownTriggeredAnywhere = false;
140+
String msUuid = null;
140141
State[] shutdownTriggeredStates = {State.ShuttingDown, State.PreparingToShutDown, State.ReadyToShutDown};
141142
if (managementserverid == null) {
142143
List<ManagementServerHostVO> msHosts = msHostDao.listBy(shutdownTriggeredStates);
@@ -149,11 +150,12 @@ public ReadyForShutdownResponse readyForShutdown(Long managementserverid) {
149150
}
150151
} else {
151152
ManagementServerHostVO msHost = msHostDao.findById(managementserverid);
153+
msUuid = msHost.getUuid();
152154
msIds = new Long[]{msHost.getMsid()};
153155
shutdownTriggeredAnywhere = Arrays.asList(shutdownTriggeredStates).contains(msHost.getState());
154156
}
155157
long pendingJobCount = countPendingJobs(msIds);
156-
return new ReadyForShutdownResponse(managementserverid, shutdownTriggeredAnywhere, pendingJobCount == 0, pendingJobCount);
158+
return new ReadyForShutdownResponse(msUuid, shutdownTriggeredAnywhere, pendingJobCount == 0, pendingJobCount);
157159
}
158160

159161
@Override

0 commit comments

Comments
 (0)