openstack/placement
Code Issues Proposed changes

Merge "Add provider UUID to reshaper gen conflict error"

Browse Source
This commit is contained in:
Zuul
2019-01-21 16:50:10 +00:00
committed by Gerrit Code Review
parent 961f79dc00 a5c1049bde
commit 24d97d0f60
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
placement/handlers/reshaper.py
View File

@@ -66,9 +66,10 @@ def reshape(req):
generation = inventory_data['resource_provider_generation'] generation = inventory_data['resource_provider_generation']
if generation != resource_provider.generation: if generation != resource_provider.generation:
raise webob.exc.HTTPConflict( raise webob.exc.HTTPConflict(
_('resource provider generation conflict: ' _('resource provider generation conflict for provider %(rp)s: '
'actual: %(actual)s, given: %(given)s') % 'actual: %(actual)s, given: %(given)s') %
{'actual': resource_provider.generation, {'rp': rp_uuid,
'actual': resource_provider.generation,
'given': generation}, 'given': generation},
comment=errors.CONCURRENT_UPDATE) comment=errors.CONCURRENT_UPDATE)