openstack/cinder
Code Issues Proposed changes

Merge "Return BadRequest for invalid unicode names (continued)"

Browse Source
This commit is contained in:
Jenkins 2016-03-02 12:26:11 +00:00 committed by Gerrit Code Review
commit 4504fdfa75
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/db/sqlalchemy/api.py
View File

@ -690,6 +690,7 @@ def _quota_class_get_all_by_resource(context, resource, session):
return result return result
@handle_db_data_error
@require_admin_context @require_admin_context
def quota_class_create(context, class_name, resource, limit): def quota_class_create(context, class_name, resource, limit):
quota_class_ref = models.QuotaClass() quota_class_ref = models.QuotaClass()
@ -3001,6 +3002,7 @@ def _volume_type_extra_specs_get_item(context, volume_type_id, key,
return result return result
@handle_db_data_error
@require_context @require_context
def volume_type_extra_specs_update_or_create(context, volume_type_id, def volume_type_extra_specs_update_or_create(context, volume_type_id,
specs): specs):
@ -3065,6 +3067,10 @@ def qos_specs_create(context, values):
spec_entry = models.QualityOfServiceSpecs() spec_entry = models.QualityOfServiceSpecs()
spec_entry.update(item) spec_entry.update(item)
spec_entry.save(session=session) spec_entry.save(session=session)
except db_exc.DBDataError:
msg = _('Error writing field to database')
LOG.exception(msg)
raise exception.Invalid(msg)
except Exception as e: except Exception as e:
raise db_exc.DBError(e) raise db_exc.DBError(e)

4
cinder/volume/qos_specs.py
View File

@ -79,6 +79,10 @@ def create(context, name, specs=None):
try: try:
qos_specs_ref = db.qos_specs_create(context, values) qos_specs_ref = db.qos_specs_create(context, values)
except db_exc.DBDataError:
msg = _('Error writing field to database')
LOG.exception(msg)
raise exception.Invalid(msg)
except db_exc.DBError: except db_exc.DBError:
LOG.exception(_LE('DB error:')) LOG.exception(_LE('DB error:'))
raise exception.QoSSpecsCreateFailed(name=name, raise exception.QoSSpecsCreateFailed(name=name,