apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6399: When there are no vms running on hyperv host, then agent was returning null. In

Browse Source 
that case cloudstack was not doing anything and not updating the state of the vms to stopped.
Now the agent returns empty list of hostvmstatereport. Management server will then update the
vm state to stopped (instead of not acting upon the return state).
This commit is contained in:
Anshul Gangwar 2014-05-09 14:32:36 +05:30 committed by Devdeep Singh
parent 0f79223f28
commit 7916542d99
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
View File

@ -90,10 +90,10 @@ import com.cloud.agent.api.SetupGuestNetworkCommand;
import com.cloud.agent.api.StartCommand;
import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.StartupRoutingCommand;
import com.cloud.agent.api.UnPlugNicAnswer;
import com.cloud.agent.api.UnPlugNicCommand;
import com.cloud.agent.api.StartupRoutingCommand.VmState;
import com.cloud.agent.api.StartupStorageCommand;
import com.cloud.agent.api.UnPlugNicAnswer;
import com.cloud.agent.api.UnPlugNicCommand;
import com.cloud.agent.api.UnsupportedAnswer;
import com.cloud.agent.api.check.CheckSshAnswer;
import com.cloud.agent.api.check.CheckSshCommand;
@ -355,8 +355,12 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
}
s_logger.debug("HostVmStateReportCommand received response "
+ s_gson.toJson(result));
if (!result.isEmpty()) {
return result;
if (result != null) {
if (!result.isEmpty()) {
return result;
} else {
return new ArrayList<Map<String, String>>();
}
}
return null;
}
@ -364,7 +368,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
protected HashMap<String, HostVmStateReportEntry> getHostVmStateReport() {
final HashMap<String, HostVmStateReportEntry> vmStates = new HashMap<String, HostVmStateReportEntry>();
ArrayList<Map<String, String>> vmList = requestHostVmStateReport();
if (vmList == null || vmList.isEmpty()) {
if (vmList == null) {
return null;
}