From 29c36b2ad20a65085f76f529a0e0007c99310489 Mon Sep 17 00:00:00 2001 From: Likitha Shetty Date: Fri, 22 Nov 2013 16:43:17 +0530 Subject: [PATCH] CLOUDSTACK-5122. [VMware] During upgrade from 4.1 system vms don't come up with 'ROOT-x-y VMDK file not found' exception. During VM start, if VM already exists and CS finds a matching disk in storage for each of the existing disk then the VM is reconfigured with VM's existing disk information. This existing disk information for a VM is got from vCenter. CS checks if a matching disk exists in storage by checking if there is a disk in storage whose name atleast partially matches with the name of the existing disk. Post 4.1, Volume path has been changed to ROOT- from ROOT--. Hence in case of an upgraded setup (pre 4.1 to 4.2) during search for an existing disk in storage even though ROOT-- has been deleted, CS does a postive match of the old existing disk because of the partial match with the new disk ROOT- that exists in storage. And so when VM is being powered on by vCenter it looks for ROOT-- and fails to power on. Solution - While looking for a VM's matching disk in storage, instead of checking if a disk with a partial match exists check if a disk with the exact name exists. --- .../hypervisor/vmware/mo/VirtualMachineDiskInfoBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineDiskInfoBuilder.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineDiskInfoBuilder.java index baddfc0b9bb..9e9fa8988a4 100644 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineDiskInfoBuilder.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineDiskInfoBuilder.java @@ -88,7 +88,7 @@ public class VirtualMachineDiskInfoBuilder { for (String backing : chain) { DatastoreFile file = new DatastoreFile(backing); - if (file.getFileBaseName().contains(diskBackingFileBaseName)) + if (file.getFileBaseName().equals(diskBackingFileBaseName)) return true; }