cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jburw...@apache.org
Subject [1/3] git commit: updated refs/heads/master to becec33
Date Wed, 16 Nov 2016 14:46:32 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 363896571 -> becec33c2


CLOUDSTACK-8830: Fix for vm snapshots in Vmware, could not create vm snapshot until 12 minutes
after vm creation due to vCenter sent null name on snpashot recent task


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

Branch: refs/heads/master
Commit: 94222b135680aad674b826888017056c4bbe0ea6
Parents: 72612f7
Author: nvazquez <nicolas.m.vazquez@gmail.com>
Authored: Wed Sep 21 10:55:51 2016 -0700
Committer: nvazquez <nicolas.m.vazquez@gmail.com>
Committed: Mon Oct 24 13:26:45 2016 -0300

----------------------------------------------------------------------
 .../hypervisor/vmware/manager/VmwareStorageManagerImpl.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/94222b13/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
index c5c1c43..3158ad4 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
@@ -1184,7 +1184,8 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager
{
             for (ManagedObjectReference taskMor : tasks) {
                 TaskInfo info = (TaskInfo)(context.getVimClient().getDynamicProperty(taskMor,
"info"));
 
-                if (info.getEntityName().equals(cmd.getVmName()) && info.getName().equalsIgnoreCase("CreateSnapshot_Task"))
{
+                if (info.getEntityName().equals(cmd.getVmName()) && StringUtils.isNotBlank(info.getName())
&&
+                        info.getName().equalsIgnoreCase("CreateSnapshot_Task")) {
                     if (!(info.getState().equals(TaskInfoState.SUCCESS) || info.getState().equals(TaskInfoState.ERROR)))
{
                         s_logger.debug("There is already a VM snapshot task running, wait
for it");
                         context.getVimClient().waitForTask(taskMor);
@@ -1403,7 +1404,8 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager
{
             for (ManagedObjectReference taskMor : tasks) {
                 TaskInfo info = (TaskInfo)(context.getVimClient().getDynamicProperty(taskMor,
"info"));
 
-                if (info.getEntityName().equals(cmd.getVmName()) && info.getName().equalsIgnoreCase("RevertToSnapshot_Task"))
{
+                if (info.getEntityName().equals(cmd.getVmName()) && StringUtils.isNotBlank(info.getName())
&&
+                        info.getName().equalsIgnoreCase("RevertToSnapshot_Task")) {
                     s_logger.debug("There is already a VM snapshot task running, wait for
it");
                     context.getVimClient().waitForTask(taskMor);
                 }


Mime
View raw message