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

Updated mininet/util.py to support better resource setting semantics and protected with try block

Browse Source
This commit is contained in:
Brian O'Connor
2013-09-12 13:49:40 -07:00
parent 501a164eba
commit 4ea0c0936d
1 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/util.py
+36 -29
View File
@@ -1,6 +1,6 @@
"Utility functions for Mininet." "Utility functions for Mininet."
from mininet.log import output, info, error, warn from mininet.log import output, info, error, warn, debug
from time import sleep from time import sleep
from resource import getrlimit, setrlimit, RLIMIT_NPROC, RLIMIT_NOFILE from resource import getrlimit, setrlimit, RLIMIT_NPROC, RLIMIT_NOFILE
@@ -361,16 +361,17 @@ def sysctlTestAndSet( name, limit ):
if '/' not in name: if '/' not in name:
name = '/proc/sys/' + name.replace( '.', '/' ) name = '/proc/sys/' + name.replace( '.', '/' )
#read limit #read limit
f = open( name, 'r+' ) with open( name, 'r' ) as readFile:
oldLimit = f.readline() oldLimit = readFile.readline()
if type( limit ) is int: if type( limit ) is int:
#compare integer limits before overriding #compare integer limits before overriding
if int( oldLimit ) < limit: if int( oldLimit ) < limit:
f.write( "%d" % limit ) with open( name, 'w' ) as writeFile:
else: writeFile.write( "%d" % limit )
#overwrite non-integer limits else:
f.write( limit ) #overwrite non-integer limits
f.close() with open( name, 'w' ) as writeFile:
writeFile.write( limit )
def rlimitTestAndSet( name, limit ): def rlimitTestAndSet( name, limit ):
"Helper function to set rlimits" "Helper function to set rlimits"
@@ -381,24 +382,30 @@ def rlimitTestAndSet( name, limit ):
def fixLimits(): def fixLimits():
"Fix ridiculously small resource limits." "Fix ridiculously small resource limits."
rlimitTestAndSet( RLIMIT_NPROC, 8192 ) debug( "*** Setting resource limits\n" )
rlimitTestAndSet( RLIMIT_NOFILE, 16384 ) try:
#Increase open file limit rlimitTestAndSet( RLIMIT_NPROC, 8192 )
sysctlTestAndSet( 'fs.file-max', 10000 ) rlimitTestAndSet( RLIMIT_NOFILE, 16384 )
#Increase network buffer space #Increase open file limit
sysctlTestAndSet( 'net.core.wmem_max', 16777216 ) sysctlTestAndSet( 'fs.file-max', 10000 )
sysctlTestAndSet( 'net.core.rmem_max', 16777216 ) #Increase network buffer space
sysctlTestAndSet( 'net.ipv4.tcp_rmem', '10240 87380 16777216' ) sysctlTestAndSet( 'net.core.wmem_max', 16777216 )
sysctlTestAndSet( 'net.ipv4.tcp_wmem', '10240 87380 16777216' ) sysctlTestAndSet( 'net.core.rmem_max', 16777216 )
sysctlTestAndSet( 'net.core.netdev_max_backlog', 5000 ) sysctlTestAndSet( 'net.ipv4.tcp_rmem', '10240 87380 16777216' )
#Increase arp cache size sysctlTestAndSet( 'net.ipv4.tcp_wmem', '10240 87380 16777216' )
sysctlTestAndSet( 'net.ipv4.neigh.default.gc_thresh1', 4096 ) sysctlTestAndSet( 'net.core.netdev_max_backlog', 5000 )
sysctlTestAndSet( 'net.ipv4.neigh.default.gc_thresh2', 8192 ) #Increase arp cache size
sysctlTestAndSet( 'net.ipv4.neigh.default.gc_thresh3', 16384 ) sysctlTestAndSet( 'net.ipv4.neigh.default.gc_thresh1', 4096 )
#Increase routing table size sysctlTestAndSet( 'net.ipv4.neigh.default.gc_thresh2', 8192 )
sysctlTestAndSet( 'net.ipv4.route.max_size', 32768 ) sysctlTestAndSet( 'net.ipv4.neigh.default.gc_thresh3', 16384 )
#Increase number of PTYs for nodes #Increase routing table size
sysctlTestAndSet( 'kernel.pty.max', 20000 ) sysctlTestAndSet( 'net.ipv4.route.max_size', 32768 )
#Increase number of PTYs for nodes
sysctlTestAndSet( 'kernel.pty.max', 20000 )
assert False
except:
warn( "*** Error setting resource limits. "
"Mininet's performance may be affected.\n" )
def mountCgroups(): def mountCgroups():
"Make sure cgroups file system is mounted" "Make sure cgroups file system is mounted"