Merge "Refactor finalize_put as an object method"

openstack/swift

Code Issues Proposed changes

Browse Source

This commit is contained in:

Jenkins

2013年09月06日 21:38:56 +00:00

committed by Gerrit Code Review

parent e133a26760 9cdee330fb

commit 8a255a3415

1 changed files with 21 additions and 20 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

41
swift/obj/diskfile.py

View File

@@ -307,6 +307,24 @@ class DiskWriter(object):

drop_buffer_cache(self.fd, self.last_sync, diff)

self.last_sync = self.upload_size

def _finalize_put(self, metadata, target_path):

# Write the metadata before calling fsync() so that both data and

# metadata are flushed to disk.

write_metadata(self.fd, metadata)

# We call fsync() before calling drop_cache() to lower the amount

# of redundant work the drop cache code will perform on the pages

# (now that after fsync the pages will be all clean).

fsync(self.fd)

# From the Department of the Redundancy Department, make sure

# we call drop_cache() after fsync() to avoid redundant work

# (pages all clean).

drop_buffer_cache(self.fd, 0, self.upload_size)

invalidate_hash(dirname(self.disk_file.datadir))

# After the rename completes, this object will be available for

# other requests to reference.

renamer(self.tmppath, target_path)

hash_cleanup_listdir(self.disk_file.datadir)

def put(self, metadata, extension='.data'):

"""

Finalize writing the file on disk, and renames it from the temp file

@@ -320,27 +338,10 @@ class DiskWriter(object):

raise ValueError("tmppath is unusable.")

timestamp = normalize_timestamp(metadata['X-Timestamp'])

metadata['name'] = self.disk_file.name

target_path = join(self.disk_file.datadir, timestamp + extension)

def finalize_put():