apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-4559: fix devcloud

Browse Source
This commit is contained in:
Edison Su 2013-08-29 10:33:47 -07:00
parent 2227eb191a
commit 88114350c7
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/vm/hypervisor/xenserver/xcposs/vmopsSnapshot
View File

@ -372,8 +372,16 @@ def unmountSnapshotsDir(session, args):
return "1" return "1"
def getPrimarySRPath(primaryStorageSRUuid, isISCSI): def getPrimarySRPath(session, primaryStorageSRUuid, isISCSI):
if isISCSI: sr = session.xenapi.SR.get_by_uuid(primaryStorageSRUuid)
srrec = session.xenapi.SR.get_record(sr)
srtype = srrec["type"]
if srtype == "file":
pbd = session.xenapi.SR.get_PBDs(sr)[0]
pbdrec = session.xenapi.PBD.get_record(pbd)
primarySRPath = pbdrec["device_config"]["location"]
return primarySRPath
elif isISCSI:
primarySRDir = lvhdutil.VG_PREFIX + primaryStorageSRUuid primarySRDir = lvhdutil.VG_PREFIX + primaryStorageSRUuid
return os.path.join(lvhdutil.VG_LOCATION, primarySRDir) return os.path.join(lvhdutil.VG_LOCATION, primarySRDir)
else: else:
@ -472,7 +480,7 @@ def getVhdParent(session, args):
snapshotUuid = args['snapshotUuid'] snapshotUuid = args['snapshotUuid']
isISCSI = getIsTrueString(args['isISCSI']) isISCSI = getIsTrueString(args['isISCSI'])
primarySRPath = getPrimarySRPath(primaryStorageSRUuid, isISCSI) primarySRPath = getPrimarySRPath(session, primaryStorageSRUuid, isISCSI)
util.SMlog("primarySRPath: " + primarySRPath) util.SMlog("primarySRPath: " + primarySRPath)
baseCopyUuid = getParentOfSnapshot(snapshotUuid, primarySRPath, isISCSI) baseCopyUuid = getParentOfSnapshot(snapshotUuid, primarySRPath, isISCSI)
@ -490,7 +498,7 @@ def backupSnapshot(session, args):
isISCSI = getIsTrueString(args['isISCSI']) isISCSI = getIsTrueString(args['isISCSI'])
path = args['path'] path = args['path']
localMountPoint = args['localMountPoint'] localMountPoint = args['localMountPoint']
primarySRPath = getPrimarySRPath(primaryStorageSRUuid, isISCSI) primarySRPath = getPrimarySRPath(session, primaryStorageSRUuid, isISCSI)
util.SMlog("primarySRPath: " + primarySRPath) util.SMlog("primarySRPath: " + primarySRPath)
baseCopyUuid = getParentOfSnapshot(snapshotUuid, primarySRPath, isISCSI) baseCopyUuid = getParentOfSnapshot(snapshotUuid, primarySRPath, isISCSI)