-
Notifications
You must be signed in to change notification settings - Fork 1.2k
extension: improve host vm power reporting #11619
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.
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
base: main
Are you sure you want to change the base?
Changes from 3 commits
463f8fe
b175ef9
034fd33
8376aa9
cac5d92
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -68,6 +68,7 @@ | |
import com.cloud.agent.api.StopAnswer; | ||
import com.cloud.agent.api.StopCommand; | ||
import com.cloud.agent.api.to.VirtualMachineTO; | ||
import com.cloud.host.Host; | ||
import com.cloud.host.HostVO; | ||
import com.cloud.host.dao.HostDao; | ||
import com.cloud.hypervisor.ExternalProvisioner; | ||
|
@@ -129,7 +130,7 @@ public class ExternalPathPayloadProvisioner extends ManagerBase implements Exter | |
private ExecutorService payloadCleanupExecutor; | ||
private ScheduledExecutorService payloadCleanupScheduler; | ||
private static final List<String> TRIVIAL_ACTIONS = Arrays.asList( | ||
"status" | ||
"status", "statuses" | ||
); | ||
|
||
@Override | ||
|
@@ -430,7 +431,7 @@ public StopAnswer expungeInstance(String hostGuid, String extensionName, String | |
@Override | ||
public Map<String, HostVmStateReportEntry> getHostVmStateReport(long hostId, String extensionName, | ||
String extensionRelativePath) { | ||
final Map<String, HostVmStateReportEntry> vmStates = new HashMap<>(); | ||
Map<String, HostVmStateReportEntry> vmStates = new HashMap<>(); | ||
String extensionPath = getExtensionCheckedPath(extensionName, extensionRelativePath); | ||
if (StringUtils.isEmpty(extensionPath)) { | ||
return vmStates; | ||
|
@@ -440,14 +441,20 @@ public Map<String, HostVmStateReportEntry> getHostVmStateReport(long hostId, Str | |
logger.error("Host with ID: {} not found", hostId); | ||
return vmStates; | ||
} | ||
Map<String, Map<String, String>> accessDetails = | ||
extensionsManager.getExternalAccessDetails(host, null); | ||
vmStates = getVmPowerStates(host, accessDetails, extensionName, extensionPath); | ||
if (vmStates != null) { | ||
logger.debug("Found {} VMs on the host {}", vmStates.size(), host); | ||
return vmStates; | ||
} | ||
vmStates = new HashMap<>(); | ||
List<UserVmVO> allVms = _uservmDao.listByHostId(hostId); | ||
allVms.addAll(_uservmDao.listByLastHostId(hostId)); | ||
if (CollectionUtils.isEmpty(allVms)) { | ||
logger.debug("No VMs found for the {}", host); | ||
return vmStates; | ||
} | ||
Map<String, Map<String, String>> accessDetails = | ||
extensionsManager.getExternalAccessDetails(host, null); | ||
for (UserVmVO vm: allVms) { | ||
VirtualMachine.PowerState powerState = getVmPowerState(vm, accessDetails, extensionName, extensionPath); | ||
vmStates.put(vm.getInstanceName(), new HostVmStateReportEntry(powerState, "host-" + hostId)); | ||
|
@@ -647,7 +654,7 @@ protected VirtualMachine.PowerState parsePowerStateFromResponse(UserVmVO userVmV | |
return getPowerStateFromString(response); | ||
} | ||
try { | ||
JsonObject jsonObj = new JsonParser().parse(response).getAsJsonObject(); | ||
JsonObject jsonObj = JsonParser.parseString(response).getAsJsonObject(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The deprecated Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||
String powerState = jsonObj.has("power_state") ? jsonObj.get("power_state").getAsString() : null; | ||
return getPowerStateFromString(powerState); | ||
} catch (Exception e) { | ||
|
@@ -657,7 +664,7 @@ protected VirtualMachine.PowerState parsePowerStateFromResponse(UserVmVO userVmV | |
} | ||
} | ||
|
||
private VirtualMachine.PowerState getVmPowerState(UserVmVO userVmVO, Map<String, Map<String, String>> accessDetails, | ||
protected VirtualMachine.PowerState getVmPowerState(UserVmVO userVmVO, Map<String, Map<String, String>> accessDetails, | ||
String extensionName, String extensionPath) { | ||
final HypervisorGuru hvGuru = hypervisorGuruManager.getGuru(Hypervisor.HypervisorType.External); | ||
VirtualMachineProfile profile = new VirtualMachineProfileImpl(userVmVO); | ||
|
@@ -675,6 +682,46 @@ private VirtualMachine.PowerState getVmPowerState(UserVmVO userVmVO, Map<String, | |
} | ||
return parsePowerStateFromResponse(userVmVO, result.second()); | ||
} | ||
|
||
protected Map<String, HostVmStateReportEntry> getVmPowerStates(Host host, | ||
Map<String, Map<String, String>> accessDetails, String extensionName, String extensionPath) { | ||
Map<String, Object> modifiedDetails = loadAccessDetails(accessDetails, null); | ||
logger.debug("Trying to get VM power statuses from the external system for {}", host); | ||
Pair<Boolean, String> result = getInstanceStatusesOnExternalSystem(extensionName, extensionPath, | ||
host.getName(), modifiedDetails, AgentManager.Wait.value()); | ||
if (!result.first()) { | ||
logger.warn("Failure response received while trying to fetch the power statuses for {} : {}", | ||
host, result.second()); | ||
return null; | ||
} | ||
if (StringUtils.isBlank(result.second())) { | ||
logger.warn("Empty response while trying to fetch VM power statuses for host: {}", host); | ||
return null; | ||
} | ||
try { | ||
JsonObject jsonObj = JsonParser.parseString(result.second()).getAsJsonObject(); | ||
if (!jsonObj.has("status") || !"success".equalsIgnoreCase(jsonObj.get("status").getAsString())) { | ||
logger.warn("Invalid status in response while trying to fetch VM power statuses for host: {}: {}", | ||
host, result.second()); | ||
return null; | ||
} | ||
if (!jsonObj.has("power_state") || !jsonObj.get("power_state").isJsonObject()) { | ||
logger.warn("Missing or invalid power_state in response for host: {}: {}", host, result.second()); | ||
return null; | ||
} | ||
JsonObject powerStates = jsonObj.getAsJsonObject("power_state"); | ||
Map<String, HostVmStateReportEntry> states = new HashMap<>(); | ||
for (Map.Entry<String, com.google.gson.JsonElement> entry : powerStates.entrySet()) { | ||
VirtualMachine.PowerState powerState = getPowerStateFromString(entry.getValue().getAsString()); | ||
states.put(entry.getKey(), new HostVmStateReportEntry(powerState, "host-" + host.getId())); | ||
} | ||
return states; | ||
} catch (Exception e) { | ||
logger.warn("Failed to parse VM power statuses response for host: {}: {}", host, e.getMessage()); | ||
return null; | ||
} | ||
} | ||
|
||
public Pair<Boolean, String> prepareExternalProvisioningInternal(String extensionName, String filename, | ||
String vmUUID, Map<String, Object> accessDetails, int wait) { | ||
return executeExternalCommand(extensionName, "prepare", accessDetails, wait, | ||
|
@@ -718,6 +765,12 @@ public Pair<Boolean, String> getInstanceStatusOnExternalSystem(String extensionN | |
String.format("Failed to get the instance power status %s on external system", vmUUID), filename); | ||
} | ||
|
||
public Pair<Boolean, String> getInstanceStatusesOnExternalSystem(String extensionName, String filename, | ||
String hostName, Map<String, Object> accessDetails, int wait) { | ||
return executeExternalCommand(extensionName, "statuses", accessDetails, wait, | ||
String.format("Failed to get the %s instances power status on external system", hostName), filename); | ||
} | ||
|
||
public Pair<Boolean, String> executeExternalCommand(String extensionName, String action, | ||
Map<String, Object> accessDetails, int wait, String errorLogPrefix, String file) { | ||
try { | ||
|
Uh oh!
There was an error while loading. Please reload this page.