Comment 17 for bug 1627694

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to nova (stable/ocata)

Reviewed: https://review.openstack.org/548622
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=01c4230c3b821bf1b5c46c0157974ae84d66d6e2
Submitter: Zuul
Branch: stable/ocata

commit 01c4230c3b821bf1b5c46c0157974ae84d66d6e2
Author: Shoham Peller <email address hidden>
Date: Tue Sep 27 20:25:05 2016 +0300

    Handle spawning error on unshelving

    If spawning fails when unshelving, terminate the volumes' connections
    with the node, and remove the node reference from the instance entry.

    Co-Authored-By: Matt Riedemann <email address hidden>

    Conflicts:
          nova/compute/manager.py
          nova/tests/unit/compute/test_shelve.py

    NOTE(mriedem): Conflicts are due to the following changes not in Ocata:

      I2394b0588bc7210efd16456af2fc12dc7071681c

      Id2c7b7b3b4abda8a3b878fdee6806bcfe096e12e

      I3a3caa4c566ecc132aa2699f8c7e5987bbcc863a

    Closes-Bug: 1627694
    Change-Id: I8cfb2280d956d452ccad1fc711bd814b7258147f
    (cherry picked from commit dcdd2c9832c7c60fe9163cd744ca2b5acfe16bcc)
    (cherry picked from commit 73c3e4969c108f2eefc77b57021d9b3e17afdc8e)
    (cherry picked from commit 06946b7f8ad310e01eff895362ad0f3a164636f5)