Hard reboot escalation regression

[Johannes Erdfelt]

Nova used to allow a hard reboot when an instance is already being soft rebooted. However, with commit cc0be157d005c5588fe5db779fc30fefbf22b44d, this is no longer allowed.

This is because two new task states were introduced, REBOOT_PENDING and REBOOT_STARTED (and corresponding values for hard reboots). A soft reboot now spends most of it's time in REBOOT_STARTED instead of REBOOTING.

REBOOT_PENDING and REBOOT_STARTED were not added to the @check_instance_state decorator. As a result, an attempt to hard reboot an instance which is stuck trying to do a soft reboot will now fail with an InstanceInvalidState exception.

This provides a poor user experience since a reboot is often attempted for instances that aren't responsive. A soft reboot is not guaranteed to work even if the system is responsive. The soft reboot prevents a hard reboot from being performed.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/117859
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=7d21ceac9e1bd14b0efb605b3ff3276b8d193c45
Submitter: Jenkins
Branch: master

commit 7d21ceac9e1bd14b0efb605b3ff3276b8d193c45
Author: Johannes Erdfelt <email address hidden>
Date: Wed Aug 27 09:36:40 2014 -0700

    Allow hard reboots when still attempting a soft reboot

    Commit cc0be157d005c5588fe5db779fc30fefbf22b44d introduced a
    regression in the reboot code. Previously, a hard reboot could be
    performed when an instance was in soft reboot.

    This fixes the regression by allowing a hard reboot when the instance
    is in one of the two new task states.

    Closes-bug: 1362799
    Change-Id: Id8aaf852b0cccb75a79794a8bf9eb94e21550b81