Change in vdsm[master]: vm: Remove unused live-merge extend code
nsoffer at redhat.com
nsoffer at redhat.com
Sun Apr 19 18:48:19 UTC 2015
Nir Soffer has uploaded a new change for review.
Change subject: vm: Remove unused live-merge extend code
......................................................................
vm: Remove unused live-merge extend code
_getExtendCandidates contained unused code that may be needed for future
version of libvirt, providing drive size info for internal volumes.
Keeping unused code makes our life harder.
Change-Id: I0c28031bf6bc9bcaf8aead5831884ea5de232e85
Signed-off-by: Nir Soffer <nsoffer at redhat.com>
---
M vdsm/virt/vm.py
1 file changed, 0 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/18/40018/1
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 5b71843..b40f1ce 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -1311,9 +1311,6 @@
def _getExtendCandidates(self):
ret = []
- # FIXME: mergeCandidates should be a dictionary of candidate volumes
- # once libvirt starts reporting watermark information for all volumes.
- mergeCandidates = {}
for drive in self._devices[hwclass.DISK]:
if not drive.chunked:
continue
@@ -1327,13 +1324,6 @@
ret.append((drive, drive.volumeID, capacity, alloc, physical))
- try:
- mergeCandidate = mergeCandidates[drive.imageID]
- except KeyError:
- continue
- ret.append((drive, mergeCandidate['volumeID'],
- mergeCandidate['capacity'], mergeCandidate['alloc'],
- mergeCandidate['physical']))
return ret
def _shouldExtendVolume(self, drive, volumeID, capacity, alloc, physical):
--
To view, visit https://gerrit.ovirt.org/40018
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c28031bf6bc9bcaf8aead5831884ea5de232e85
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer at redhat.com>
More information about the vdsm-patches
mailing list