Merge pull request #1043 from zhaoqin-github/schedule

Do not evaluate tenant affinity when schedule agent

Author: zhaoqin-github

f5lbaasdriver/v2/bigip/agent_scheduler.py

@@ -265,15 +265,19 @@ def schedule(self, plugin, context, loadbalancer_id, env=None):
                     if group_capacity > capacity_by_group[gn]:
                         capacity_by_group[gn] = group_capacity
 
+                # ---------------------------------------------------------
+                # NOTE(qzhao): Skip to evaluate tenant affinity, because it
+                # cost much time to load loadbalancers from neutron db.
+                # ---------------------------------------------------------
                 # Do we already have this tenant assigned to this
                 # agent candidate? If we do and it has capacity
                 # then assign this loadbalancer to this agent.
-                assigned_lbs = plugin.db.list_loadbalancers_on_lbaas_agent(
-                    context, candidate['id'])
-                for assigned_lb in assigned_lbs:
-                    if loadbalancer.tenant_id == assigned_lb.tenant_id:
-                        chosen_agent = candidate
-                        break
+                # assigned_lbs = plugin.db.list_loadbalancers_on_lbaas_agent(
+                #     context, candidate['id'])
+                # for assigned_lb in assigned_lbs:
+                #     if loadbalancer.tenant_id == assigned_lb.tenant_id:
+                #         chosen_agent = candidate
+                #         break
 
                 if chosen_agent:
                     # Does the agent which had tenants assigned
@@ -417,15 +421,21 @@ def schedule(self, plugin, context, loadbalancer_id, env=None):
                 else:
                     if group_capacity > capacity_by_group[gn]:
                         capacity_by_group[gn] = group_capacity
+
+                # ---------------------------------------------------------
+                # NOTE(qzhao): Skip to evaluate tenant affinity, because it
+                # cost much time to load loadbalancers from neutron db.
+                # ---------------------------------------------------------
                 # Do we already have this tenant assigned to this
                 # agent candidate? If we do and it has capacity
                 # then assign this loadbalancer to this agent.
-                assigned_lbs = plugin.db.list_loadbalancers_on_lbaas_agent(
-                    context, candidate['id'])
-                for assigned_lb in assigned_lbs:
-                    if loadbalancer.tenant_id == assigned_lb.tenant_id:
-                        chosen_agent = candidate
-                        break
+                # assigned_lbs = plugin.db.list_loadbalancers_on_lbaas_agent(
+                #     context, candidate['id'])
+                # for assigned_lb in assigned_lbs:
+                #     if loadbalancer.tenant_id == assigned_lb.tenant_id:
+                #         chosen_agent = candidate
+                #         break
+
                 if chosen_agent:
                     # Does the agent which had tenants assigned
                     # to it still have capacity?

f5lbaasdriver/v2/bigip/test/test_agent_scheduler.py

@@ -416,14 +416,15 @@ def test_schedule_already_assigned_agent():
                    '{"environment_prefix": "Project", \
                     "environment_group_number": 4, \
                     "environment_capacity_score": 1.5}'}
-    agent2_conf = {'id': 34, 'configurations':
+    agent2_conf = {'id': 35, 'configurations':
                    '{"environment_prefix": "Project", \
                     "environment_group_number": 4, \
                     "environment_capacity_score": 0.8}'}
     mock_plugin.db.get_lbaas_agents.return_value = [agent1_conf, agent2_conf]
     mock_ctx = mock.MagicMock(name='context')
     sched = agent_scheduler.TenantScheduler()
     sched.get_lbaas_agent_hosting_loadbalancer = mock.MagicMock(
-        name='get_lbaas_agent_hosting_loadbalancer', return_value=None)
+        name='get_lbaas_agent_hosting_loadbalancer',
+        return_value={'agent': {'id': 35}})
     res = sched.schedule(mock_plugin, mock_ctx, 'test_lb_id', 'Project')
-    assert res == agent2_conf
+    assert res['id'] == agent2_conf['id']