0f2d87416e
On recreate where the instance is being evacuated to a different node,
we should be rebuilding the claim so the migration context is available
when rebuilding the instance.
Conflicts:
nova/compute/manager.py
nova/tests/unit/compute/test_compute_mgr.py
NOTE(mriedem): There are a few issues here:
1. I5aaa869f2e6155964827e659d18e2bcaad9d866b changed the LOG.info
method to not pass a context in Ocata.
2. I57233259065d887b38a79850a05177fcbbdfb8c3 changed some tests in
test_compute_manager in Ocata, but is irrelevant here.
3. The bigger change isn't a merge conflict but in Ocata the compute
manager code was all refactored so that the _get_resource_tracker
method no longer needed a nodename passed to it. In Newton, however,
if we're force evacuating (scenario 3) then we don't have a scheduled_node
passed to the rebuild_instance method and in this case we need to
lookup the nodename for the host we're currently on. To resolve this,
some existing code that handles this case is moved up where it is
needed to get the resource tracker so we can get the rebuild_claim method.
We let any ComputeHostNotFound exception raise up in this case rather than
log it because without the compute node we can't make the rebuild claim and
we need to fail. Tests are adjusted accordingly for this.
Change-Id: I53bdcf8edf640e97b4632ef7a093f14a6e3845e4
Closes-Bug: 1658070
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| functional | ||
| live_migration/hooks | ||
| unit | ||
| __init__.py | ||
| fixtures.py | ||
| uuidsentinel.py | ||