9:22 a.m.
New patch submitted by Yotam Oron (yoron(a)redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/858
commit aaff596ebf15d43be91d2e87ead6b9b6664c575a
Author: Yotam Oron <yoron(a)redhat.com>
Date: Sun Aug 28 17:23:02 2011 +0300
BZ#733910 - Clean links in directories in __cleanStorageRepository
os.walk() sees links to directories as directories, so the code
tries to delete the links with rmdir(), fails, and then the consequent
rmdir() of the parent dir also fails since the directory is not empty.
Instead of rmdir(), unlink() a link.
Change-Id: I0bd54dcca2b73f0f371aae4d6952a0da137c25db
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index f83316c..7975a72 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -277,7 +277,11 @@ class HSM:
for directory in rmDirList:
try:
- os.rmdir(directory)
+ # os.walk() can see a link to a directory as a directory
+ if os.path.islink(directory):
+ os.unlink(directory)
+ else:
+ os.rmdir(directory)
except Exception, ex:
self.log.warn("Could not delete dir '%s' (%s: %s)." %
(fullPath, ex.__class__.__name__, str(ex)))
10:15 a.m.
New subject: Change in vdsm[master]: BZ#733910 - Clean links in directories in __cleanStorageRepo...
Dan Kenigsberg has posted comments on this change.
Change subject: BZ#733910 - Clean links in directories in __cleanStorageRepository
......................................................................
Patch Set 1: Looks good to me, approved
--
To view, visit http://gerrit.usersys.redhat.com/858
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0bd54dcca2b73f0f371aae4d6952a0da137c25db
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yotam Oron <yoron(a)redhat.com>
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Eduardo Warszawski <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Yotam Oron <yoron(a)redhat.com>
10:17 a.m.
New subject: Change in vdsm[master]: BZ#733910 - Clean links in directories in __cleanStorageRepo...
Dan Kenigsberg has submitted this change and it was merged.
Change subject: BZ#733910 - Clean links in directories in __cleanStorageRepository
......................................................................
BZ#733910 - Clean links in directories in __cleanStorageRepository
os.walk() sees links to directories as directories, so the code
tries to delete the links with rmdir(), fails, and then the consequent
rmdir() of the parent dir also fails since the directory is not empty.
Instead of rmdir(), unlink() a link.
Change-Id: I0bd54dcca2b73f0f371aae4d6952a0da137c25db
---
M vdsm/storage/hsm.py
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Dan Kenigsberg: Verified; Looks good to me, approved
--
To view, visit http://gerrit.usersys.redhat.com/858
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0bd54dcca2b73f0f371aae4d6952a0da137c25db
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yotam Oron <yoron(a)redhat.com>
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Eduardo Warszawski <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Yotam Oron <yoron(a)redhat.com>
10:17 a.m.
New subject: Change in vdsm[master]: BZ#733910 - Clean links in directories in __cleanStorageRepo...
Dan Kenigsberg has posted comments on this change.
Change subject: BZ#733910 - Clean links in directories in __cleanStorageRepository
......................................................................
Patch Set 2: Verified; Looks good to me, approved
copying score
--
To view, visit http://gerrit.usersys.redhat.com/858
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0bd54dcca2b73f0f371aae4d6952a0da137c25db
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yotam Oron <yoron(a)redhat.com>
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Eduardo Warszawski <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Yotam Oron <yoron(a)redhat.com>
9:01 a.m.
New subject: Change in vdsm[master]: BZ#733910 - Clean links in directories in __cleanStorageRepo...
Yotam Oron has posted comments on this change.
Change subject: BZ#733910 - Clean links in directories in __cleanStorageRepository
......................................................................
Patch Set 1: Verified
--
To view, visit http://gerrit.usersys.redhat.com/858
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0bd54dcca2b73f0f371aae4d6952a0da137c25db
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yotam Oron <yoron(a)redhat.com>
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Eduardo Warszawski <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Yotam Oron <yoron(a)redhat.com>
5:54 p.m.
New subject: Change in vdsm[master]: BZ#733910 - Clean links in directories in __cleanStorageRepo...
Dan Kenigsberg has posted comments on this change.
Change subject: BZ#733910 - Clean links in directories in __cleanStorageRepository
......................................................................
Patch Set 1: Looks good to me, but someone else must approve
--
To view, visit http://gerrit.usersys.redhat.com/858
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0bd54dcca2b73f0f371aae4d6952a0da137c25db
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yotam Oron <yoron(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
4615
days inactive
4623
days old
vdsm-patches@lists.fedorahosted.org
5 comments
2 participants
participants (2)
-
Dan Kenigsberg -
Yotam Oron