diff options
author | Peter Portante <peter.portante@redhat.com> | 2013-07-15 16:52:46 -0400 |
---|---|---|
committer | Luis Pabon <lpabon@redhat.com> | 2013-08-21 19:38:35 -0700 |
commit | 9d4e67e741f13b4b93620fbb972886e1dc975fee (patch) | |
tree | b6862ed79251d46771f87bbc25791f8e8d1eb29e /gluster/swift/common/fs_utils.py | |
parent | 54bb5bec7a025eecb51f85274ec37dbd0c478758 (diff) |
Updates to support Havana interim version 1.9.1.
The code changes are basically:
* Apply refactoring in the DiskFile class to use the new DiskWriter
abstraction
* Move and rename our diskfile module to match upstream
* ThreadPools allow us to remove the tpool usage around fsync
* Update the Ring subclass to support the get_part() method
* Update to use the 1.9.1 proxy server unit tests
* Move the DebugLogger class to test.unit
* Rebuild the Rings to use the new layout
* Remove backup ring builder files
* Update spec files to 1.9.1, and tox to use swift 1.9.1
* Updated version to 1.9.0-0
Change-Id: Ica12cac8b351627d67500723f1dbd8a54d45f7c8
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Signed-off-by: Luis Pabon <lpabon@redhat.com>
Reviewed-on: http://review.gluster.org/5331
Diffstat (limited to 'gluster/swift/common/fs_utils.py')
-rw-r--r-- | gluster/swift/common/fs_utils.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gluster/swift/common/fs_utils.py b/gluster/swift/common/fs_utils.py index e624da1..b2935d0 100644 --- a/gluster/swift/common/fs_utils.py +++ b/gluster/swift/common/fs_utils.py @@ -19,7 +19,6 @@ import errno import stat import random import os.path as os_path # noqa -from eventlet import tpool from eventlet import sleep from gluster.swift.common.exceptions import FileOrDirNotFoundError, \ NotDirectoryError, GlusterFileSystemOSError, GlusterFileSystemIOError @@ -243,7 +242,7 @@ def do_rename(old_path, new_path): def do_fsync(fd): try: - tpool.execute(os.fsync, fd) + os.fsync(fd) except OSError as err: raise GlusterFileSystemOSError( err.errno, '%s, os.fsync("%s")' % (err.strerror, fd)) |