openstack/cinder
Code Issues Proposed changes

Merge "Serialize message_* properties of RequestContext"

Browse Source
This commit is contained in:
Zuul 2022-08-29 13:58:37 +00:00 committed by Gerrit Code Review
commit 326993bf1d
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cinder/context.py
View File

@ -93,6 +93,9 @@ class RequestContext(context.RequestContext):
quota_class=None, quota_class=None,
service_catalog: Optional[dict] = None, service_catalog: Optional[dict] = None,
user_auth_plugin=None, user_auth_plugin=None,
message_resource_id = None,
message_resource_type = None,
message_action = None,
**kwargs): **kwargs):
"""Initialize RequestContext. """Initialize RequestContext.
@ -119,9 +122,9 @@ class RequestContext(context.RequestContext):
timestamp = timeutils.parse_isotime(timestamp) timestamp = timeutils.parse_isotime(timestamp)
self.timestamp = timestamp self.timestamp = timestamp
self.quota_class = quota_class self.quota_class = quota_class
self.message_resource_id = None self.message_resource_id = message_resource_id
self.message_resource_type = None self.message_resource_type = message_resource_type
self.message_action = None self.message_action = message_action
if service_catalog: if service_catalog:
# Only include required parts of service_catalog # Only include required parts of service_catalog
@ -176,6 +179,9 @@ class RequestContext(context.RequestContext):
result['quota_class'] = self.quota_class result['quota_class'] = self.quota_class
result['service_catalog'] = self.service_catalog result['service_catalog'] = self.service_catalog
result['request_id'] = self.request_id result['request_id'] = self.request_id
result['message_resource_id'] = self.message_resource_id
result['message_resource_type'] = self.message_resource_type
result['message_action'] = self.message_action
return result return result
@classmethod @classmethod
@ -196,6 +202,9 @@ class RequestContext(context.RequestContext):
auth_token=values.get('auth_token'), auth_token=values.get('auth_token'),
user_domain_id=values.get('user_domain_id'), user_domain_id=values.get('user_domain_id'),
project_domain_id=values.get('project_domain_id'), project_domain_id=values.get('project_domain_id'),
message_resource_id = values.get('message_resource_id'),
message_resource_type = values.get('message_resource_type'),
message_action = values.get('message_action')
) )
def authorize(self, def authorize(self,

8
releasenotes/notes/bug-1978729-cinder-backup-4cd87c4d71b7713e.yaml Normal file
View File

@ -0,0 +1,8 @@
---
fixes:
- |
`Bug #1978729 <https://bugs.launchpad.net/cinder/+bug/1978729>`_: Fixed
context.message_action is None on errors by backup drivers. The message_*
properties of the context were not passed during rpc, which caused a double
exception when a backup driver raised an exception, masking the actual backup
driver exception.