andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

object-storage: do not list directory for delete

Browse Source 
Do not list the entire directory contents of the directory containing the file
before deleting it. We have already verified the files existence constructing
the Gluster_DiskFile object.

This fixes a customer issue. See 885281
(https://bugzilla.redhat.com/show_bug.cgi?id=885281).

Change-Id: I4425c42af3e03624370c779d74b7f073e6eef024
BUG: 885281
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/4302
Reviewed-by: Mohammed Junaid <junaid@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
This commit is contained in:
Peter Portante 2012-12-12 09:51:40 -05:00 committed by Vijay Bellur
parent 1338ad168a
commit 10ef8ef65a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ufo/gluster/swift/common/DiskFile.py
View File

@ -251,16 +251,17 @@ class Gluster_DiskFile(DiskFile):
if not self.metadata or self.metadata['X-Timestamp'] >= timestamp:
return
assert self.data_file, \
"Have metadata, %r, but no data_file" % self.metadata
if self._is_dir:
# Marker directory object
if not rmdirs(self.data_file):
logging.error('Unable to delete dir object: %s' % self.data_file)
logging.error('Unable to delete dir object: %s', self.data_file)
return
else:
# File object
for fname in do_listdir(self.datadir):
if os.path.join(self.datadir, fname) == self.data_file:
do_unlink(self.data_file)
do_unlink(self.data_file)
self.metadata = {}
self.data_file = None