stacks still hung in IN_PROGRESS when error happen

[huangtianhua]

The change Ic948c2fe5baf23c9c4ced33060f672ca9c278a19 "Ensure that stacks can't get stuck IN_PROGRESS"(bug #1492433), when anything wrong happen, if the stack is in IN_PROGRESS, which wants to reset the stack to FAILED, but there are several errors of the "finally" code, such as:

finally:
            if stack.state == stack.IN_PROGRESS: -----should be : if stack.status == stack.IN_PROGRESS
                stack.set_state(stack.action, stack.FAILED, errmsg) ------should be: stack.state_set(stack.action, stack.FAILED, errmsg)
                assert errmsg is not None, "Returned while IN_PROGRESS"

let's fix them. And also I will backport to kilo and liberty.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/252243
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=63141b20bcb5fe0b7941a6d8578936e42c485242
Submitter: Jenkins
Branch: master

commit 63141b20bcb5fe0b7941a6d8578936e42c485242
Author: huangtianhua <email address hidden>
Date: Wed Dec 2 16:02:41 2015 +0800

    Correct reset_state_on_error() handling

    The change Ic948c2fe5baf23c9c4ced33060f672ca9c278a19 aim
    to prevent the stacks hanging in IN_PROGRESS, but the code
    is incorrect, this patch fix them.

    Change-Id: I0e9655b5a931452d810c38b7ddf6a2ce742bb7ed
    Closes-Bug: #1521881
    Related-Bug: #1492433

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/kilo
Review: https://review.openstack.org/253390

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/253390
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=5f8c16887455b6228ca8eec4a600c06c696fb334
Submitter: Jenkins
Branch: stable/kilo

commit 5f8c16887455b6228ca8eec4a600c06c696fb334
Author: huangtianhua <email address hidden>
Date: Wed Dec 2 16:02:41 2015 +0800

    Correct reset_state_on_error() handling

    The change Ic948c2fe5baf23c9c4ced33060f672ca9c278a19 aim
    to prevent the stacks hanging in IN_PROGRESS, but the code
    is incorrect, this patch fix them.

    Closes-Bug: #1521881
    Related-Bug: #1492433
    (cherry picked from commit 63141b20bcb5fe0b7941a6d8578936e42c485242)

    Conflicts:
     heat/tests/test_stack.py
    Change-Id: I0e9655b5a931452d810c38b7ddf6a2ce742bb7ed

[Sergey Kraynev (skraynev)]

Move to FixReleased according to http://lists.openstack.org/pipermail/openstack-dev/2015-November/080288.html

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/253388
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=1012e890117d2a0c0ecee1b4af4c996808acb2fd
Submitter: Jenkins
Branch: stable/liberty

commit 1012e890117d2a0c0ecee1b4af4c996808acb2fd
Author: huangtianhua <email address hidden>
Date: Wed Dec 2 16:02:41 2015 +0800

    Correct reset_state_on_error() handling

    The change Ic948c2fe5baf23c9c4ced33060f672ca9c278a19 aim
    to prevent the stacks hanging in IN_PROGRESS, but the code
    is incorrect, this patch fix them.

    Closes-Bug: #1521881
    Related-Bug: #1492433
    (cherry picked from commit 63141b20bcb5fe0b7941a6d8578936e42c485242)

    Conflicts:
     heat/tests/test_stack.py
    Change-Id: I0e9655b5a931452d810c38b7ddf6a2ce742bb7ed

[Thierry Carrez (ttx)]

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

[Doug Hellmann (doug-hellmann)]

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

[Doug Hellmann (doug-hellmann)]

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