diff options
| author | Prashanth Pai <ppai@redhat.com> | 2015-11-02 11:55:17 +0530 |
|---|---|---|
| committer | Thiago da Silva <thiago@redhat.com> | 2016-03-07 10:38:49 -0800 |
| commit | ea4750a366123f78411d90082733642376dc6afc (patch) | |
| tree | 5124b5a407791afcd2dd1cfef00a3959cbb26033 /gluster/swift/common/Glusterfs.py | |
| parent | c5d76cdd2e2e99d4ac65b645b17cf8a43e4ccab4 (diff) | |
Rebase to stable/kilo
This change ports most of swiftonfile object server fixes and changes
into gluster-swift. Storage policy as a feature is not usable here
(it doesn't make sense).
The hacky way of creating zero byte tracker objects for object
expiration has not been ported to this release due to scalability
issues and the need to have a separate volume.
Change-Id: I17ba27dacea9ac000bdb8934700996e4d17f4251
Signed-off-by: Prashanth Pai <ppai@redhat.com>
Reviewed-on: http://review.gluster.org/13269
Reviewed-by: Thiago da Silva <thiago@redhat.com>
Tested-by: Thiago da Silva <thiago@redhat.com>
Diffstat (limited to 'gluster/swift/common/Glusterfs.py')
| -rw-r--r-- | gluster/swift/common/Glusterfs.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gluster/swift/common/Glusterfs.py b/gluster/swift/common/Glusterfs.py index 6a2fdb2..910f752 100644 --- a/gluster/swift/common/Glusterfs.py +++ b/gluster/swift/common/Glusterfs.py @@ -148,7 +148,7 @@ def _get_unique_id(): # own the lock. continue raise - except: + except Exception: os.close(fd) raise else: |