diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-30 18:35:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-30 18:35:36 +0000 |
| commit | cb6439462877a5cc4e9063c5f960e427c3c737d2 (patch) | |
| tree | c480f76abc78a8704ffffe6e4eb7085c6708d62f | |
| parent | c71f0e3165c42d0b9e9d31b28a8db0dedf6f63f8 (diff) | |
| parent | d26ed3aee130646be0e042f29f3af64f1d73608e (diff) | |
| download | nova-cb6439462877a5cc4e9063c5f960e427c3c737d2.tar.gz nova-cb6439462877a5cc4e9063c5f960e427c3c737d2.tar.xz nova-cb6439462877a5cc4e9063c5f960e427c3c737d2.zip | |
Merge "Fix reservation_commit so it works w/ PostgreSQL."
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index fa10356a6..b956ea606 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -465,9 +465,11 @@ class Reservation(BASE, NovaBase): uuid = Column(String(36), nullable=False) usage_id = Column(Integer, ForeignKey('quota_usages.id'), nullable=False) + # NOTE(dprince): Force innerjoin below for lockmode update on PostgreSQL usage = relationship(QuotaUsage, backref=backref('reservations'), foreign_keys=usage_id, + innerjoin=True, primaryjoin='and_(' 'Reservation.usage_id == QuotaUsage.id,' 'Reservation.deleted == False)') |