11:20 a.m.
Yeela Kaplan has uploaded a new change for review.
Change subject: Rename lease files on v3 file SDs when renaming data and meta files
......................................................................
Rename lease files on v3 file SDs when renaming data and meta files
Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=886842
Signed-off-by: Yeela Kaplan <ykaplan(a)redhat.com>
---
M vdsm/storage/fileVolume.py
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/10208/1
diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py
index 2aab4d4..60fbcb0 100644
--- a/vdsm/storage/fileVolume.py
+++ b/vdsm/storage/fileVolume.py
@@ -490,6 +490,8 @@
volPath = os.path.join(self.imagePath, newUUID)
metaPath = self._getMetaVolumePath(volPath)
prevMetaPath = self._getMetaVolumePath()
+ leasePath = self._getLeaseVolumePath(volPath)
+ prevLeasePath = self._getLeaseVolumePath()
if recovery:
name = "Rename volume rollback: " + volPath
@@ -505,6 +507,11 @@
"renameVolumeRollback",
[metaPath, prevMetaPath]))
self.oop.os.rename(prevMetaPath, metaPath)
+ try:
+ self.oop.os.rename(prevLeasePath, leasePath)
+ except OSError, e:
+ if e.errno != os.errno.ENOENT:
+ raise
self.volUUID = newUUID
self.volumePath = volPath
--
To view, visit http://gerrit.ovirt.org/10208
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>
7:12 a.m.
Dan Kenigsberg has posted comments on this change.
Change subject: Rename lease files on v3 file SDs when renaming data and meta files
......................................................................
Patch Set 2: (1 inline comment)
....................................................
File vdsm/storage/fileVolume.py
Line 514:
"renameVolumeRollback",
Line 515: [leasePath, prevLeasePath]))
Line 516: try:
Line 517: self.oop.os.rename(prevLeasePath, leasePath)
Line 518: except OSError, e:
I find it odd that you do not even log the ENOENT case, but let's trust you and your
reviewers.
Line 519: if e.errno != os.errno.ENOENT:
Line 520: raise
Line 521: self.volUUID = newUUID
Line 522: self.volumePath = volPath
--
To view, visit http://gerrit.ovirt.org/10208
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
3:39 a.m.
Yeela Kaplan has posted comments on this change.
Change subject: Rename lease files on v3 file SDs when renaming data and meta files
......................................................................
Patch Set 2: Verified
Verified on v3 file storage domain
--
To view, visit http://gerrit.ovirt.org/10208
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>
Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
6:15 a.m.
Federico Simoncelli has posted comments on this change.
Change subject: Rename lease files on v3 file SDs when renaming data and meta files
......................................................................
Patch Set 2: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/10208
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>
Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
5:15 a.m.
Ayal Baron has posted comments on this change.
Change subject: Rename lease files on v3 file SDs when renaming data and meta files
......................................................................
Patch Set 2: Looks good to me, but someone else must approve
--
To view, visit http://gerrit.ovirt.org/10208
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>
Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
7:03 a.m.
Eduardo has posted comments on this change.
Change subject: Rename lease files on v3 file SDs when renaming data and meta files
......................................................................
Patch Set 1: (1 inline comment)
....................................................
File vdsm/storage/fileVolume.py
Line 505: vars.task.pushRecovery(task.Recovery(name, "fileVolume",
Line 506: "FileVolume",
Line 507:
"renameVolumeRollback",
Line 508: [metaPath, prevMetaPath]))
Line 509: self.oop.os.rename(prevMetaPath, metaPath)
Will be better to remove all this "rollback" at all.
Is highly probable that will fail or leave the image in an arbitrary illegal state.
Line 510: try:
Line 511: self.oop.os.rename(prevLeasePath, leasePath)
Line 512: except OSError, e:
Line 513: if e.errno != os.errno.ENOENT:
--
To view, visit http://gerrit.ovirt.org/10208
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>
Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
4:39 a.m.
Federico Simoncelli has posted comments on this change.
Change subject: Rename lease files on v3 file SDs when renaming data and meta files
......................................................................
Patch Set 1: No score
(1 inline comment)
....................................................
File vdsm/storage/fileVolume.py
Line 505: vars.task.pushRecovery(task.Recovery(name, "fileVolume",
Line 506: "FileVolume",
Line 507:
"renameVolumeRollback",
Line 508: [metaPath, prevMetaPath]))
Line 509: self.oop.os.rename(prevMetaPath, metaPath)
Don't we need a rollback for the lease file too?
Line 510: try:
Line 511: self.oop.os.rename(prevLeasePath, leasePath)
Line 512: except OSError, e:
Line 513: if e.errno != os.errno.ENOENT:
--
To view, visit http://gerrit.ovirt.org/10208
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>
Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
4:36 a.m.
Federico Simoncelli has posted comments on this change.
Change subject: Rename lease files on v3 file SDs when renaming data and meta files
......................................................................
Patch Set 1: Looks good to me, approved
(1 inline comment)
....................................................
Commit Message
Line 3: AuthorDate: 2012-12-18 18:42:47 +0200
Line 4: Commit: Yeela Kaplan <ykaplan(a)redhat.com>
Line 5: CommitDate: 2012-12-18 18:42:47 +0200
Line 6:
Line 7: Rename lease files on v3 file SDs when renaming data and meta files
The subject is not in the suggested/preferred form.
Line 8:
Line 9: Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Line 10: Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=886842
--
To view, visit http://gerrit.ovirt.org/10208
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>
Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11:55 a.m.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Rename lease files on v3 file SDs when renaming data and meta files
......................................................................
Patch Set 1:
Build Successful
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/421/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/456/ : SUCCESS
--
To view, visit http://gerrit.ovirt.org/10208
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>
Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11:52 a.m.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Rename lease files on v3 file SDs when renaming data and meta files
......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/456/ (2/2)
--
To view, visit http://gerrit.ovirt.org/10208
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>
Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11:23 a.m.
Yeela Kaplan has posted comments on this change.
Change subject: Rename lease files on v3 file SDs when renaming data and meta files
......................................................................
Patch Set 1: Verified
Verified on v3 file storage domain
--
To view, visit http://gerrit.ovirt.org/10208
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>
Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
7:12 a.m.
Dan Kenigsberg has submitted this change and it was merged.
Change subject: Rename lease files on v3 file SDs when renaming data and meta files
......................................................................
Rename lease files on v3 file SDs when renaming data and meta files
Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=886842
Signed-off-by: Yeela Kaplan <ykaplan(a)redhat.com>
---
M vdsm/storage/fileVolume.py
1 file changed, 13 insertions(+), 0 deletions(-)
Approvals:
Ayal Baron: Looks good to me, but someone else must approve
Yeela Kaplan: Verified
Federico Simoncelli: Looks good to me, approved
Dan Kenigsberg:
--
To view, visit http://gerrit.ovirt.org/10208
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11:20 a.m.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Rename lease files on v3 file SDs when renaming data and meta files
......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/421/ (1/2)
--
To view, visit http://gerrit.ovirt.org/10208
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
4138
days inactive
4152
days old
vdsm-patches@lists.fedorahosted.org
12 comments
6 participants
participants (6)
-
abaron＠redhat.com -
Dan Kenigsberg -
ewarszaw＠redhat.com -
Federico Simoncelli -
Jenkins CI RO -
ykaplan＠redhat.com