Exceptions in prepare_for_replace/restore_prev_rsrc are not caught

[Zane Bitter]

Bug 1509977 describes an issue where an exception occurs in the prepare_for_replace() handler of a resource type. This exception does not get caught anywhere, with the result that the stack gets stuck in the UPDATE_IN_PROGRESS state. The bug report points out that once bug 1492433 is fixed, the exception will be caught by the stack and therefore it will not get stuck.

This is, however, insufficient. The exception should be caught by the Resource so that the failure is recorded as a failure of that particular resource, and the resource is put into the FAILED state. The code is currently structured so that there is no exception handling at all around this method call.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/241084

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/241084
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=96f7c545ee069debcc22f25770aa0c351ec0ee7c
Submitter: Jenkins
Branch: master

commit 96f7c545ee069debcc22f25770aa0c351ec0ee7c
Author: huangtianhua <email address hidden>
Date: Tue Nov 3 11:59:17 2015 +0800

    Catch exceptions for restore_prev_rsrc/prepare_for_replace

    Catch exceptions when calling restore_prev_rsrc or
    prepare_for_replace, to make sure the failure will be
    recorded and the resource will put into FAILED state.

    Change-Id: If65953d6b8cbdc135d898119c0f43a133f2e1892
    Closes-Bug: #1512496

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/243428

[Zane Bitter (zaneb)]

There is no Kilo backport potential because these methods did not exist in Kilo.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/243428
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=04f57ac4a45fdd04c341e6a582279c0eb66e2c78
Submitter: Jenkins
Branch: stable/liberty

commit 04f57ac4a45fdd04c341e6a582279c0eb66e2c78
Author: huangtianhua <email address hidden>
Date: Tue Nov 3 11:59:17 2015 +0800

    Catch exceptions for restore_prev_rsrc/prepare_for_replace

    Catch exceptions when calling restore_prev_rsrc or
    prepare_for_replace, to make sure the failure will be
    recorded and the resource will put into FAILED state.

    Closes-Bug: #1512496
    (cherry picked from commit 96f7c545ee069debcc22f25770aa0c351ec0ee7c)

    Conflicts:
     heat/engine/resource.py
     heat/tests/test_resource.py

    Change-Id: If65953d6b8cbdc135d898119c0f43a133f2e1892

[Thierry Carrez (ttx)]

This issue was fixed in the openstack/heat 6.0.0.0b1 development milestone.

[Doug Hellmann (doug-hellmann)]

This issue was fixed in the openstack/heat 5.0.1 release.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/325792

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/325792
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=3bdd2cb95a602582b718eddcfea16ad83e0ff198
Submitter: Jenkins
Branch: master

commit 3bdd2cb95a602582b718eddcfea16ad83e0ff198
Author: Anant Patil <email address hidden>
Date: Mon Jun 6 14:51:13 2016 +0530

    Convergence: Catch exceptions in restore_prev_rsrc

    Handle exceptions thrown in restore_prev_rsrc.

    Change-Id: I047ff6c3acd8d34ea2540f9ba2fbf076a9d6d55c
    Closes-Bug: #1512496

[Doug Hellmann (doug-hellmann)]

This issue was fixed in the openstack/heat 7.0.0.0b2 development milestone.