2efe3f6b88
When rebuilding and changing the image, we run the new image through the scheduler to see if it's valid for the instance on its current compute host. The API saves off the new image ref on the instance before casting to conductor to run through the scheduler. If the scheduler fails, the instance.image_ref was not being rolled back, which meant a user could attempt the rebuild with the same invalid image a second time and the API, seeing the instance.image_ref hasn't changed (even though it's not the actual backing image for the server), will bypass the scheduler and rebuild the instance with that invalid image. This fixes the issue by using the original image ref, passed from API to conductor during rebuild, to reset the instance.image_ref in the case of a failure. Note that there are other things changed on the instance in the API which this patch does not attempt to recover as that's a bigger work item which likely involves substantial refactoring of the code. Closes-Bug: #1746032 Conflicts: nova/conductor/manager.py nova/tests/functional/test_servers.py NOTE(mriedem): The conflicts in manager.py are due to not having I06d78c744fa75ae5f34c5cfa76bc3c9460767b84 in Ocata. The functional test conflict is due to tests that existed in Pike which don't exist in Ocata. Change-Id: I3399a66fe9b1297cd6b0dca440145393ceaef41f (cherry picked from commit |
||
|---|---|---|
| .. | ||
| tasks | ||
| __init__.py | ||
| api.py | ||
| manager.py | ||
| rpcapi.py | ||