diff options
author | Riccardo Pittau <elfosardo@gmail.com> | 2019-06-18 17:32:21 +0200 |
---|---|---|
committer | Riccardo Pittau <elfosardo@gmail.com> | 2019-06-18 17:39:09 +0200 |
commit | 06dd82bd30f73ee93cca6b3861ff9ea75f0bc10d (patch) | |
tree | d793a5620ab88ec8019ce39db539d192836b31ff | |
parent | 88f26ae6feacb701d231c7f0ae719475c6ca6a0c (diff) | |
download | ironic-06dd82bd30f73ee93cca6b3861ff9ea75f0bc10d.tar.gz |
Replace deprecated with_lockmode with with_for_update
The Query.with_lockmode() method is deprecated since version 0.9.0
and will be removed in a future release. [1]
This patch replaces it with Query.with_for_update().
[1] https://docs.sqlalchemy.org/en/13/orm/query.html#sqlalchemy.orm.query.Query.with_lockmode
Change-Id: I2d4c6a108eb0fee0bd5b0a20f2f508727b44e887
-rw-r--r-- | ironic/db/sqlalchemy/api.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ironic/db/sqlalchemy/api.py b/ironic/db/sqlalchemy/api.py index 6d019a595..eee192c43 100644 --- a/ironic/db/sqlalchemy/api.py +++ b/ironic/db/sqlalchemy/api.py @@ -632,7 +632,7 @@ class Connection(api.Connection): query = model_query(models.Node) query = add_identity_filter(query, node_id) try: - ref = query.with_lockmode('update').one() + ref = query.with_for_update().one() except NoResultFound: raise exception.NodeNotFound(node=node_id) @@ -1760,7 +1760,7 @@ class Connection(api.Connection): if values.get('node_id') and update_node: node = model_query(models.Node, session=session).filter_by( - id=ref.node_id).with_lockmode('update').one() + id=ref.node_id).with_for_update().one() node_uuid = node.uuid if node.instance_uuid and node.instance_uuid != ref.uuid: raise exception.NodeAssociated( @@ -1933,7 +1933,7 @@ class Connection(api.Connection): query = model_query(models.DeployTemplate) query = add_identity_filter(query, template_id) try: - ref = query.with_lockmode('update').one() + ref = query.with_for_update().one() except NoResultFound: raise exception.DeployTemplateNotFound( template=template_id) |