parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Revert "Avoid duplicate runs of MTU validator" 

This reverts commit 56021c443a.
This commit is contained in:
Joshua Boniface 2021-10-09 19:11:42 -04:00
parent caead02b2a
commit 7ed8ef179c
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
node-daemon/pvcnoded/objects/VXNetworkInstance.py
View File

@ -77,8 +77,14 @@ class VXNetworkInstance(object):
def init_bridged(self): def init_bridged(self):
self.old_description = None self.old_description = None
self.description = None self.description = None
try:
self.vx_mtu = self.zkhandler.read(('network.mtu', self.vni))
except Exception:
self.vx_mtu = None self.vx_mtu = None
self.validateNetworkMTU()
# Zookeper handlers for changed states # Zookeper handlers for changed states
@self.zkhandler.zk_conn.DataWatch(self.zkhandler.schema.path('network', self.vni)) @self.zkhandler.zk_conn.DataWatch(self.zkhandler.schema.path('network', self.vni))
def watch_network_description(data, stat, event=''): def watch_network_description(data, stat, event=''):
@ -105,8 +111,7 @@ class VXNetworkInstance(object):
self.validateNetworkMTU() self.validateNetworkMTU()
self.updateNetworkMTU() self.updateNetworkMTU()
except Exception: except Exception:
self.validateNetworkMTU() pass
self.updateNetworkMTU()
self.createNetworkBridged() self.createNetworkBridged()
@ -126,8 +131,14 @@ class VXNetworkInstance(object):
self.dhcp4_flag = self.zkhandler.read(('network.ip4.dhcp', self.vni)) 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_start = self.zkhandler.read(('network.ip4.dhcp_start', self.vni))
self.dhcp4_end = self.zkhandler.read(('network.ip4.dhcp_end', 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.vx_mtu = None
self.validateNetworkMTU()
self.nftables_netconf_filename = '{}/networks/{}.nft'.format(self.config['nft_dynamic_directory'], self.vni) self.nftables_netconf_filename = '{}/networks/{}.nft'.format(self.config['nft_dynamic_directory'], self.vni)
self.firewall_rules = [] self.firewall_rules = []
@ -246,8 +257,7 @@ add rule inet filter forward ip6 saddr {netaddr6} counter jump {vxlannic}-out
self.validateNetworkMTU() self.validateNetworkMTU()
self.updateNetworkMTU() self.updateNetworkMTU()
except Exception: except Exception:
self.validateNetworkMTU() pass
self.updateNetworkMTU()
@self.zkhandler.zk_conn.DataWatch(self.zkhandler.schema.path('network.ip6.network', self.vni)) @self.zkhandler.zk_conn.DataWatch(self.zkhandler.schema.path('network.ip6.network', self.vni))
def watch_network_ip6_network(data, stat, event=''): def watch_network_ip6_network(data, stat, event=''):