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

fixing: ifupdown2 (subprocesses) lives on after control-c + Parsing cmd string with shlex.split instead of string.split

Ticket: CM-9905
Reviewed By: CCR-4363
Testing Done: ^C ifupdown2 while ifreload-ing interfaces test files (~500ifaces) + smoke tests
This commit is contained in:
Julien Fortin
2016-04-10 18:55:56 +02:00
parent 74d8271b1f
commit a4a53f4b45
7 changed files with 71 additions and 9 deletions

View File

@@ -6,6 +6,10 @@
import os
import glob
import shlex
import signal
from ifupdown.utils import utils
from collections import OrderedDict
from utilsbase import *
from systemutils import *
@@ -495,9 +499,11 @@ class iproute2(utilsBase):
cmd = 'bridge fdb show brport %s' % dev
cur_peers = []
try:
ps = subprocess.Popen((cmd).split(), stdout=subprocess.PIPE, close_fds=True)
ps = subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE, close_fds=True)
utils.enable_subprocess_signal_forwarding(ps, signal.SIGINT)
output = subprocess.check_output(('grep', '00:00:00:00:00:00'), stdin=ps.stdout)
ps.wait()
utils.disable_subprocess_signal_forwarding(signal.SIGINT)
try:
ppat = re.compile('\s+dst\s+(\d+.\d+.\d+.\d+)\s+')
for l in output.split('\n'):
@@ -510,6 +516,8 @@ class iproute2(utilsBase):
except subprocess.CalledProcessError as e:
if e.returncode != 1:
self.logger.error(str(e))
finally:
utils.disable_subprocess_signal_forwarding(signal.SIGINT)
return cur_peers