Change in vdsm[master]: vm: added missing GUID slot in Drive class

derez at redhat.com derez at redhat.com
Thu Feb 13 06:12:55 UTC 2014


Daniel Erez has uploaded a new change for review.

Change subject: vm: added missing GUID slot in Drive class
......................................................................

vm: added missing GUID slot in Drive class

Following commit I6e8dadabdd02d3b44606f215c4bc7b7e306a591a,
added missing 'GUID' slot in VM -> Drive class
(needed for the functionality introduced in commit
Ia4988212f7f96078e774d2a4e7b5cd1681383cb0).

In addition, verified 'GUID' key existence on _getDiskStats.

Change-Id: I2c64375138061e4310188baddbe114251ac157cc
Related-To-Bug-Url: https://bugzilla.redhat.com/1026868
Signed-off-by: Daniel Erez <derez at redhat.com>
---
M vdsm/vm.py
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/18/24418/1

diff --git a/vdsm/vm.py b/vdsm/vm.py
index 9371049..dfb4381 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -631,7 +631,7 @@
                           'apparentsize': str(vmDrive.apparentsize)}
                 if isVdsmImage(vmDrive):
                     dStats['imageID'] = vmDrive.imageID
-                else:
+                elif "GUID" in vmDrive:
                     dStats['lunGUID'] = vmDrive.GUID
                 dStats['readRate'] = ((eInfo[dName][1] - sInfo[dName][1]) /
                                       sampleInterval)
@@ -1453,7 +1453,7 @@
                  'propagateErrors', 'address', 'apparentsize', 'volumeInfo',
                  'index', 'name', 'optional', 'shared', 'truesize',
                  'volumeChain', 'baseVolumeID', 'serial', 'reqsize', 'cache',
-                 '_blockDev', 'extSharedState', 'drv', 'sgio')
+                 '_blockDev', 'extSharedState', 'drv', 'sgio', 'GUID')
     VOLWM_CHUNK_MB = config.getint('irs', 'volume_utilization_chunk_mb')
     VOLWM_FREE_PCT = 100 - config.getint('irs', 'volume_utilization_percent')
     VOLWM_CHUNK_REPLICATE_MULT = 2  # Chunk multiplier during replication


-- 
To view, visit http://gerrit.ovirt.org/24418
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c64375138061e4310188baddbe114251ac157cc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <derez at redhat.com>


More information about the vdsm-patches mailing list