CLOUDSTACK-3535: fix regression introduced in 5d9fa5d

Author: sudison

engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java

@@ -522,6 +522,7 @@ protected Void createVolumeFromBaseImageCallBack(
         if (result.isSuccess()) {
             vo.processEvent(Event.OperationSuccessed, result.getAnswer());
         } else {
+
             vo.processEvent(Event.OperationFailed);
             volResult.setResult(result.getResult());
         }

plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java

@@ -59,15 +59,19 @@ public Status isAgentAlive(HostVO agent) {
             return null;
         }
         CheckOnHostCommand cmd = new CheckOnHostCommand(agent);
-        List<HostVO> neighbors = _resourceMgr.listAllHostsInCluster(agent.getClusterId());
+        List<HostVO> neighbors = _resourceMgr.listHostsInClusterByStatus(agent.getClusterId(), Status.Up);
         for (HostVO neighbor : neighbors) {
             if (neighbor.getId() == agent.getId() || neighbor.getHypervisorType() != Hypervisor.HypervisorType.KVM) {
                 continue;
             }
-            Answer answer = _agentMgr.easySend(neighbor.getId(), cmd);
-
-            return answer.getResult() ? Status.Down : Status.Up;
-
+            try {
+                Answer answer = _agentMgr.easySend(neighbor.getId(), cmd);
+                if (answer != null) {
+                    return answer.getResult() ? Status.Down : Status.Up;
+                }
+            } catch (Exception e) {
+                s_logger.debug("Failed to send command to host: " + neighbor.getId());
+            }
         }
 
         return null;

server/src/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -1254,10 +1254,14 @@ public <T extends VMInstanceVO> boolean advanceStop(T vm, boolean forced, User u
 
         } catch (AgentUnavailableException e) {
             s_logger.warn("Unable to stop vm, agent unavailable: " + e.toString());
-            throw e;
+            if (!forced) {
+                throw e;
+            }
         } catch (OperationTimedoutException e) {
             s_logger.warn("Unable to stop vm, operation timed out: " + e.toString());
-            throw e;
+            if (!forced) {
+                throw e;
+            }
         } finally {
             if (!stopped) {
                 if (!forced) {