forked from Mirror/frr
tests: collect support bundle data in parallel, fix bugs
Speedup (large topo): OLD: ~6 minutes NEW: ~1 second. (when paired with common_config.py changes) - Collect each "proc" support in parallel - For each "proc" only call vtysh once with all commands Bug fixes: - output was broken, a dump of python "repr" format of str. Signed-off-by: Christian Hopps <chopps@labn.net>
This commit is contained in:
Christian Hopps
parent
744bc17db5
commit
5417cc2de3
|
|
@ -1,117 +1,89 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
|
#
|
||||||
|
# Copyright (c) 2021, LabN Consulting, L.L.C.
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License
|
||||||
|
# as published by the Free Software Foundation; either version 2
|
||||||
|
# of the License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License along
|
||||||
|
# with this program; see the file COPYING; if not, write to the Free Software
|
||||||
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
#
|
||||||
|
|
||||||
########################################################
|
########################################################
|
||||||
### Python Script to generate the FRR support bundle ###
|
### Python Script to generate the FRR support bundle ###
|
||||||
########################################################
|
########################################################
|
||||||
|
import argparse
|
||||||
|
import logging
|
||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
import datetime
|
import tempfile
|
||||||
|
|
||||||
ETC_DIR = "/etc/frr/"
|
def open_with_backup(path):
|
||||||
LOG_DIR = "/var/log/frr/"
|
if os.path.exists(path):
|
||||||
SUCCESS = 1
|
print("Making backup of " + path)
|
||||||
FAIL = 0
|
subprocess.check_call("mv {0} {0}.prev".format(path))
|
||||||
|
return open(path, "w")
|
||||||
|
|
||||||
inputFile = ETC_DIR + "support_bundle_commands.conf"
|
def main():
|
||||||
|
parser = argparse.ArgumentParser()
|
||||||
|
parser.add_argument("-c", "--config", default="/etc/frr/support_bundle_commands.conf", help="input config")
|
||||||
|
parser.add_argument("-l", "--log-dir", default="/var/log/frr", help="directory for logfiles")
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
# Create the output file name
|
collecting = False # file format has sentinels (seem superfluous)
|
||||||
def createOutputFile(procName):
|
proc_cmds = {}
|
||||||
fileName = procName + "_support_bundle.log"
|
proc = None
|
||||||
oldFile = LOG_DIR + fileName
|
temp = None
|
||||||
cpFileCmd = "cp " + oldFile + " " + oldFile + ".prev"
|
|
||||||
rmFileCmd = "rm -rf " + oldFile
|
|
||||||
print("Making backup of " + oldFile)
|
|
||||||
os.system(cpFileCmd)
|
|
||||||
print("Removing " + oldFile)
|
|
||||||
os.system(rmFileCmd)
|
|
||||||
return fileName
|
|
||||||
|
|
||||||
|
# Collect all the commands for each daemon
|
||||||
# Open the output file for this process
|
|
||||||
def openOutputFile(fileName):
|
|
||||||
crt_file_cmd = LOG_DIR + fileName
|
|
||||||
print(crt_file_cmd)
|
|
||||||
try:
|
try:
|
||||||
outputFile = open(crt_file_cmd, "w")
|
for line in open(args.config):
|
||||||
return outputFile
|
line = line.rstrip()
|
||||||
except IOError:
|
if len(line) == 0 or line[0] == "#":
|
||||||
return ()
|
continue
|
||||||
|
|
||||||
|
cmd_line = line.split(":")
|
||||||
# Close the output file for this process
|
if cmd_line[0] == "PROC_NAME":
|
||||||
def closeOutputFile(f):
|
proc = cmd_line[1]
|
||||||
try:
|
temp = tempfile.NamedTemporaryFile("w+")
|
||||||
f.close()
|
collecting = False
|
||||||
return SUCCESS
|
elif cmd_line[0] == "CMD_LIST_START":
|
||||||
except IOError:
|
collecting = True
|
||||||
return FAIL
|
elif cmd_line[0] == "CMD_LIST_END":
|
||||||
|
collecting = False
|
||||||
|
temp.flush()
|
||||||
# Execute the command over vtysh and store in the
|
proc_cmds[proc] = open(temp.name)
|
||||||
# output file
|
temp.close()
|
||||||
def executeCommand(cmd, outputFile):
|
elif collecting:
|
||||||
cmd_exec_str = 'vtysh -c "' + cmd + '" '
|
temp.write(line + "\n")
|
||||||
try:
|
else:
|
||||||
cmd_output = subprocess.check_output(cmd_exec_str, shell=True)
|
print("Ignoring unexpected input " + line.rstrip())
|
||||||
try:
|
except IOError as error:
|
||||||
dateTime = datetime.datetime.now()
|
logging.fatal("Cannot read config file: %s: %s", args.config, str(error))
|
||||||
outputFile.write(">>[" + str(dateTime) + "]" + cmd + "\n")
|
|
||||||
outputFile.write(str(cmd_output))
|
|
||||||
outputFile.write(
|
|
||||||
"########################################################\n"
|
|
||||||
)
|
|
||||||
outputFile.write("\n")
|
|
||||||
except Exception as e:
|
|
||||||
print("Writing to output file Failed: ", e)
|
|
||||||
except subprocess.CalledProcessError as e:
|
|
||||||
dateTime = datetime.datetime.now()
|
|
||||||
outputFile.write(">>[" + str(dateTime) + "]" + cmd + "\n")
|
|
||||||
outputFile.write(e.output)
|
|
||||||
outputFile.write("########################################################\n")
|
|
||||||
outputFile.write("\n")
|
|
||||||
print("Error:" + e.output)
|
|
||||||
|
|
||||||
|
|
||||||
# Process the support bundle configuration file
|
|
||||||
# and call appropriate functions
|
|
||||||
def processConfFile():
|
|
||||||
|
|
||||||
lines = list()
|
|
||||||
outputFile = None
|
|
||||||
|
|
||||||
try:
|
|
||||||
with open(inputFile, "r") as supportBundleConfFile:
|
|
||||||
for l in supportBundleConfFile:
|
|
||||||
lines.append(l.rstrip())
|
|
||||||
except IOError:
|
|
||||||
print("conf file {} not present".format(inputFile))
|
|
||||||
return
|
return
|
||||||
|
|
||||||
for line in lines:
|
# Spawn a vtysh to fetch each set of commands
|
||||||
if len(line) == 0 or line[0] == "#":
|
procs = []
|
||||||
continue
|
for proc in proc_cmds:
|
||||||
|
ofn = os.path.join(args.log_dir, proc + "_support_bundle.log")
|
||||||
|
p = subprocess.Popen(
|
||||||
|
["/usr/bin/env", "vtysh", "-t"],
|
||||||
|
stdin=proc_cmds[proc],
|
||||||
|
stdout=open_with_backup(ofn),
|
||||||
|
stderr=subprocess.STDOUT,
|
||||||
|
)
|
||||||
|
procs.append(p)
|
||||||
|
|
||||||
cmd_line = line.split(":")
|
for p in procs:
|
||||||
if cmd_line[0] == "PROC_NAME":
|
p.wait()
|
||||||
outputFileName = createOutputFile(cmd_line[1])
|
|
||||||
if outputFileName:
|
|
||||||
print(outputFileName, "created for", cmd_line[1])
|
|
||||||
elif cmd_line[0] == "CMD_LIST_START":
|
|
||||||
outputFile = openOutputFile(outputFileName)
|
|
||||||
if outputFile:
|
|
||||||
print(outputFileName, "opened")
|
|
||||||
else:
|
|
||||||
print(outputFileName, "open failed")
|
|
||||||
return FAIL
|
|
||||||
elif cmd_line[0] == "CMD_LIST_END":
|
|
||||||
if closeOutputFile(outputFile):
|
|
||||||
print(outputFileName, "closed")
|
|
||||||
else:
|
|
||||||
print(outputFileName, "close failed")
|
|
||||||
else:
|
|
||||||
print("Execute:", cmd_line[0])
|
|
||||||
executeCommand(cmd_line[0], outputFile)
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
# Main Function
|
main()
|
||||||
processConfFile()
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue