Attachment 716666 Details for Bug 923228 – This patch works-around this bug, now fixes a delete problem.

[patch] This patch works-around this bug, now fixes a delete problem.

bug-923228.patch (text/plain), 1.13 KB, created by Alex Wheeler on 2013-03-26 18:25:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Wheeler

Created: 2013-03-26 18:25:08 UTC

Size: 1.13 KB

patch

obsolete

>--- DiskFile.py	2013-03-26 18:20:19.345043088 +0000
>+++ /root/rpmbuild/BUILD/glusterfs-3git/ufo/gluster/swift/common/DiskFile.py	2013-03-26 15:32:16.000000000 +0000
>@@ -190,7 +190,7 @@
>         self.metadata = metadata
>         self.filter_metadata()
> 
>-    def put(self, fd, tmppath, metadata, extension='.data'):
>+    def put(self, fd, metadata, extension='.data'):
>         """
>         Finalize writing the file on disk, and renames it from the temp file to
>         the real location.  This should be called after the data has been
>@@ -202,9 +202,6 @@
>         """
>         # Our caller will use '.data' here; we just ignore it since we map the
>         # URL directly to the file system.
>-        if extension == '.ts':
>-            # TombStone marker (deleted)
>-            return True
>         extension = ''
> 
>         metadata = _adjust_metadata(metadata)
>@@ -327,7 +324,7 @@
>         self.tmppath = os.path.join(self.datadir, tmpfile)
>         fd = do_open(self.tmppath, os.O_RDWR | os.O_CREAT | os.O_EXCL)
>         try:
>-            yield fd, self.tmppath
>+            yield fd
>         finally:
>             try:
>                 do_close(fd)

Actions: View | Diff

Attachments on bug 923228: 716665 | 716666 | 716667