Change in vdsm[master]: vdsm: Fix regression introduced by refactoring libvirtvm
vfeenstr at redhat.com
vfeenstr at redhat.com
Mon Aug 5 12:24:12 UTC 2013
Vinzenz Feenstra has uploaded a new change for review.
Change subject: vdsm: Fix regression introduced by refactoring libvirtvm
......................................................................
vdsm: Fix regression introduced by refactoring libvirtvm
Rebasing the changeset of refactoring libvirtvm.py and vm.py into vm.py [1]
caused an accidental removal of changes made in commit 30a4b50 [2].
This commit fixes the mess up of this rebase mess up.
[1]: http://gerrit.ovirt.org/gitweb?p=vdsm.git;a=commit;h=ee082b8
[2]: http://gerrit.ovirt.org/gitweb?p=vdsm.git;a=commit;h=30a4b50
Change-Id: I0eeb53828e1a33e6f0e010f9e17fb2911fda3f45
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=985735
Signed-off-by: Vinzenz Feenstra <vfeenstr at redhat.com>
---
M vdsm/vm.py
1 file changed, 3 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/17659/1
diff --git a/vdsm/vm.py b/vdsm/vm.py
index ec72601..39a5494 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -1355,7 +1355,7 @@
can also dynamically change according to the VM needs (e.g. increase
during a live storage migration).
"""
- if hasattr(self, "diskReplicate"):
+ if self.isDiskReplicationInProgress():
return self.VOLWM_CHUNK_MB * self.VOLWM_CHUNK_REPLICATE_MULT
return self.VOLWM_CHUNK_MB
@@ -3302,7 +3302,8 @@
for dev in self.conf['devices'][:]:
if (dev['type'] == DISK_DEVICES and
dev['path'] == diskParams['path']):
- self.conf['devices'].remove(dev)
+ with self._confLock:
+ self.conf['devices'].remove(dev)
diskDev = dev
break
@@ -3813,10 +3814,6 @@
raise LookupError("No such drive: '%s'" % srcDrive.name)
srcDrive.diskReplicate = dstDisk
- self.saveState()
-
- def isDiskReplicationInProgress(self, srcDrive):
- return hasattr(srcDrive, 'diskReplicate')
def _delDiskReplica(self, srcDrive):
"""
@@ -3834,7 +3831,6 @@
raise LookupError("No such drive: '%s'" % srcDrive.name)
del srcDrive.diskReplicate
- self.saveState()
def diskReplicateStart(self, srcDisk, dstDisk):
try:
@@ -3850,7 +3846,6 @@
"destination '%s'" % srcDrive.name, dstDisk)
return errCode['replicaErr']
- self._setDiskReplica(srcDrive, dstDisk)
dstDiskCopy = dstDisk.copy()
# The device entry is enforced because stricly required by
--
To view, visit http://gerrit.ovirt.org/17659
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0eeb53828e1a33e6f0e010f9e17fb2911fda3f45
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr at redhat.com>
More information about the vdsm-patches
mailing list