)]}'
{"id":"openstack%2Fnova~666639","triplet_id":"openstack%2Fnova~stable%2Fstein~I17543ecb572934ecc7d0bbc7a4ad2f537fa499bc","project":"openstack/nova","branch":"stable/stein","topic":"bug/1811235","hashtags":[],"change_id":"I17543ecb572934ecc7d0bbc7a4ad2f537fa499bc","subject":"Raise InstanceFaultRollback for UnableToMigrateToSelf from _prep_resize","status":"MERGED","created":"2019-06-20 16:44:25.000000000","updated":"2019-06-28 19:16:58.000000000","submitted":"2019-06-28 19:16:58.000000000","submitter":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"total_comment_count":0,"unresolved_comment_count":0,"has_review_started":true,"submission_id":"666639-1561749418879-e6a449f5","meta_rev_id":"6e81412156f7d2905296809277aa858d701a0a0e","_number":666639,"virtual_id_number":666639,"owner":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"actions":{},"labels":{"Verified":{"approved":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"all":[{"value":0,"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},{"value":0,"date":"2019-06-20 21:04:25.000000000","_account_id":26515,"name":"Cloudbase Nova Hyper-V CI","email":"nova_hyperv_ci@cloudbasesolutions.com","username":"nova_hyperv_ci"},{"value":0,"date":"2019-06-21 05:18:03.000000000","_account_id":14595,"name":"z Systems KVM","email":"zkvm-ci@linux.vnet.ibm.com","username":"ibm-zkvm-ci","tags":["SERVICE_USER"]},{"value":0,"date":"2019-06-20 18:30:56.000000000","permitted_voting_range":{"min":0,"max":1},"_account_id":10118,"name":"IBM PowerKVM CI","email":"kvmpower@linux.vnet.ibm.com","username":"powerkvm","tags":["SERVICE_USER"]},{"value":0,"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},{"value":2,"date":"2019-06-28 19:16:58.000000000","permitted_voting_range":{"min":2,"max":2},"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]}],"values":{"-2":"Fails","-1":"Doesn\u0027t seem to work"," 0":"No score","+1":"Works for me","+2":"Verified"},"description":"","default_value":0,"optional":true},"Code-Review":{"approved":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"recommended":{"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},"all":[{"value":1,"date":"2019-06-23 23:10:13.000000000","permitted_voting_range":{"min":1,"max":1},"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},{"value":0,"_account_id":26515,"name":"Cloudbase Nova Hyper-V CI","email":"nova_hyperv_ci@cloudbasesolutions.com","username":"nova_hyperv_ci"},{"value":0,"_account_id":14595,"name":"z Systems KVM","email":"zkvm-ci@linux.vnet.ibm.com","username":"ibm-zkvm-ci","tags":["SERVICE_USER"]},{"value":0,"_account_id":10118,"name":"IBM PowerKVM CI","email":"kvmpower@linux.vnet.ibm.com","username":"powerkvm","tags":["SERVICE_USER"]},{"value":2,"date":"2019-06-28 16:20:15.000000000","_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},{"value":0,"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]}],"values":{"-2":"Do not merge","-1":"This patch needs further work before it can be merged"," 0":"No score","+1":"Looks good to me, but someone else must approve","+2":"Looks good to me (core reviewer)"},"description":"","value":1,"default_value":0,"optional":true},"Workflow":{"approved":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"all":[{"value":0,"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},{"value":0,"_account_id":26515,"name":"Cloudbase Nova Hyper-V CI","email":"nova_hyperv_ci@cloudbasesolutions.com","username":"nova_hyperv_ci"},{"value":0,"_account_id":14595,"name":"z Systems KVM","email":"zkvm-ci@linux.vnet.ibm.com","username":"ibm-zkvm-ci","tags":["SERVICE_USER"]},{"value":0,"_account_id":10118,"name":"IBM PowerKVM CI","email":"kvmpower@linux.vnet.ibm.com","username":"powerkvm","tags":["SERVICE_USER"]},{"value":1,"date":"2019-06-28 16:20:15.000000000","_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},{"value":0,"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]}],"values":{"-1":"Work in progress"," 0":"Ready for reviews","+1":"Approved"},"description":"","default_value":0,"optional":true},"Review-Priority":{"all":[{"value":0,"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},{"value":0,"_account_id":26515,"name":"Cloudbase Nova Hyper-V CI","email":"nova_hyperv_ci@cloudbasesolutions.com","username":"nova_hyperv_ci"},{"value":0,"_account_id":14595,"name":"z Systems KVM","email":"zkvm-ci@linux.vnet.ibm.com","username":"ibm-zkvm-ci","tags":["SERVICE_USER"]},{"value":0,"_account_id":10118,"name":"IBM PowerKVM CI","email":"kvmpower@linux.vnet.ibm.com","username":"powerkvm","tags":["SERVICE_USER"]},{"value":0,"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},{"value":0,"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]}],"values":{" 0":"Default Priority","+1":"Contributor Review Promise","+2":"Core Review Promise"},"description":"","default_value":0,"optional":true}},"removable_reviewers":[],"reviewers":{"REVIEWER":[{"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},{"_account_id":10118,"name":"IBM PowerKVM CI","email":"kvmpower@linux.vnet.ibm.com","username":"powerkvm","tags":["SERVICE_USER"]},{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},{"_account_id":14595,"name":"z Systems KVM","email":"zkvm-ci@linux.vnet.ibm.com","username":"ibm-zkvm-ci","tags":["SERVICE_USER"]},{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},{"_account_id":26515,"name":"Cloudbase Nova Hyper-V CI","email":"nova_hyperv_ci@cloudbasesolutions.com","username":"nova_hyperv_ci"}]},"pending_reviewers":{},"reviewer_updates":[{"updated":"2019-06-20 18:30:56.000000000","updated_by":{"_account_id":10118,"name":"IBM PowerKVM CI","email":"kvmpower@linux.vnet.ibm.com","username":"powerkvm","tags":["SERVICE_USER"]},"reviewer":{"_account_id":10118,"name":"IBM PowerKVM CI","email":"kvmpower@linux.vnet.ibm.com","username":"powerkvm","tags":["SERVICE_USER"]},"state":"REVIEWER"},{"updated":"2019-06-20 21:04:25.000000000","updated_by":{"_account_id":26515,"name":"Cloudbase Nova Hyper-V CI","email":"nova_hyperv_ci@cloudbasesolutions.com","username":"nova_hyperv_ci"},"reviewer":{"_account_id":26515,"name":"Cloudbase Nova Hyper-V CI","email":"nova_hyperv_ci@cloudbasesolutions.com","username":"nova_hyperv_ci"},"state":"REVIEWER"},{"updated":"2019-06-21 05:18:03.000000000","updated_by":{"_account_id":14595,"name":"z Systems KVM","email":"zkvm-ci@linux.vnet.ibm.com","username":"ibm-zkvm-ci","tags":["SERVICE_USER"]},"reviewer":{"_account_id":14595,"name":"z Systems KVM","email":"zkvm-ci@linux.vnet.ibm.com","username":"ibm-zkvm-ci","tags":["SERVICE_USER"]},"state":"REVIEWER"},{"updated":"2019-06-23 23:10:13.000000000","updated_by":{"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},"reviewer":{"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},"state":"REVIEWER"},{"updated":"2019-06-28 16:20:15.000000000","updated_by":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"reviewer":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"state":"REVIEWER"},{"updated":"2019-06-28 19:16:58.000000000","updated_by":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"reviewer":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"state":"REVIEWER"}],"messages":[{"id":"b4796049de42c39a66fada62f11c1687fdbba892","author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"date":"2019-06-20 16:44:25.000000000","message":"Uploaded patch set 1.","accounts_in_message":[],"_revision_number":1},{"id":"0084442cdce02d54ab4f844cd85ca0b3a1413a98","author":{"_account_id":10118,"name":"IBM PowerKVM CI","email":"kvmpower@linux.vnet.ibm.com","username":"powerkvm","tags":["SERVICE_USER"]},"date":"2019-06-20 18:30:56.000000000","message":"Patch Set 1:\n\nBuild failed. Test completed on IBM PowerKVM platform. For rechecking only on the IBM PowerKVM CI, add a review comment with pkvm: recheck. For contact and more information, see https://wiki.openstack.org/wiki/PowerKVM\n\n- tempest-dsvm-full-xenial https://dal05.objectstorage.softlayer.net/v1/AUTH_3d8e6ecb-f597-448c-8ec2-164e9f710dd6/pkvmci/nova/39/666639/1/check/tempest-dsvm-full-xenial/7eb5881/ : FAILURE in 1h 13m 31s\n- tempest-dsvm-full-xenial-py3 https://dal05.objectstorage.softlayer.net/v1/AUTH_3d8e6ecb-f597-448c-8ec2-164e9f710dd6/pkvmci/nova/39/666639/1/check/tempest-dsvm-full-xenial-py3/fb69cf5/ : SUCCESS in 1h 24m 00s (non-voting)\n- grenade-dsvm-xenial https://dal05.objectstorage.softlayer.net/v1/AUTH_3d8e6ecb-f597-448c-8ec2-164e9f710dd6/pkvmci/nova/39/666639/1/check/grenade-dsvm-xenial/0fb6fe8/ : SUCCESS in 59m 35s (non-voting)","accounts_in_message":[],"_revision_number":1},{"id":"4a99a84e753b6ccc676b84b629f42903acc17712","author":{"_account_id":26515,"name":"Cloudbase Nova Hyper-V CI","email":"nova_hyperv_ci@cloudbasesolutions.com","username":"nova_hyperv_ci"},"date":"2019-06-20 21:04:25.000000000","message":"Patch Set 1:\n\nBuild succeeded.\n\n- nova http://cloudbase-ci.com/nova/666639/1 : SUCCESS in 2h 26m 55s","accounts_in_message":[],"_revision_number":1},{"id":"a5c8414671543990389ddbf3cf4f9da7812c796f","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2019-06-21 01:29:35.000000000","message":"Patch Set 1: Verified+1\n\nBuild succeeded (check pipeline).\n\n- grenade-py3 http://logs.openstack.org/39/666639/1/check/grenade-py3/8a90514/ : SUCCESS in 59m 50s\n- tempest-full-py3 http://logs.openstack.org/39/666639/1/check/tempest-full-py3/36737ec/ : SUCCESS in 1h 46m 20s\n- openstack-tox-cover http://logs.openstack.org/39/666639/1/check/openstack-tox-cover/1f0a829/cover/ : SUCCESS in 15m 18s\n- openstack-tox-lower-constraints http://logs.openstack.org/39/666639/1/check/openstack-tox-lower-constraints/280e79f/ : SUCCESS in 22m 04s\n- openstack-tox-pep8 http://logs.openstack.org/39/666639/1/check/openstack-tox-pep8/dc7eb9e/ : SUCCESS in 11m 30s\n- openstack-tox-py27 http://logs.openstack.org/39/666639/1/check/openstack-tox-py27/ef05e94/ : SUCCESS in 11m 45s\n- openstack-tox-py35 http://logs.openstack.org/39/666639/1/check/openstack-tox-py35/75a4a48/ : SUCCESS in 12m 58s\n- openstack-tox-py36 http://logs.openstack.org/39/666639/1/check/openstack-tox-py36/58718ef/ : SUCCESS in 27m 08s\n- openstack-tox-py37 http://logs.openstack.org/39/666639/1/check/openstack-tox-py37/0e9c71c/ : SUCCESS in 16m 04s\n- openstack-tox-docs http://logs.openstack.org/39/666639/1/check/openstack-tox-docs/eaa7b3f/html/ : SUCCESS in 6m 19s\n- ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa http://logs.openstack.org/39/666639/1/check/ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa/c52643f/ : SUCCESS in 45m 55s (non-voting)\n- devstack-plugin-ceph-tempest http://logs.openstack.org/39/666639/1/check/devstack-plugin-ceph-tempest/7c2a48d/ : SUCCESS in 1h 29m 01s (non-voting)\n- neutron-grenade-multinode http://logs.openstack.org/39/666639/1/check/neutron-grenade-multinode/2aece74/ : SUCCESS in 1h 08m 46s\n- nova-grenade-live-migration http://logs.openstack.org/39/666639/1/check/nova-grenade-live-migration/d58ae76/ : SUCCESS in 1h 05m 29s\n- nova-live-migration http://logs.openstack.org/39/666639/1/check/nova-live-migration/e3f6726/ : SUCCESS in 47m 19s\n- nova-next http://logs.openstack.org/39/666639/1/check/nova-next/2c34542/ : SUCCESS in 1h 32m 38s\n- nova-tox-functional http://logs.openstack.org/39/666639/1/check/nova-tox-functional/db5cc18/ : SUCCESS in 17m 42s\n- nova-tox-functional-py35 http://logs.openstack.org/39/666639/1/check/nova-tox-functional-py35/8029d2d/ : SUCCESS in 19m 29s\n- tempest-multinode-full http://logs.openstack.org/39/666639/1/check/tempest-multinode-full/5653439/ : SUCCESS in 1h 54m 32s (non-voting)\n- tempest-slow-py3 http://logs.openstack.org/39/666639/1/check/tempest-slow-py3/4b8aa68/ : SUCCESS in 2h 14m 02s","accounts_in_message":[],"_revision_number":1},{"id":"1f033130ed06b3977bf2e30ad5e9735bb14168e3","author":{"_account_id":14595,"name":"z Systems KVM","email":"zkvm-ci@linux.vnet.ibm.com","username":"ibm-zkvm-ci","tags":["SERVICE_USER"]},"date":"2019-06-21 05:18:03.000000000","message":"Patch Set 1:\n\nTesting succeeded on ubuntu-xenial-s390x. For rechecking only on the ubuntu-xenail-s390x CI, add a review comment with recheck-zkvm. Contact info: zkvm-ci@linux.vnet.ibm.com. For more information, see https://wiki.openstack.org/wiki/ThirdPartySystems/IBM_zKVM_CI\n\n- check-tempest-dsvm-neutron-full-ubuntu-xenial-s390x http://sng01.objectstorage.softlayer.net/v1/AUTH_1940ea10-6e82-4501-b2f9-eb236510e575/ibmzkvmci/production/666639/1/check-tempest-dsvm-neutron-full-ubuntu-xenial-s390x/d088d90 : SUCCESS in 2h 06m 34s","accounts_in_message":[],"_revision_number":1},{"id":"97ee1069b45724a758af77c5bbe084ebddc4cc7b","author":{"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},"date":"2019-06-23 23:10:13.000000000","message":"Patch Set 1: Code-Review+1\n\nlgtm","accounts_in_message":[],"_revision_number":1},{"id":"79ba4f927ee6a584ba74a04ec0db0dc916c15f4f","author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"date":"2019-06-28 16:20:15.000000000","message":"Patch Set 1: Code-Review+2 Workflow+1\n\nLGTM, test conflict is noted, tests are passing, merged on master and the bugfix itself is useful for stable. Approving as this was proposed by another Nova stable core.","accounts_in_message":[],"_revision_number":1},{"id":"ca0f036229a1da45cb823947c2beb1d0d8b25b4a","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2019-06-28 16:21:36.000000000","message":"Patch Set 1: -Verified\n\nStarting gate jobs.","accounts_in_message":[],"_revision_number":1},{"id":"6a2faaa2969996dc2276fc37e0d3880e1f1ec1e9","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2019-06-28 19:16:58.000000000","message":"Patch Set 1: Verified+2\n\nBuild succeeded (gate pipeline).\n\n- grenade-py3 http://logs.openstack.org/39/666639/1/gate/grenade-py3/9f4ddb9/ : SUCCESS in 55m 10s\n- tempest-full-py3 http://logs.openstack.org/39/666639/1/gate/tempest-full-py3/ae37261/ : SUCCESS in 1h 40m 02s\n- openstack-tox-lower-constraints http://logs.openstack.org/39/666639/1/gate/openstack-tox-lower-constraints/fa57030/ : SUCCESS in 12m 51s\n- openstack-tox-pep8 http://logs.openstack.org/39/666639/1/gate/openstack-tox-pep8/2f7996b/ : SUCCESS in 9m 25s\n- openstack-tox-py27 http://logs.openstack.org/39/666639/1/gate/openstack-tox-py27/b6b3673/ : SUCCESS in 12m 25s\n- openstack-tox-py35 http://logs.openstack.org/39/666639/1/gate/openstack-tox-py35/6aa4965/ : SUCCESS in 14m 43s\n- openstack-tox-py36 http://logs.openstack.org/39/666639/1/gate/openstack-tox-py36/8d49b76/ : SUCCESS in 16m 26s\n- openstack-tox-py37 http://logs.openstack.org/39/666639/1/gate/openstack-tox-py37/2835c07/ : SUCCESS in 16m 10s\n- openstack-tox-docs http://logs.openstack.org/39/666639/1/gate/openstack-tox-docs/5fb0ee6/html/ : SUCCESS in 6m 26s\n- nova-grenade-live-migration http://logs.openstack.org/39/666639/1/gate/nova-grenade-live-migration/6ddf724/ : SUCCESS in 1h 14m 56s\n- nova-live-migration http://logs.openstack.org/39/666639/1/gate/nova-live-migration/ee441ee/ : SUCCESS in 52m 00s\n- nova-tox-functional http://logs.openstack.org/39/666639/1/gate/nova-tox-functional/d292cd8/ : SUCCESS in 18m 44s\n- nova-tox-functional-py35 http://logs.openstack.org/39/666639/1/gate/nova-tox-functional-py35/2a83fe7/ : SUCCESS in 21m 39s\n- nova-next http://logs.openstack.org/39/666639/1/gate/nova-next/74adcdd/ : SUCCESS in 1h 31m 11s\n- tempest-slow-py3 http://logs.openstack.org/39/666639/1/gate/tempest-slow-py3/473e94b/ : SUCCESS in 2h 25m 59s","accounts_in_message":[],"_revision_number":1},{"id":"4312bb5379019640ca34046769d58bebce2e9dd8","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2019-06-28 19:16:58.000000000","message":"Change has been successfully merged by Zuul","accounts_in_message":[],"_revision_number":1}],"current_revision_number":1,"current_revision":"1a11d5c7f35c17cfafc6b8ba57da88995c35b595","revisions":{"1a11d5c7f35c17cfafc6b8ba57da88995c35b595":{"kind":"REWORK","_number":1,"created":"2019-06-20 16:44:25.000000000","uploader":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"ref":"refs/changes/39/666639/1","fetch":{"anonymous http":{"url":"https://review.opendev.org/openstack/nova","ref":"refs/changes/39/666639/1","commands":{"Checkout":"git fetch https://review.opendev.org/openstack/nova refs/changes/39/666639/1 \u0026\u0026 git checkout FETCH_HEAD","Cherry Pick":"git fetch https://review.opendev.org/openstack/nova refs/changes/39/666639/1 \u0026\u0026 git cherry-pick FETCH_HEAD","Format Patch":"git fetch https://review.opendev.org/openstack/nova refs/changes/39/666639/1 \u0026\u0026 git format-patch -1 --stdout FETCH_HEAD","Pull":"git pull https://review.opendev.org/openstack/nova refs/changes/39/666639/1"}}},"commit":{"parents":[{"commit":"cdaa80078491517af3143690d40d30a5b7591edf","subject":"Change InstanceFaultRollback handling in _error_out_instance_on_exception","web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/nova/commit/cdaa80078491517af3143690d40d30a5b7591edf"}]}],"author":{"name":"Matt Riedemann","email":"mriedem.os@gmail.com","date":"2019-01-25 15:55:00.000000000","tz":-300},"committer":{"name":"Matt Riedemann","email":"mriedem.os@gmail.com","date":"2019-06-20 16:43:25.000000000","tz":-240},"subject":"Raise InstanceFaultRollback for UnableToMigrateToSelf from _prep_resize","message":"Raise InstanceFaultRollback for UnableToMigrateToSelf from _prep_resize\n\nIt is possible to cold migrate a stopped server. If, however, the\ncold migrate is scheduled to the instance\u0027s current host and the\ncompute driver does not support cold migrating to the same host,\nthen UnableToMigrateToSelf was being raised from _prep_resize. If\n_reschedule_resize_or_reraise re-raises that exception, then\n_error_out_instance_on_exception in prep_resize handles it and\nsets the instance vm_state to ACTIVE. This is wrong since the\ninstance power state is unchanged at this point and the instance\nis actually stopped.\n\nThis fixes the problem by wrapping UnableToMigrateToSelf in\nInstanceFaultRollback and raises that from _prep_resize, and\n_error_out_instance_on_exception is called with the initial\nvm_state (STOPPED in this case) so when _error_out_instance_on_exception\nhandles the InstanceFaultRollback exception it sets the instance\nvm_state to STOPPED (what it already was) rather than ACTIVE.\n\nThere were no existing unit tests for the UnableToMigrateToSelf\ncase in _prep_resize so those are added here.\n\nConflicts:\n      nova/tests/unit/compute/test_compute_mgr.py\n\nNOTE(mriedem): The conflict is due to some unit tests from change\nI734cc01dce13f9e75a16639faf890ddb1661b7eb not being in Stein.\n\nChange-Id: I17543ecb572934ecc7d0bbc7a4ad2f537fa499bc\nCloses-Bug: #1811235\n(cherry picked from commit d1931ac0630415519f9c3d906caba9c83cc8162a)\n","web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/nova/commit/1a11d5c7f35c17cfafc6b8ba57da88995c35b595"}],"resolve_conflicts_web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/nova/commit/1a11d5c7f35c17cfafc6b8ba57da88995c35b595"}]},"branch":"refs/heads/stable/stein"}},"requirements":[],"submit_records":[],"submit_requirements":[]}