Merge pull request #1004 from zhaoqin-github/perf2-pike-bug

Include performance approach 2 patch into stable/pike branch

Author: zhaoqin-github

f5lbaasdriver/v2/bigip/driver_v2.py

@@ -152,6 +152,9 @@ def __init__(self, driver):
         self.driver = driver
         self.api_dict = None
 
+    def _log_entity(self, entity):
+        LOG.debug("Log the entity: %s", entity.to_api_dict())
+
     def _call_rpc(self, context, loadbalancer, entity, rpc_method, **kwargs):
         '''Perform operations common to create and delete for managers.'''
 
@@ -201,10 +204,10 @@ def _schedule_agent_create_service(self, context, loadbalancer,
             context, loadbalancer, agent, **kwargs)
         return agent, service
 
+    @log_helpers.log_method_call
     def _append_listeners(self, context, service, listener):
 
         if not listener:
-            service['listeners'] = []
             return
 
         def get_db_listener():
@@ -226,8 +229,11 @@ def get_db_listener():
             [{'id': l7_policy.id} for l7_policy in listener.l7_policies]
         if listener.default_pool:
             listener_dict['default_pool_id'] = listener.default_pool.id
-        service['listeners'] = [listener_dict]
 
+        LOG.debug("append listener %s", listener_dict)
+        service['listeners'].append(listener_dict)
+
+    @log_helpers.log_method_call
     def _append_pools_monitors(self, context, service, pool):
 
         if not pool:
@@ -262,6 +268,7 @@ def get_db_pool():
                 pool.session_persistence.to_api_dict()
             )
 
+        LOG.debug("append pool %s", pool_dict)
         service['pools'] = [pool_dict]
 
         # Place an empty member list as the initial value.
@@ -284,6 +291,7 @@ def get_db_healthmonitor():
         healthmonitor_dict = healthmonitor.to_dict(pool=False)
         healthmonitor_dict['pool_id'] = pool.id
 
+        LOG.debug("append healthmonitor_dict %s", healthmonitor_dict)
         service['healthmonitors'] = [healthmonitor_dict]
 
 
@@ -293,6 +301,9 @@ class LoadBalancerManager(EntityManager):
     @log_helpers.log_method_call
     def create(self, context, loadbalancer):
         """Create a loadbalancer."""
+
+        self._log_entity(loadbalancer)
+
         driver = self.driver
         try:
             agent, service = self._schedule_agent_create_service(
@@ -351,6 +362,10 @@ def create(self, context, loadbalancer):
     @log_helpers.log_method_call
     def update(self, context, old_loadbalancer, loadbalancer):
         """Update a loadbalancer."""
+
+        self._log_entity(old_loadbalancer)
+        self._log_entity(loadbalancer)
+
         driver = self.driver
         try:
             agent, service = self._schedule_agent_create_service(
@@ -378,6 +393,9 @@ def update(self, context, old_loadbalancer, loadbalancer):
     @log_helpers.log_method_call
     def delete(self, context, loadbalancer):
         """Delete a loadbalancer."""
+
+        self._log_entity(loadbalancer)
+
         driver = self.driver
         try:
             agent, service = self._schedule_agent_create_service(
@@ -438,6 +456,8 @@ class ListenerManager(EntityManager):
     def create(self, context, listener):
         """Create a listener."""
 
+        self._log_entity(listener)
+
         lb = listener.loadbalancer
         self.api_dict = listener.to_dict(
             loadbalancer=False, default_pool=False)
@@ -461,6 +481,9 @@ def append_listeners(context, loadbalancer, service):
     def update(self, context, old_listener, listener):
         """Update a listener."""
 
+        self._log_entity(old_listener)
+        self._log_entity(listener)
+
         driver = self.driver
         lb = listener.loadbalancer
         try:
@@ -481,6 +504,8 @@ def update(self, context, old_listener, listener):
     def delete(self, context, listener):
         """Delete a listener."""
 
+        self._log_entity(listener)
+
         lb = listener.loadbalancer
         self.api_dict = listener.to_dict(
             loadbalancer=False, default_pool=False)
@@ -522,11 +547,18 @@ def _get_pool_dict(self, pool):
     def create(self, context, pool):
         """Create a pool."""
 
+        self._log_entity(pool)
+
         lb = pool.loadbalancer
         self.api_dict = self._get_pool_dict(pool)
 
         def append_listeners(context, loadbalancer, service):
-            self._append_listeners(context, service, pool.listener)
+            for listener in loadbalancer.listeners:
+                if listener.default_pool:
+                    if listener.default_pool.id == pool.id:
+                        LOG.debug("listener %s has default pool %s",
+                                  listener.id, pool.id)
+                        self._append_listeners(context, service, listener)
 
         def append_pools_monitors(context, loadbalancer, service):
             self._append_pools_monitors(context, service, pool)
@@ -549,6 +581,9 @@ def append_pools_monitors(context, loadbalancer, service):
     def update(self, context, old_pool, pool):
         """Update a pool."""
 
+        self._log_entity(old_pool)
+        self._log_entity(pool)
+
         driver = self.driver
         lb = pool.loadbalancer
         try:
@@ -568,11 +603,18 @@ def update(self, context, old_pool, pool):
     def delete(self, context, pool):
         """Delete a pool."""
 
+        self._log_entity(pool)
+
         lb = pool.loadbalancer
         self.api_dict = self._get_pool_dict(pool)
 
         def append_listeners(context, loadbalancer, service):
-            self._append_listeners(context, service, pool.listener)
+            for listener in loadbalancer.listeners:
+                if listener.default_pool:
+                    if listener.default_pool.id == pool.id:
+                        LOG.debug("listener %s has default pool %s",
+                                  listener.id, pool.id)
+                        self._append_listeners(context, service, listener)
 
         def append_pools_monitors(context, loadbalancer, service):
             self._append_pools_monitors(context, service, pool)
@@ -596,6 +638,8 @@ class MemberManager(EntityManager):
     def create(self, context, member):
         """Create a member."""
 
+        self._log_entity(member)
+
         lb = member.pool.loadbalancer
 
         if self.driver.unlegacy_setting_placeholder_driver_side:
@@ -704,6 +748,9 @@ def create_bulk(self, context, members):
     def update(self, context, old_member, member):
         """Update a member."""
 
+        self._log_entity(old_member)
+        self._log_entity(member)
+
         driver = self.driver
         lb = member.pool.loadbalancer
         try:
@@ -722,6 +769,9 @@ def update(self, context, old_member, member):
     @log_helpers.log_method_call
     def delete(self, context, member):
         """Delete a member."""
+
+        self._log_entity(member)
+
         lb = member.pool.loadbalancer
         driver = self.driver
         try:
@@ -779,6 +829,8 @@ class HealthMonitorManager(EntityManager):
     def create(self, context, health_monitor):
         """Create a health monitor."""
 
+        self._log_entity(health_monitor)
+
         lb = health_monitor.pool.loadbalancer
         self.api_dict = health_monitor.to_dict(pool=False)
 
@@ -801,6 +853,9 @@ def append_pools_monitors(context, loadbalancer, service):
     def update(self, context, old_health_monitor, health_monitor):
         """Update a health monitor."""
 
+        self._log_entity(old_health_monitor)
+        self._log_entity(health_monitor)
+
         driver = self.driver
         lb = health_monitor.pool.loadbalancer
         try:
@@ -820,6 +875,8 @@ def update(self, context, old_health_monitor, health_monitor):
     def delete(self, context, health_monitor):
         """Delete a health monitor."""
 
+        self._log_entity(health_monitor)
+
         lb = health_monitor.pool.loadbalancer
         self.api_dict = health_monitor.to_dict(pool=False)
 
@@ -846,6 +903,8 @@ class L7PolicyManager(EntityManager):
     def create(self, context, policy):
         """Create an L7 policy."""
 
+        self._log_entity(policy)
+
         lb = policy.listener.loadbalancer
         self.api_dict = policy.to_dict(listener=False, rules=False)
 
@@ -872,6 +931,9 @@ def append_pools_monitors(context, loadbalancer, service):
     def update(self, context, old_policy, policy):
         """Update a policy."""
 
+        self._log_entity(old_policy)
+        self._log_entity(policy)
+
         driver = self.driver
         lb = policy.listener.loadbalancer
         try:
@@ -891,6 +953,8 @@ def update(self, context, old_policy, policy):
     def delete(self, context, policy):
         """Delete a policy."""
 
+        self._log_entity(policy)
+
         lb = policy.listener.loadbalancer
         self.api_dict = policy.to_dict(listener=False, rules=False)
 
@@ -921,6 +985,8 @@ class L7RuleManager(EntityManager):
     def create(self, context, rule):
         """Create an L7 rule."""
 
+        self._log_entity(rule)
+
         lb = rule.policy.listener.loadbalancer
         self.api_dict = rule.to_dict(policy=False)
 
@@ -947,6 +1013,9 @@ def append_pools_monitors(context, loadbalancer, service):
     def update(self, context, old_rule, rule):
         """Update a rule."""
 
+        self._log_entity(old_rule)
+        self._log_entity(rule)
+
         driver = self.driver
         lb = rule.policy.listener.loadbalancer
         try:
@@ -966,6 +1035,8 @@ def update(self, context, old_rule, rule):
     def delete(self, context, rule):
         """Delete a rule."""
 
+        self._log_entity(rule)
+
         lb = rule.policy.listener.loadbalancer
         self.api_dict = rule.to_dict(policy=False)
 

f5lbaasdriver/v2/bigip/test/test_driver_v2.py

@@ -46,6 +46,9 @@ def attached_to_loadbalancer(self):
     def to_dict(self, **kwargs):
         return self.__dict__
 
+    def to_api_dict(self):
+        return self.to_dict()
+
 
 class FakeListener(FakeBaseObj):
     def __init__(self, id='test_obj_id', attached_to_lb=True):