From 87bc5f93e609e6e0a579443c5083951e3b8260ac Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sat, 9 Oct 2021 19:07:41 -0400 Subject: [PATCH] Avoid duplicate runs of MTU validator --- .../pvcnoded/objects/VXNetworkInstance.py | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/node-daemon/pvcnoded/objects/VXNetworkInstance.py b/node-daemon/pvcnoded/objects/VXNetworkInstance.py index 5add3727..40c72d2d 100644 --- a/node-daemon/pvcnoded/objects/VXNetworkInstance.py +++ b/node-daemon/pvcnoded/objects/VXNetworkInstance.py @@ -77,13 +77,7 @@ class VXNetworkInstance(object): def init_bridged(self): self.old_description = None self.description = None - - try: - self.vx_mtu = self.zkhandler.read(('network.mtu', self.vni)) - except Exception: - self.vx_mtu = None - - self.validateNetworkMTU() + self.vx_mtu = None # Zookeper handlers for changed states @self.zkhandler.zk_conn.DataWatch(self.zkhandler.schema.path('network', self.vni)) @@ -111,7 +105,8 @@ class VXNetworkInstance(object): self.validateNetworkMTU() self.updateNetworkMTU() except Exception: - pass + self.validateNetworkMTU() + self.updateNetworkMTU() self.createNetworkBridged() @@ -131,13 +126,7 @@ class VXNetworkInstance(object): self.dhcp4_flag = self.zkhandler.read(('network.ip4.dhcp', self.vni)) self.dhcp4_start = self.zkhandler.read(('network.ip4.dhcp_start', self.vni)) self.dhcp4_end = self.zkhandler.read(('network.ip4.dhcp_end', self.vni)) - - try: - self.vx_mtu = self.zkhandler.read(('network.mtu', self.vni)) - except Exception: - self.vx_mtu = None - - self.validateNetworkMTU() + self.vx_mtu = None self.nftables_netconf_filename = '{}/networks/{}.nft'.format(self.config['nft_dynamic_directory'], self.vni) self.firewall_rules = [] @@ -257,7 +246,8 @@ add rule inet filter forward ip6 saddr {netaddr6} counter jump {vxlannic}-out self.validateNetworkMTU() self.updateNetworkMTU() except Exception: - pass + self.validateNetworkMTU() + self.updateNetworkMTU() @self.zkhandler.zk_conn.DataWatch(self.zkhandler.schema.path('network.ip6.network', self.vni)) def watch_network_ip6_network(data, stat, event=''):