x/vmware-nsx
Code Issues Proposed changes

NSXv3: Continue HM delete in case of inconsistence

Browse Source 
If there is any inconsistence between neutron db and nsx backend,
don't raise exception and continue withg healthmonitor deletion.

Change-Id: I5929b09b62cf71ffff19ca4e35bf933906c993cf
This commit is contained in:
Tong Liu 2017-12-18 14:45:08 -08:00
parent 1f8492abd9
commit 101634738e
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vmware_nsx/services/lbaas/nsx_v3/healthmonitor_mgr.py
View File

@ -117,21 +117,20 @@ class EdgeHealthMonitorManager(base_mgr.Nsxv3LoadbalancerBaseManager):
try:
pool_client.remove_monitor_from_pool(lb_pool_id,
lb_monitor_id)
except nsxlib_exc.ManagerError:
self.lbv2_driver.health_monitor.failed_completion(
context, hm)
msg = _('Failed to remove monitor %(monitor)s from pool '
'%(pool)s') % {'monitor': lb_monitor_id,
'pool': lb_pool_id}
raise n_exc.BadRequest(resource='lbaas-hm', msg=msg)
except nsxlib_exc.ManagerError as exc:
LOG.error('Failed to remove monitor %(monitor)s from pool '
'%(pool)s with exception from nsx %(exc)s)',
{'monitor': lb_monitor_id,
'pool': lb_pool_id,
'exc': exc})
try:
monitor_client.delete(lb_monitor_id)
except nsxlib_exc.ManagerError:
self.lbv2_driver.health_monitor.failed_completion(
context, hm)
msg = _('Failed to delete monitor %(monitor)s from '
'backend') % {'monitor': lb_monitor_id}
raise n_exc.BadRequest(resource='lbaas-hm', msg=msg)
except nsxlib_exc.ManagerError as exc:
LOG.error('Failed to delete monitor %(monitor)s from '
'backend with exception %(exc)s',
{'monitor': lb_monitor_id,
'exc': exc})
nsx_db.delete_nsx_lbaas_monitor_binding(context.session, lb_id,
pool_id, hm.id)
self.lbv2_driver.health_monitor.successful_completion(