make sure XS report VM state even if there is no running VM on the host.

kelveny · kelveny · commit b21662f8904d · 2014-02-28T15:35:59.000-08:00
diff --git a/api/src/org/apache/cloudstack/context/CallContext.java b/api/src/org/apache/cloudstack/context/CallContext.java
@@ -252,6 +252,8 @@ public static CallContext unregister() {
 
         if (!stack.isEmpty()) {
             s_currentContext.set(stack.peek());
+        } else {
+            s_currentContext.set(null);
         }
 
         return context;
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -3048,7 +3048,7 @@ public boolean processCommands(long agentId, long seq, Command[] cmds) {
                 }
 
                 if(VmJobEnabled.value()) {
-                    if (ping.getHostVmStateReport() != null && ping.getHostVmStateReport().size() > 0) {
+                    if (ping.getHostVmStateReport() != null) {
                         _syncMgr.processHostVmStatePingReport(agentId, ping.getHostVmStateReport());
                     }
                 }
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java
@@ -66,6 +66,9 @@ public void processHostVmStatePingReport(long hostId, Map<String, HostVmStateRep
 
     private void processReport(long hostId, Map<Long, VirtualMachine.PowerState> translatedInfo) {
 
+        if (s_logger.isDebugEnabled())
+            s_logger.debug("Process VM state report. host: " + hostId + ", number of records in report: " + translatedInfo.size());
+
         for (Map.Entry<Long, VirtualMachine.PowerState> entry : translatedInfo.entrySet()) {
 
             if (s_logger.isDebugEnabled())
@@ -105,6 +108,9 @@ private void processReport(long hostId, Map<Long, VirtualMachine.PowerState> tra
                 }
             }
         }
+
+        if (s_logger.isDebugEnabled())
+            s_logger.debug("Done with process of VM state report. host: " + hostId);
     }
 
     @Override
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java
@@ -207,7 +207,7 @@ public static void setCurrentExecutionContext(AsyncJobExecutionContext currentCo
     public static String getOriginJobId() {
         AsyncJobExecutionContext context = AsyncJobExecutionContext.getCurrentExecutionContext();
         if (context != null && context.getJob() != null)
-            return "Job-" + context.getJob().getId();
+            return "" + context.getJob().getId();
 
         return "";
     }
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -324,9 +324,9 @@ public boolean equals(String type) {
     static {
         s_powerStatesTable = new HashMap<Types.VmPowerState, PowerState>();
         s_powerStatesTable.put(Types.VmPowerState.HALTED, PowerState.PowerOff);
-        s_powerStatesTable.put(Types.VmPowerState.PAUSED, PowerState.PowerOn);
+        s_powerStatesTable.put(Types.VmPowerState.PAUSED, PowerState.PowerOff);
         s_powerStatesTable.put(Types.VmPowerState.RUNNING, PowerState.PowerOn);
-        s_powerStatesTable.put(Types.VmPowerState.SUSPENDED, PowerState.PowerOn);
+        s_powerStatesTable.put(Types.VmPowerState.SUSPENDED, PowerState.PowerOff);
         s_powerStatesTable.put(Types.VmPowerState.UNRECOGNIZED, PowerState.PowerUnknown);
     }
 
@@ -2524,7 +2524,7 @@ protected HashMap<String, HostVmStateReportEntry> getHostVmStateReport(Connectio
         }
 
         if (vm_map == null) {
-            return null;
+            return vmStates;
         }
         for (VM.Record record : vm_map.values()) {
             if (record.isControlDomain || record.isASnapshot || record.isATemplate) {
@@ -4927,7 +4927,6 @@ protected boolean checkSR(Connection conn, SR sr) {
             }
             if (srr.shared) {
                 Host host = Host.getByUuid(conn, _host.uuid);
-
                 boolean found = false;
                 for (PBD pbd : pbds) {
                     PBD.Record pbdr = pbd.getRecord(conn);

Original file line number	Diff line number	Diff line change
`@@ -252,6 +252,8 @@ public static CallContext unregister() {`
`252`	`252`
`253`	`253`	`if (!stack.isEmpty()) {`
`254`	`254`	`s_currentContext.set(stack.peek());`
	`255`	`+ } else {`
	`256`	`+ s_currentContext.set(null);`
`255`	`257`	`}`
`256`	`258`
`257`	`259`	`return context;`
Original file line number	Diff line number	Diff line change
`@@ -3048,7 +3048,7 @@ public boolean processCommands(long agentId, long seq, Command[] cmds) {`
`3048`	`3048`	`}`
`3049`	`3049`
`3050`	`3050`	`if(VmJobEnabled.value()) {`
`3051`		`- if (ping.getHostVmStateReport() != null && ping.getHostVmStateReport().size() > 0) {`
	`3051`	`+ if (ping.getHostVmStateReport() != null) {`
`3052`	`3052`	`_syncMgr.processHostVmStatePingReport(agentId, ping.getHostVmStateReport());`
`3053`	`3053`	`}`
`3054`	`3054`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,9 @@ public void processHostVmStatePingReport(long hostId, Map<String, HostVmStateRep`
`66`	`66`
`67`	`67`	`private void processReport(long hostId, Map<Long, VirtualMachine.PowerState> translatedInfo) {`
`68`	`68`
	`69`	`+ if (s_logger.isDebugEnabled())`
	`70`	`+ s_logger.debug("Process VM state report. host: " + hostId + ", number of records in report: " + translatedInfo.size());`
	`71`	`+`
`69`	`72`	`for (Map.Entry<Long, VirtualMachine.PowerState> entry : translatedInfo.entrySet()) {`
`70`	`73`
`71`	`74`	`if (s_logger.isDebugEnabled())`
`@@ -105,6 +108,9 @@ private void processReport(long hostId, Map<Long, VirtualMachine.PowerState> tra`
`105`	`108`	`}`
`106`	`109`	`}`
`107`	`110`	`}`
	`111`	`+`
	`112`	`+ if (s_logger.isDebugEnabled())`
	`113`	`+ s_logger.debug("Done with process of VM state report. host: " + hostId);`
`108`	`114`	`}`
`109`	`115`
`110`	`116`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ public static void setCurrentExecutionContext(AsyncJobExecutionContext currentCo`
`207`	`207`	`public static String getOriginJobId() {`
`208`	`208`	`AsyncJobExecutionContext context = AsyncJobExecutionContext.getCurrentExecutionContext();`
`209`	`209`	`if (context != null && context.getJob() != null)`
`210`		`- return "Job-" + context.getJob().getId();`
	`210`	`+ return "" + context.getJob().getId();`
`211`	`211`
`212`	`212`	`return "";`
`213`	`213`	`}`