You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2014/03/01 00:37:40 UTC
[20/33] git commit: updated refs/heads/master to 90262a8
Pragrammatically Answer HA question posted in vCenter since it will block CloudStack from continuously operating on the VM
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6987f233
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6987f233
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6987f233
Branch: refs/heads/master
Commit: 6987f23380c23aaf38856367f2acb4bf40fb7dd5
Parents: fa7d9ad
Author: Kelven Yang <ke...@gmail.com>
Authored: Tue Jan 28 17:16:04 2014 -0800
Committer: Kelven Yang <ke...@gmail.com>
Committed: Fri Feb 28 15:35:58 2014 -0800
----------------------------------------------------------------------
.../hypervisor/vmware/mo/VirtualMachineMO.java | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6987f233/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index 263c656..663adbf 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -248,17 +248,12 @@ public class VirtualMachineMO extends BaseMO {
}
});
- try {
- boolean result = _context.getVimClient().waitForTask(morTask);
- if (result) {
- _context.waitForTaskProgressDone(morTask);
- return true;
- } else {
- s_logger.error("VMware powerOnVM_Task failed due to " + TaskMO.getTaskFailureInfo(_context, morTask));
- }
- } finally {
- // make sure to let VM question monitor exit
- flags[0] = true;
+ boolean result = _context.getVimClient().waitForTask(morTask);
+ if (result) {
+ _context.waitForTaskProgressDone(morTask);
+ return true;
+ } else {
+ s_logger.error("VMware powerOnVM_Task failed due to " + TaskMO.getTaskFailureInfo(_context, morTask));
}
return false;