x/swiftonhpss
Code Issues Proposed changes

Clean up debugging cruft

Browse Source 
In the process of working on SwiftOnFile, there was a bunch of
unwanted debugging messages and cruft just to trace dataflow.
I don't think this should be in the release build, so cleaning
it up now.

Change-Id: I7fdb1de48cb97ec7e1629102d032f722210675fc
This commit is contained in:
Phil Bridges 2016-06-08 16:35:57 -05:00
parent 3c7bcc0c7a
commit de609374f7
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swiftonhpss/swift/obj/server.py
View File

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