commit 2383cbb4a518821d245fce316b3778c8ba8e5246
Author: Mark Goddard <email address hidden>
Date: Wed Nov 20 12:01:33 2019 +0000
Fix inactive session error in compute node creation
In the fix for bug 1839560 [1][2], soft-deleted compute nodes may be
restored, to ensure we can reuse ironic node UUIDs as compute node
UUIDs. While this seems to largely work, it results in some nasty errors
being generated [3]:
InvalidRequestError This session is in 'inactive' state, due to the
SQL transaction being rolled back; no further SQL can be emitted
within this transaction.
This happens because compute_node_create is decorated with
pick_context_manager_writer, which begins a transaction. While
_compute_node_get_and_update_deleted claims that calling a second
pick_context_manager_writer decorated function will begin a new
subtransaction, this does not appear to be the case.
This change removes pick_context_manager_writer from the
compute_node_create function, and adds a new _compute_node_create
function which ensures the transaction is finished if
_compute_node_get_and_update_deleted is called.
The new unit test added here fails without this change.
This change marks the removal of the final FIXME from the functional
test added in [4].
Reviewed: https:/ /review. opendev. org/c/openstack /nova/+ /695189 /opendev. org/openstack/ nova/commit/ 2383cbb4a518821 d245fce316b3778 c8ba8e5246
Committed: https:/
Submitter: "Zuul (22348)"
Branch: master
commit 2383cbb4a518821 d245fce316b3778 c8ba8e5246
Author: Mark Goddard <email address hidden>
Date: Wed Nov 20 12:01:33 2019 +0000
Fix inactive session error in compute node creation
In the fix for bug 1839560 [1][2], soft-deleted compute nodes may be
restored, to ensure we can reuse ironic node UUIDs as compute node
UUIDs. While this seems to largely work, it results in some nasty errors
being generated [3]:
SQL transaction being rolled back; no further SQL can be emitted
within this transaction.
This happens because compute_node_create is decorated with context_ manager_ writer, which begins a transaction. While node_get_ and_update_ deleted claims that calling a second context_ manager_ writer decorated function will begin a new
pick_
_compute_
pick_
subtransaction, this does not appear to be the case.
This change removes pick_context_ manager_ writer from the node_create function, and adds a new _compute_ node_create node_get_ and_update_ deleted is called.
compute_
function which ensures the transaction is finished if
_compute_
The new unit test added here fails without this change.
This change marks the removal of the final FIXME from the functional
test added in [4].
[1] https:/ /bugs.launchpad .net/nova/ +bug/1839560 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=89dd74ac7f1 028daadf86cb189 48e27fe9d1d411 paste.openstack .org/show/ 786350/ /review. opendev. org/#/c/ 695012/
[2] https:/
[3] http://
[4] https:/
Change-Id: Iae119ea8776bc7 f2e5dbe2e502a74 3217beded73
Closes-Bug: #1853159
Related-Bug: #1853009