Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 94A65F671 for ; Wed, 29 May 2013 09:54:25 +0000 (UTC) Received: (qmail 17837 invoked by uid 500); 29 May 2013 09:54:21 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 16902 invoked by uid 500); 29 May 2013 09:54:19 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 10832 invoked by uid 99); 29 May 2013 09:54:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 May 2013 09:54:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 95CA289CA5F; Wed, 29 May 2013 09:54:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sateesh@apache.org To: commits@cloudstack.apache.org Date: Wed, 29 May 2013 09:54:40 -0000 Message-Id: <4d3b7c42b84d43c7a43f09444f6ccc3b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [39/50] git commit: updated refs/heads/vmware-storage-motion to 004e74d CLOUDSTACK-659 Fixing migrate volume. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f911424a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f911424a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f911424a Branch: refs/heads/vmware-storage-motion Commit: f911424a368a290aad6b3eb44eeaf053c33e225c Parents: 2c8dd18 Author: Sateesh Chodapuneedi Authored: Thu May 23 16:23:09 2013 +0530 Committer: Sateesh Chodapuneedi Committed: Tue May 28 16:51:35 2013 +0530 ---------------------------------------------------------------------- .../hypervisor/vmware/resource/VmwareResource.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f911424a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 3c9319e..ca2a519 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -3608,11 +3608,13 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa String srcDiskName = ""; String srcDsName = ""; + String tgtDsName = ""; try { srcHyperHost = getHyperHost(getServiceContext()); morDc = srcHyperHost.getHyperHostDatacenter(); srcDsName = mgr.getStoragePoolOfVolume(cmd.getVolumeId()); + tgtDsName = poolTo.getUuid().replace("-", ""); // find VM through datacenter (VM is not at the target host yet) vmMo = srcHyperHost.findVmOnPeerHyperHost(vmName); @@ -3621,6 +3623,12 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa s_logger.error(msg); throw new Exception(msg); } + morDs = HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(srcHyperHost, tgtDsName); + if (morDs == null) { + String msg = "Unable to find the mounted datastore with name " + tgtDsName + " to execute MigrateVolumeCommand"; + s_logger.error(msg); + throw new Exception(msg); + } srcDiskName = String.format("[%s] %s.vmdk", srcDsName, volumePath); diskLocator = new VirtualMachineRelocateSpecDiskLocator(); @@ -3634,7 +3642,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa if (!vmMo.changeDatastore(relocateSpec)) { throw new Exception("Change datastore operation failed during volume migration"); } else { - s_logger.debug("Successfully migrated volume " + vmName + " to target datastore"); + s_logger.debug("Successfully migrated volume " + volumePath + " to target datastore " + tgtDsName); } return new MigrateVolumeAnswer(cmd, true, null, volumePath);