x/vmware-nsx
Code Issues Proposed changes

Skip reporting of non-octavia loadbalancers

Browse Source 
Octavia status and statistics update can fail if the loadbalancer
resources isnt in the octavia DB.
In additon - exiting statistics entries can fail the octavia migration.
This patch verifies that the driver will not send statuses and statistics
updated on objects not in the DB.

Change-Id: I9fd36387b8723ba044086fa60022ef8090ec1b1d
This commit is contained in:
asarfaty 2021-02-02 09:46:34 +02:00 committed by Adit Sarfaty
parent ce8718de8d
commit 1fcd86e9a0
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vmware_nsx/services/lbaas/nsx_p/implementation/listener_mgr.py
View File

@ -416,7 +416,6 @@ def stats_getter(context, core_plugin, ignore_list=None):
# Go over each virtual server in the response # Go over each virtual server in the response
for vs in rsp.get('virtual_servers', []): for vs in rsp.get('virtual_servers', []):
# look up the virtual server in the DB
if vs.get('statistics'): if vs.get('statistics'):
vs_stats = vs['statistics'] vs_stats = vs['statistics']
stats = copy.copy(lb_const.LB_EMPTY_STATS) stats = copy.copy(lb_const.LB_EMPTY_STATS)

29
vmware_nsx/services/lbaas/octavia/octavia_driver.py
View File

@ -573,6 +573,21 @@ class NSXOctaviaDriverEndpoint(driver_lib.DriverLibrary):
status_socket, stats_socket, **kwargs) status_socket, stats_socket, **kwargs)
self.repositories = repositories.Repositories() self.repositories = repositories.Repositories()
def _removed_not_in_db(self, status, status_type, db_type):
if not status.get(status_type):
return
fixed_data = []
for obj in status[status_type]:
db_rep = getattr(self.repositories, db_type)
db_obj = db_rep.get(self.db_session, id=obj['id'])
if db_obj:
fixed_data.append(obj)
else:
LOG.warning("Skipping update of %s %s - not in DB",
db_type, obj['id'])
status[status_type] = fixed_data
@log_helpers.log_method_call @log_helpers.log_method_call
def update_loadbalancer_status(self, ctxt, status): def update_loadbalancer_status(self, ctxt, status):
# refresh the driver lib session # refresh the driver lib session
@ -602,6 +617,14 @@ class NSXOctaviaDriverEndpoint(driver_lib.DriverLibrary):
"find the ID of member %s of pool %s", "find the ID of member %s of pool %s",
member['member_ip'], member['pool_id']) member['member_ip'], member['pool_id'])
status['members'] = fixed_members status['members'] = fixed_members
# Remove resources that are missing from the octavia DB. This could be
# a result of old/other deployments or neutron-lbaas loadbalancers not
# yet migrated to octavia
self._removed_not_in_db(status, 'loadbalancers', 'load_balancer')
self._removed_not_in_db(status, 'listeners', 'listener')
self._removed_not_in_db(status, 'pools', 'pool')
try: try:
return super(NSXOctaviaDriverEndpoint, return super(NSXOctaviaDriverEndpoint,
self).update_loadbalancer_status(status) self).update_loadbalancer_status(status)
@ -613,6 +636,12 @@ class NSXOctaviaDriverEndpoint(driver_lib.DriverLibrary):
def update_listener_statistics(self, ctxt, statistics): def update_listener_statistics(self, ctxt, statistics):
# refresh the driver lib session # refresh the driver lib session
self.db_session = db_apis.get_session() self.db_session = db_apis.get_session()
# Remove listeners that are missing from the octavia DB. This could be
# a result of old/other deployments or neutron-lbaas loadbalancers not
# yet migrated to octavia
self._removed_not_in_db(statistics, 'listeners', 'listener')
if not statistics.get('listeners'):
return
try: try:
return super(NSXOctaviaDriverEndpoint, return super(NSXOctaviaDriverEndpoint,
self).update_listener_statistics(statistics) self).update_listener_statistics(statistics)