openstack
/
senlin
Code Issues Proposed changes

Merge "fix: SCALE_IN action not honoring specified node count"

This commit is contained in:
Zuul 2024-01-10 06:37:50 +00:00 committed by Gerrit Code Review
parent 23f3bd708b 2b66935763
commit 29f2e885e7
3 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
releasenotes/notes/bug-2048099-74f0ca874cfbe6b4.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Addresses an issue related to the SCALE_IN action. The bug caused
the removal of only one node from the load balancer even when the
count of inputs was greater than 1.

2
senlin/policies/lb_policy.py
View File

@ -526,7 +526,7 @@ class LoadBalancingPolicy(base.Policy):
else:
count = action.data['deletion']['count']
else: # action.action == consts.CLUSTER_SCALE_IN
count = 1
count = action.inputs.get('count', 1)
elif action.action == consts.CLUSTER_REPLACE_NODES:
candidates = list(action.inputs['candidates'].keys())
count = len(candidates)

43
senlin/tests/unit/policies/test_lb_policy.py
View File

@ -517,18 +517,21 @@ class TestLoadBalancingPolicy(base.SenlinTestCase):
node1 = mock.Mock(id='node1')
node2 = mock.Mock(id='node2')
node3 = mock.Mock(id='node3')
cluster = mock.Mock()
cluster.nodes = [node1, node2, node3]
action = mock.Mock(action=consts.CLUSTER_SCALE_IN, data={})
action.entity = cluster
cluster = mock.Mock(nodes=[node1, node2, node3])
action = mock.Mock(
action=consts.CLUSTER_SCALE_IN,
entity=cluster,
data={},
inputs={'count': 1}
)
m_nodes_random.return_value = ['node3']
m_nodes_random.return_value = ['node1', 'node3']
policy = lb_policy.LoadBalancingPolicy('test-policy', self.spec)
res = policy._get_delete_candidates('CLUSTERID', action)
res = policy._get_delete_candidates('CLUSTER_ID', action)
m_nodes_random.assert_called_once_with([node1, node2, node3], 1)
self.assertEqual(['node1', 'node3'], res)
self.assertEqual(['node3'], res)
@mock.patch.object(scaleutils, 'parse_resize_params')
@mock.patch.object(scaleutils, 'nodes_by_random')
@ -619,6 +622,30 @@ class TestLoadBalancingPolicy(base.SenlinTestCase):
res = policy._get_delete_candidates('CLUSTERID', action)
self.assertEqual(['node3'], res)
@mock.patch.object(scaleutils, 'nodes_by_random')
def test_get_delete_candidates_no_deletion_data_count_gt_one_scale_in(
self, m_nodes_random
):
self.context = utils.dummy_context()
node1 = mock.Mock(id='node1')
node2 = mock.Mock(id='node2')
node3 = mock.Mock(id='node3')
cluster = mock.Mock(nodes=[node1, node2, node3])
action = mock.Mock(
action=consts.CLUSTER_SCALE_IN,
entity=cluster,
data={},
inputs={'count': 2}
)
m_nodes_random.return_value = ['node1', 'node3']
policy = lb_policy.LoadBalancingPolicy('test-policy', self.spec)
res = policy._get_delete_candidates('CLUSTER_ID', action)
m_nodes_random.assert_called_once_with([node1, node2, node3], 2)
self.assertEqual(['node1', 'node3'], res)
@mock.patch.object(cluster_policy.ClusterPolicy, 'load')
@mock.patch.object(lb_policy.LoadBalancingPolicy, '_extract_policy_data')