Change in vdsm[master]: vm: discover volume path from xml definition - vdsm-patches - Fedora mailing-lists

7 Feb 2014

Federico Simoncelli has uploaded a new change for review.
Change subject: vm: discover volume path from xml definition
......................................................................
vm: discover volume path from xml definition
In a previous commit (c072945 One shot prepare) we involuntarily
changed the path used for virtual machine images from:
/rhev/data-center/<spUUID>/<sdUUID>/images/<imgUUID>/<volUUID>
to:
/rhev/data-center/mnt/blockSD/<sdUUID>/images/<imgUUID>/<volUUID>
This generated an issue during live migration between different
vdsm versions:
libvirtError: invalid argument: invalid path ... not assigned to
 domain
In this patch:
- revert to the previous path for virtual machine images
- inspect libvirt xml during live migration and vdsm restart to
  identify if it is necessary to update the path cached in the
  drive object (provided by prepareImage)
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1059482
Change-Id: I322f1f879fbd5b6415789f3b307e8741d846d694
Signed-off-by: Federico Simoncelli fsimonce@redhat.com
---
M vdsm/storage/blockSD.py
M vdsm/storage/fileSD.py
M vdsm/storage/hsm.py
M vdsm/storage/sd.py
M vdsm/vm.py
5 files changed, 25 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/02/24202/1

diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index 5179c5a..9d76c2c 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -1052,9 +1052,8 @@
         vols, rems = self.getAllVolumesImages()
         return rems
-    def linkBCImage(self, imgPath, imgUUID):
-        dst = os.path.join(self.mountpoint, self.sdUUID, sd.DOMAIN_IMAGES,
-                           imgUUID)
+    def linkBCImage(self, imgUUID, imgPath):
+        dst = sd.StorageDomain.linkBCImage(self, imgUUID, imgPath)
         try:
             os.symlink(imgPath, dst)
         except OSError as e:
diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py
index 180a43f..50caa09 100644
--- a/vdsm/storage/fileSD.py
+++ b/vdsm/storage/fileSD.py
@@ -421,10 +421,6 @@
         return dict((k, sd.ImgsPar(tuple(v['imgs']), v['parent']))
                     for k, v in volumes.iteritems())
-    def linkBCImage(self, imgPath, imgUUID):
-        return os.path.join(self.mountpoint, self.sdUUID, sd.DOMAIN_IMAGES,
-                            imgUUID)
-
     def createImageLinks(self, srcImgPath, imgUUID):
         """
         qcow chain is build by reading each qcow header and reading the path
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 53c9dd0..384d43f 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -3220,7 +3220,7 @@
         imgVolumes = sd.getVolsOfImage(allVols, imgUUID).keys()
         imgPath = dom.activateVolumes(imgUUID, imgVolumes)
         if spUUID and spUUID != sd.BLANK_UUID:
-            runImgPath = dom.linkBCImage(imgPath, imgUUID)
+            runImgPath = dom.linkBCImage(imgUUID, imgPath)
         else:
             runImgPath = imgPath
diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py
index c9738e0..38ec5af 100644
--- a/vdsm/storage/sd.py
+++ b/vdsm/storage/sd.py
@@ -25,6 +25,7 @@
 from collections import namedtuple
 import codecs
+import image
 import storage_exception as se
 import misc
 import resourceFactories
@@ -643,6 +644,10 @@
         # If it has a repo we don't have multiple domains. Assume single pool
         return os.path.join(self.storage_repository, self.getPools()[0])
+    def linkBCImage(self, imgUUID, imgPath):
+        return image.Image(self._getRepoPath()) \
+                    .getImageDir(self.sdUUID, imgUUID)
+
     def getIsoDomainImagesDir(self):
         """
         Get 'images' directory from Iso domain
diff --git a/vdsm/vm.py b/vdsm/vm.py
index aae8bd6..78161d1 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -4962,6 +4962,16 @@
self.log.debug('Looking for drive with attributes %s', deviceDict)
             for d in self._devices[DISK_DEVICES]:
+                # When we analyze a disk device that was already discovered in
+                # the past (generally as soon as the VM is created) we should
+                # verify that the cached path is the one used in libvirt.
+                # We already hit few times the problem that after a live
+                # migration the paths were not in sync anymore (BZ#1059482).
+                if (hasattr(d, 'alias') and d.alias == alias
+                        and d.path != devPath):
+                    self.log.warning('updating drive %s path from %s to %s',
+                                     d.alias, d.path, devPath)
+                    d.path = devPath
                 if d.path == devPath:
                     d.name = name
                     d.type = devType
@@ -4975,6 +4985,13 @@
             # Update vm's conf with address for known disk devices
             knownDev = False
             for dev in self.conf['devices']:
+                # See comment in previous loop. This part is used to update
+                # the vm configuration as well.
+                if ('alias' in dev and dev['alias'] == alias
+                        and dev['path'] != devPath):
+                    self.log.warning('updating drive %s config path from %s '
+                                     'to %s', dev['alias'], d.path, devPath)
+                    dev['path'] = devPath
                 if dev['type'] == DISK_DEVICES and dev['path'] == devPath:
                     dev['name'] = name
                     dev['address'] = address
-- 
To view, visit http://gerrit.ovirt.org/24202
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I322f1f879fbd5b6415789f3b307e8741d846d694
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli fsimonce@redhat.com

    