cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelv...@apache.org
Subject [3/3] git commit: updated refs/heads/4.4 to 63563b7
Date Wed, 19 Mar 2014 00:38:00 GMT
Fix style-check issue after cherry-picks


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/63563b74
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/63563b74
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/63563b74

Branch: refs/heads/4.4
Commit: 63563b740aff97701c909ea14a3b03bcd1c1cd6d
Parents: a5f418d
Author: Kelven Yang <kelveny@gmail.com>
Authored: Tue Mar 18 17:00:08 2014 -0700
Committer: Kelven Yang <kelveny@gmail.com>
Committed: Tue Mar 18 17:34:54 2014 -0700

----------------------------------------------------------------------
 .../src/com/cloud/vm/VirtualMachineManagerImpl.java            | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63563b74/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index bdc0f34..2ff870a 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -4224,13 +4224,12 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
             if(vm.isHaEnabled() && vm.getState() == State.Running && vm.getHypervisorType()
!= HypervisorType.VMware && vm.getHypervisorType() != HypervisorType.Hyperv) {
                 s_logger.info("Detected out-of-band stop of a HA enabled VM " + vm.getInstanceName()
+ ", will schedule restart");
                 if(!_haMgr.hasPendingHaWork(vm.getId()))
-                	_haMgr.scheduleRestart(vm, true);
+                    _haMgr.scheduleRestart(vm, true);
                 else
                     s_logger.info("VM " + vm.getInstanceName() + " already has an pending
HA task working on it");
-                
                 return;
             }
-            
+
             VirtualMachineGuru vmGuru = getVmGuru(vm);
             VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
             sendStop(vmGuru, profile, true);
@@ -4420,7 +4419,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
                     assert (jobVo != null);
                     if (jobVo == null || jobVo.getStatus() != JobInfo.Status.IN_PROGRESS)
                         return true;
-                    
                     return false;
                 }
             }, Topics.VM_POWER_STATE, AsyncJob.Topics.JOB_STATE);


Mime
View raw message