mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

vrf: check for cgroup existance before creating and deleting them

Browse Source 
Ticket: CM-9776
Reviewed By: dsa
Testing Done: tested repeated up and downs
This commit is contained in:
Roopa Prabhu
2016-03-10 11:29:30 -08:00
parent 2df6a60f74
commit d1e1c43bcf
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
addons/vrf.py
View File

@@ -269,7 +269,8 @@ class vrf(moduleBase):
def _create_cgroup(self, ifaceobj):
try:
self.exec_command('cgcreate -g l3mdev:%s' %ifaceobj.name)
if not os.path.exists('/sys/fs/cgroup/l3mdev/%s' %ifaceobj.name):
self.exec_command('cgcreate -g l3mdev:%s' %ifaceobj.name)
self.exec_command('cgset -r l3mdev.master-device=%s %s'
%(ifaceobj.name, ifaceobj.name))
except Exception, e:
@@ -333,9 +334,10 @@ class vrf(moduleBase):
def _delete_cgroup(self, ifaceobj):
try:
self.exec_command('cgdelete -g l3mdev:%s' %ifaceobj.name)
if os.path.exists('/sys/fs/cgroup/l3mdev/%s' %ifaceobj.name):
self.exec_command('cgdelete -g l3mdev:%s' %ifaceobj.name)
except Exception, e:
self.log_warn('%s: cgroup create failed (%s)\n'
self.log_warn('%s: cgroup delete failed (%s)\n'
%(ifaceobj.name, str(e)), ifaceobj)
def _down_vrf_dev(self, ifaceobj, vrf_table):