openstack
/
manila
Code Issues Proposed changes

Fixes inappropriate size of metadata value 

Fixes bug 1258079

Change-Id: If1ab03eafbb2c6fb5be77a83781dce533f253175
This commit is contained in:
Andrei V. Ostapenko 2013-12-05 12:03:55 +02:00
parent 3e7de88830
commit dd017220fb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manila/db/sqlalchemy/migrate_repo/versions/006_add_share_metadata.py
View File

@ -38,7 +38,7 @@ def upgrade(migrate_engine):
Column('share_id', String(length=36), ForeignKey('shares.id'),
nullable=False),
Column('key', String(length=255), nullable=False),
Column('value', String(length=1024), nullable=False),
Column('value', String(length=1023), nullable=False),
mysql_engine='InnoDB',
mysql_charset='utf8'
)

2
manila/db/sqlalchemy/models.py
View File

@ -262,7 +262,7 @@ class ShareMetadata(BASE, ManilaBase):
__tablename__ = 'share_metadata'
id = Column(Integer, primary_key=True)
key = Column(String(255), nullable=False)
value = Column(String(1024), nullable=False)
value = Column(String(1023), nullable=False)
share_id = Column(String(36), ForeignKey('shares.id'), nullable=False)
share = relationship(Share, backref="share_metadata",
foreign_keys=share_id,

4
manila/share/api.py
View File

@ -452,9 +452,9 @@ class API(base.Base):
msg = _("Metadata property key is greater than 255 characters")
LOG.warn(msg)
raise exception.InvalidShareMetadataSize(message=msg)
if len(v) > 1024:
if len(v) > 1023:
msg = _("Metadata property value is "
"greater than 1024 characters")
"greater than 1023 characters")
LOG.warn(msg)
raise exception.InvalidShareMetadataSize(message=msg)