lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Increase createLink retry count

Browse Source 
Was seeing occasional errors with tests run back-to-back.
This commit is contained in:
Brandon Heller
2010-01-03 02:43:30 -08:00
parent fcf6a16f3d
commit ac65ea3ff3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/util.py
+5 -3
View File
@@ -80,7 +80,7 @@ def move_intf(intf, node):
#lg.info(' output: %s\n' % output) #lg.info(' output: %s\n' % output)
links = node.cmd('ip link show') links = node.cmd('ip link show')
if not intf in links: if not intf in links:
lg.error('*** Error: move_intf: % not successfully moved to %s:\n' % lg.error('*** Error: move_intf: %s not successfully moved to %s:\n' %
(intf, node.name)) (intf, node.name))
return False return False
return True return True
@@ -152,6 +152,8 @@ def retry(n, retry_delay, fn, *args):
# delay between interface move checks in seconds # delay between interface move checks in seconds
MOVEINTF_DELAY = 0.0001 MOVEINTF_DELAY = 0.0001
CREATE_LINK_RETRIES = 10
def createLink(node1, node2): def createLink(node1, node2):
'''Create a link between nodes, making an interface for each. '''Create a link between nodes, making an interface for each.
@@ -162,9 +164,9 @@ def createLink(node1, node2):
intf2 = node2.newIntf() intf2 = node2.newIntf()
makeIntfPair(intf1, intf2) makeIntfPair(intf1, intf2)
if node1.inNamespace: if node1.inNamespace:
retry(3, MOVEINTF_DELAY, moveIntf, intf1, node1) retry(CREATE_LINK_RETRIES, MOVEINTF_DELAY, moveIntf, intf1, node1)
if node2.inNamespace: if node2.inNamespace:
retry(3, MOVEINTF_DELAY, moveIntf, intf2, node2) retry(CREATE_LINK_RETRIES, MOVEINTF_DELAY, moveIntf, intf2, node2)
node1.connection[intf1] = (node2, intf2) node1.connection[intf1] = (node2, intf2)
node2.connection[intf2] = (node1, intf1) node2.connection[intf2] = (node1, intf1)
return intf1, intf2 return intf1, intf2