openstack/swift
Code Issues Proposed changes

Merge "copy: Stop hanging per-request data on middleware instance"

Browse Source
This commit is contained in:
Zuul
2018-06-05 05:38:36 +00:00
committed by Gerrit Code Review
parent ec066392b5 9ef2a82816
commit aee13b0e40
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
swift/common/middleware/copy.py
View File

@@ -248,10 +248,6 @@ class ServerSideCopyMiddleware(object):
# If obj component is not present in req, do not proceed further. # If obj component is not present in req, do not proceed further.
return self.app(env, start_response) return self.app(env, start_response)
self.account_name = account
self.container_name = container
self.object_name = obj
try: try:
# In some cases, save off original request method since it gets # In some cases, save off original request method since it gets
# mutated into PUT during handling. This way logging can display # mutated into PUT during handling. This way logging can display
@@ -260,7 +256,8 @@ class ServerSideCopyMiddleware(object):
return self.handle_PUT(req, start_response) return self.handle_PUT(req, start_response)
elif req.method == 'COPY': elif req.method == 'COPY':
req.environ['swift.orig_req_method'] = req.method req.environ['swift.orig_req_method'] = req.method
return self.handle_COPY(req, start_response) return self.handle_COPY(req, start_response,
account, container, obj)
elif req.method == 'OPTIONS': elif req.method == 'OPTIONS':
# Does not interfere with OPTIONS response from # Does not interfere with OPTIONS response from
# (account,container) servers and /info response. # (account,container) servers and /info response.
@@ -271,22 +268,22 @@ class ServerSideCopyMiddleware(object):
return self.app(env, start_response) return self.app(env, start_response)
def handle_COPY(self, req, start_response): def handle_COPY(self, req, start_response, account, container, obj):
if not req.headers.get('Destination'): if not req.headers.get('Destination'):
return HTTPPreconditionFailed(request=req, return HTTPPreconditionFailed(request=req,
body='Destination header required' body='Destination header required'
)(req.environ, start_response) )(req.environ, start_response)
dest_account = self.account_name dest_account = account
if 'Destination-Account' in req.headers: if 'Destination-Account' in req.headers:
dest_account = req.headers.get('Destination-Account') dest_account = req.headers.get('Destination-Account')
dest_account = check_account_format(req, dest_account) dest_account = check_account_format(req, dest_account)
req.headers['X-Copy-From-Account'] = self.account_name req.headers['X-Copy-From-Account'] = account
self.account_name = dest_account account = dest_account
del req.headers['Destination-Account'] del req.headers['Destination-Account']
dest_container, dest_object = _check_destination_header(req) dest_container, dest_object = _check_destination_header(req)
source = '/%s/%s' % (self.container_name, self.object_name) source = '/%s/%s' % (container, obj)
self.container_name = dest_container container = dest_container
self.object_name = dest_object obj = dest_object
# re-write the existing request as a PUT instead of creating a new one # re-write the existing request as a PUT instead of creating a new one
req.method = 'PUT' req.method = 'PUT'
# As this the path info is updated with destination container, # As this the path info is updated with destination container,