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

Fix some timings and messages during failover

This commit is contained in:
Joshua Boniface 2018-09-24 14:38:54 -04:00
parent 0f9637cb69
commit 06ddc8df4c
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
router-daemon/pvcrd/RouterInstance.py
View File

@ -102,7 +102,7 @@ class RouterInstance():
if self.t_router[router].getname() != self.this_router: if self.t_router[router].getname() != self.this_router:
if self.t_router[router].getnetworkstate() != 'primary': if self.t_router[router].getnetworkstate() != 'primary':
zkhandler.writedata(self.zk_conn, { '/routers/{}/networkstate'.format(self.t_router[router].getname()): 'primary' }) zkhandler.writedata(self.zk_conn, { '/routers/{}/networkstate'.format(self.t_router[router].getname()): 'primary' })
time.sleep(1) time.sleep(2)
for network in self.s_network: for network in self.s_network:
self.s_network[network].removeAddress() self.s_network[network].removeAddress()

7
router-daemon/pvcrd/VXNetworkInstance.py
View File

@ -22,7 +22,6 @@
import os import os
import sys import sys
import time
import daemon_lib.ansiiprint as ansiiprint import daemon_lib.ansiiprint as ansiiprint
import daemon_lib.zkhandler as zkhandler import daemon_lib.zkhandler as zkhandler
@ -87,9 +86,9 @@ class VXNetworkInstance():
def createAddress(self): def createAddress(self):
if self.this_router.getnetworkstate() == 'primary': if self.this_router.getnetworkstate() == 'primary':
ansiiprint.echo('Creating gateway {} on interface {}'.format(self.ip_gateway, self.vni_dev), '', 'o') ansiiprint.echo('Creating gateway {} on interface {} (VNI {})'.format(self.ip_gateway, self.bridge_nic, self.vni), '', 'o')
common.run_os_command('ip address add {}/{} dev {}'.format(self.ip_gateway, self.ip_cidrnetmask, self.bridge_nic)) common.run_os_command('ip address add {}/{} dev {}'.format(self.ip_gateway, self.ip_cidrnetmask, self.bridge_nic))
common.run_os_command('arping -A -c1 -I {} {}'.format(self.bridge_nic, self.ip_gateway), background=True) common.run_os_command('arping -A -c2 -I {} {}'.format(self.bridge_nic, self.ip_gateway), background=True)
def removeNetwork(self): def removeNetwork(self):
ansiiprint.echo('Removing VNI {} device on interface {}'.format(self.vni, self.vni_dev), '', 'o') ansiiprint.echo('Removing VNI {} device on interface {}'.format(self.vni, self.vni_dev), '', 'o')
@ -100,5 +99,5 @@ class VXNetworkInstance():
common.run_os_command('ip link delete {}'.format(self.vxlan_nic)) common.run_os_command('ip link delete {}'.format(self.vxlan_nic))
def removeAddress(self): def removeAddress(self):
ansiiprint.echo('Removing gateway {} from interface {}'.format(self.ip_gateway, self.vni_dev), '', 'o') ansiiprint.echo('Removing gateway {} from interface {} (VNI {})'.format(self.ip_gateway, self.bridge_nic, self.vni), '', 'o')
common.run_os_command('ip address delete {}/{} dev {}'.format(self.ip_gateway, self.ip_cidrnetmask, self.bridge_nic)) common.run_os_command('ip address delete {}/{} dev {}'.format(self.ip_gateway, self.ip_cidrnetmask, self.bridge_nic))