openstack
/
ovn-bgp-agent
Code Issues Proposed changes

Merge "Protect from NDB issue 967"

This commit is contained in:
Zuul 2022-07-20 13:13:38 +00:00 committed by Gerrit Code Review
parent 255e59180e 8fc52c3c10
commit 15fc8e35d6
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ovn_bgp_agent/privileged/linux_net.py
View File

@ -182,7 +182,13 @@ def rule_create(rule):
ndb.rules[rule]
except KeyError:
LOG.debug("Creating ip rule with: %s", rule)
ndb.rules.create(rule).commit()
try:
ndb.rules.create(rule).commit()
except ValueError:
# FIXME: There is an issue with NDB and ip rules
# Remove try/except once the next is fixed:
# https://github.com/svinota/pyroute2/issues/967
pass
@ovn_bgp_agent.privileged.default.entrypoint
@ -193,6 +199,11 @@ def rule_delete(rule):
LOG.debug("Deleting ip rule with: %s", rule)
except KeyError:
LOG.debug("Rule already deleted: %s", rule)
except ValueError:
# FIXME: There is an issue with NDB and ip rules
# Remove except once the next is fixed:
# https://github.com/svinota/pyroute2/issues/967
pass
@ovn_bgp_agent.privileged.default.entrypoint