diff --git a/swiftonhpss/swift/obj/server.py b/swiftonhpss/swift/obj/server.py index 6e860c9..2bcedea 100644 --- a/swiftonhpss/swift/obj/server.py +++ b/swiftonhpss/swift/obj/server.py @@ -25,8 +25,6 @@ except ImportError: import swiftonhpss.swift.common.hpssfs_ioctl as hpssfs import time -import eventlet - from hashlib import md5 from swift.common.swob import HTTPConflict, HTTPBadRequest, HeaderKeyDict, \ HTTPInsufficientStorage, HTTPPreconditionFailed, HTTPRequestTimeout, \ @@ -392,14 +390,12 @@ class ObjectController(server.ObjectController): hpss_headers = disk_file.read_hpss_system_metadata() response.headers.update(hpss_headers) except SwiftOnFileSystemIOError: - disk_file._close_fd() return HTTPServiceUnavailable(request=request) if 'X-Object-Sysmeta-Update-Container' in response.headers: self._sof_container_update(request, response) response.headers.pop('X-Object-Sysmeta-Update-Container') - disk_file._close_fd() return response @public @@ -413,9 +409,6 @@ class ObjectController(server.ObjectController): 'X-Storage-Token' not in request.headers ) - if 'X-Debug-Stop' in request.headers: - raise eventlet.StopServe() - # Get Diskfile try: disk_file = self.get_diskfile(device, partition, account, @@ -469,7 +462,6 @@ class ObjectController(server.ObjectController): return HTTPServiceUnavailable(request=request) return request.get_response(response) except (DiskFileNotExist, DiskFileQuarantined) as e: - disk_file._close_fd() headers = {} if hasattr(e, 'timestamp'): headers['X-Backend-Timestamp'] = e.timestamp.internal