git commit: refs/heads/master - CS-16544: Create Snapshot (2nd time - reccuring) is failing on XenServer 6.1. The issue is that while backing up a snapshot when cloudstack tries to update the parent (of the backed up vhd), vhd-util isn't present at the d

[ni...@apache.org]

Updated Branches:
  refs/heads/master 13ee8d186 -> e16287660


CS-16544: Create Snapshot (2nd time - reccuring) is failing on XenServer 6.1. The issue is that while backing up a snapshot when cloudstack tries to update the parent (of the backed up vhd), vhd-util isn't present at the desired location and setParent function in vmopsSnapshot fails. This issue is observed only on Xenserver 6.1. The reason for this is, when CloudStack connects to a Xenserver and executes the SetupCommand, it copies vhd-util tool to /opt/xensource/bin directory on the host. However, in vmopsSnapshot python file 'VHD_UTIL' is initialized to /usr/sbin/. The issue is not observed on 6.0.2 (and I guess previous versions) because vhd-util is present in /usr/sbin/ directory by default (after a clean install). Whereas, in Xenserver 6.1, vhd-util is present in '/usr/bin'. Fixed the issue by updating VHD_UTIL to point to /opt/xensource/bin/vhd-util in vmopsSnapshot file.


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

Branch: refs/heads/master
Commit: e162876605a31a4687ac77c5554e0a15ea7dda55
Parents: 13ee8d1
Author: Devdeep Singh <de...@citrix.com>
Authored: Fri Feb 1 15:25:26 2013 +0530
Committer: Nitin Mehta <ni...@citrix.com>
Committed: Fri Feb 1 15:25:26 2013 +0530

----------------------------------------------------------------------
 scripts/vm/hypervisor/xenserver/vmopsSnapshot |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e1628766/scripts/vm/hypervisor/xenserver/vmopsSnapshot
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/vmopsSnapshot b/scripts/vm/hypervisor/xenserver/vmopsSnapshot
index 80e21f8..39fe31c 100755
--- a/scripts/vm/hypervisor/xenserver/vmopsSnapshot
+++ b/scripts/vm/hypervisor/xenserver/vmopsSnapshot
@@ -35,7 +35,7 @@ import cleanup
 import stat
 import random
 
-VHD_UTIL = '/usr/sbin/vhd-util'
+VHD_UTIL = '/opt/xensource/bin/vhd-util'
 VHD_PREFIX = 'VHD-'
 CLOUD_DIR = '/var/run/cloud_mount'