Fix functional regression/recreate test for bug 1671648
There are a couple of issues with the test:
1. It doesn't consider both hosts from the two compute services
during scheduling.
2. There is a race where sometimes claims.Claim.__init__ won't
be called because if the RT instance_claim runs before update_available_resource has run, it will create a claims.NopClaim instead.
This adds the RetryFilter to enabled_filters, adds set_nodes() calls
to set the nodenames of each compute service to match its host,
resulting in consideration of both hosts for scheduling, and stubs
resource_tracker.ResourceTracker.instance_claim instead of
claims.Claim.__init__.
NOTE(mriedem): The conflict is due to this patch coming after
cb4ce72f5f092644aa9b84fa58bcb9fd89b6bedc in Pike. Since this
is a fix for the functional test that the bug fix builds on,
we actually want this to come *before* the bug fix backport.
Related-Bug: #1671648
Change-Id: I541c03a7960b8f135b005c43cb5c7bcb0b63b9ae
(cherry picked from commit b6b5438c3ddeedab6c7f83d1998d283f1bb503bc)
Reviewed: https:/ /review. openstack. org/447014 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=6304edf6082 a8e36aabaa2a927 b4a14da9df2402
Committed: https:/
Submitter: Jenkins
Branch: stable/ocata
commit 6304edf6082a8e3 6aabaa2a927b4a1 4da9df2402
Author: melanie witt <email address hidden>
Date: Thu Mar 16 18:24:23 2017 +0000
Fix functional regression/recreate test for bug 1671648
There are a couple of issues with the test:
1. It doesn't consider both hosts from the two compute services
during scheduling.
2. There is a race where sometimes claims. Claim._ _init__ won't
update_ available_ resource has run, it will create a
claims. NopClaim instead.
be called because if the RT instance_claim runs before
This adds the RetryFilter to enabled_filters, adds set_nodes() calls tracker. ResourceTracker .instance_ claim instead of Claim._ _init__ .
to set the nodenames of each compute service to match its host,
resulting in consideration of both hosts for scheduling, and stubs
resource_
claims.
Conflicts: tests/functiona l/regressions/ test_bug_ 1671648. py
nova/
NOTE(mriedem): The conflict is due to this patch coming after 92644aa9b84fa58 bcb9fd89b6bedc in Pike. Since this
cb4ce72f5f0
is a fix for the functional test that the bug fix builds on,
we actually want this to come *before* the bug fix backport.
Related-Bug: #1671648
Change-Id: I541c03a7960b8f 135b005c43cb5c7 bcb0b63b9ae b6c7f83d1998d28 3f1bb503bc)
(cherry picked from commit b6b5438c3ddeeda