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

Workaround for cgdelete deleting cgroup but returning error

Browse Source 
fixes #513
This commit is contained in:
Bob Lantz
2015-10-22 16:34:05 -07:00
parent d254d7496c
commit 7c6d645a0a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/node.py
+4 -2
View File
@@ -681,7 +681,9 @@ class CPULimitedHost( Host ):
"Clean up our cgroup" "Clean up our cgroup"
# info( '*** deleting cgroup', self.cgroup, '\n' ) # info( '*** deleting cgroup', self.cgroup, '\n' )
_out, _err, exitcode = errRun( 'cgdelete -r ' + self.cgroup ) _out, _err, exitcode = errRun( 'cgdelete -r ' + self.cgroup )
return exitcode == 0 # success condition # Sometimes cgdelete returns a resource busy error but still
# deletes the group; next attempt will give "no such file"
return exitcode == 0 or ( 'no such file' in _err.lower() )
def popen( self, *args, **kwargs ): def popen( self, *args, **kwargs ):
"""Return a Popen() object in node's namespace """Return a Popen() object in node's namespace
@@ -703,7 +705,7 @@ class CPULimitedHost( Host ):
def cleanup( self ): def cleanup( self ):
"Clean up Node, then clean up our cgroup" "Clean up Node, then clean up our cgroup"
super( CPULimitedHost, self ).cleanup() super( CPULimitedHost, self ).cleanup()
retry( retries=3, delaySecs=1, fn=self.cgroupDel ) retry( retries=3, delaySecs=.1, fn=self.cgroupDel )
_rtGroupSched = False # internal class var: Is CONFIG_RT_GROUP_SCHED set? _rtGroupSched = False # internal class var: Is CONFIG_RT_GROUP_SCHED set?