openstack/blazar
Code Issues Proposed changes

Fix host randomization

Browse Source 
Previously, this was implemented using the shuffle method of the Random
class without instantiating a Random object, which did not work. This
changes swaps to the random.shuffle method, which works as expected.

Closes-Bug: #2099927
Change-Id: Ib288091af9cc035ccb0535fbc1748c17bb3cb1e9
This commit is contained in:
Mark Powers 2025-02-17 22:20:50 +00:00 committed by Pierre Riteau
parent 762dacbd3b
commit dbdf1b894f
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blazar/plugins/oshosts/host_plugin.py
View File

@ -15,7 +15,7 @@
# under the License.
import datetime
from random import Random
import random
import retrying
from novaclient import exceptions as nova_exceptions
@ -654,12 +654,12 @@ class PhysicalHostPlugin(base.BasePlugin, nova.NovaClientWrapper):
allocated_host_ids.append(host['id'])
if len(not_allocated_host_ids) >= int(min_host):
if CONF[self.resource_type].randomize_host_selection:
Random.shuffle(not_allocated_host_ids)
random.shuffle(not_allocated_host_ids)
return not_allocated_host_ids[:int(max_host)]
all_host_ids = allocated_host_ids + not_allocated_host_ids
if len(all_host_ids) >= int(min_host):
if CONF[self.resource_type].randomize_host_selection:
Random.shuffle(all_host_ids)
random.shuffle(all_host_ids)
return all_host_ids[:int(max_host)]
else:
return []

6
blazar/tests/plugins/oshosts/test_physical_host_plugin.py
View File

@ -2431,7 +2431,7 @@ class PhysicalHostPluginTestCase(tests.TestCase):
self.addCleanup(CONF.clear_override, 'cleaning_time')
self.assertEqual(['host1', 'host2', 'host3'], result)
@mock.patch.object(random.Random, "shuffle")
@mock.patch.object(random, "shuffle")
def test_random_matching_hosts_not_allocated_hosts(self, mock_shuffle):
def host_allocation_get_all_by_values(**kwargs):
if kwargs['compute_host_id'] == 'host1':
@ -2465,7 +2465,7 @@ class PhysicalHostPluginTestCase(tests.TestCase):
group=plugin.RESOURCE_TYPE)
mock_shuffle.assert_called_once_with(['host2', 'host3'])
@mock.patch.object(random.Random, "shuffle")
@mock.patch.object(random, "shuffle")
def test_random_matching_hosts_allocated_hosts(self, mock_shuffle):
def host_allocation_get_all_by_values(**kwargs):
if kwargs['compute_host_id'] == 'host1':
@ -2499,7 +2499,7 @@ class PhysicalHostPluginTestCase(tests.TestCase):
group=plugin.RESOURCE_TYPE)
mock_shuffle.assert_called_once_with(['host1', 'host2', 'host3'])
@mock.patch.object(random.Random, "shuffle")
@mock.patch.object(random, "shuffle")
def test_random_matching_hosts_allocated_cleaning_time(self, mock_shuffle):
def host_allocation_get_all_by_values(**kwargs):
if kwargs['compute_host_id'] == 'host1':

5
releasenotes/notes/fix-host-randomization-bcab5276ef6199e6.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes functionality of host randomization feature.
`LP#2099927 <https://bugs.launchpad.net/blazar/+bug/2099927>`__