Revision 7c6d645a mininet/node.py

View differences:

mininet/node.py
681 681
        "Clean up our cgroup"
682 682
        # info( '*** deleting cgroup', self.cgroup, '\n' )
683 683
        _out, _err, exitcode = errRun( 'cgdelete -r ' + self.cgroup )
684
        return exitcode == 0  # success condition
684
        # Sometimes cgdelete returns a resource busy error but still
685
        # deletes the group; next attempt will give "no such file"
686
        return exitcode == 0  or ( 'no such file' in _err.lower() )
685 687

  
686 688
    def popen( self, *args, **kwargs ):
687 689
        """Return a Popen() object in node's namespace
......
703 705
    def cleanup( self ):
704 706
        "Clean up Node, then clean up our cgroup"
705 707
        super( CPULimitedHost, self ).cleanup()
706
        retry( retries=3, delaySecs=1, fn=self.cgroupDel )
708
        retry( retries=3, delaySecs=.1, fn=self.cgroupDel )
707 709

  
708 710
    _rtGroupSched = False   # internal class var: Is CONFIG_RT_GROUP_SCHED set?
709 711

  

Also available in: Unified diff