From 43a0e3476d94eccd16f7c90d1fb23aea10574a25 Mon Sep 17 00:00:00 2001 From: Justin Pettit Date: Sat, 12 Sep 2009 16:40:03 -0700 Subject: [PATCH] xenserver: Have xen-bugtool collect OVS logs The original xen-bugtool did not collect any OVS logs. Now that more logging is moving from /var/log/messages to ovs-vswitchd's and ovs-brcompatd's private log files, we should include them in the information collected for bug reports. --- xenserver/usr_sbin_xen-bugtool | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xenserver/usr_sbin_xen-bugtool b/xenserver/usr_sbin_xen-bugtool index 0c976010..44661259 100755 --- a/xenserver/usr_sbin_xen-bugtool +++ b/xenserver/usr_sbin_xen-bugtool @@ -278,6 +278,7 @@ CAP_SYSTEM_SERVICES = 'system-services' CAP_TAPDISK_LOGS = 'tapdisk-logs' CAP_VNCTERM = 'vncterm' CAP_VSWITCH_CONFIG = 'vswitch-config' +CAP_VSWITCH_LOGS = 'vswitch-logs' CAP_VSWITCH_STATUS = 'vswitch-status' CAP_WLB = 'wlb' CAP_X11_LOGS = 'X11' @@ -345,6 +346,7 @@ cap(CAP_TAPDISK_LOGS, PII_NO, max_size=64*KB) cap(CAP_VNCTERM, PII_MAYBE, checked = False) cap(CAP_VSWITCH_CONFIG, PII_YES, min_size=0, max_size=20*MB) +cap(CAP_VSWITCH_LOGS, PII_YES, max_size=20*MB) cap(CAP_VSWITCH_STATUS, PII_YES, max_size=19*KB, max_time=30) cap(CAP_WLB, PII_NO, max_size=3*MB, @@ -494,7 +496,7 @@ def main(argv = None): CAP_NETWORK_CONFIG, CAP_NETWORK_STATUS, CAP_PROCESS_LIST, CAP_HIGH_AVAILABILITY, CAP_PAM, CAP_PERSISTENT_STATS, CAP_MULTIPATH, CAP_SYSTEM_LOGS, CAP_SYSTEM_SERVICES, CAP_TAPDISK_LOGS, - CAP_VNCTERM, CAP_VSWITCH_CONFIG, CAP_VSWITCH_STATUS, CAP_WLB, + CAP_VNCTERM, CAP_VSWITCH_CONFIG, CAP_VSWITCH_LOGS, CAP_VSWITCH_STATUS, CAP_WLB, CAP_X11_LOGS, CAP_X11_AUTH, CAP_XAPI_DEBUG, CAP_XAPI_SUBPROCESS, CAP_XENSERVER_CONFIG, CAP_XENSERVER_DOMAINS, CAP_XENSERVER_DATABASES, CAP_XENSERVER_INSTALL, CAP_XENSERVER_LOGS, CAP_XEN_INFO, CAP_XHA_LIVESET, CAP_YUM] @@ -709,6 +711,13 @@ exclude those logs from the archive. file_output(CAP_VSWITCH_CONFIG, [OVS_VSWITCH_CONF]) + file_output(CAP_VSWITCH_LOGS, + [ VAR_LOG_DIR + x for x in + [ 'ovs-brcompatd.log', 'ovs-vswitchd.log', 'vswitch-cfg-update.log', 'vswitch-xsplugin.log' ] + + [ f % n for n in range(1, 20) \ + for f in ['ovs-brcompatd.log.%d', 'ovs-brcompatd.log.%d.gz', + 'ovs-vswitchd.log.%d', 'ovs-vswitchd.log.%d.gz']]]) + cmd_output(CAP_VSWITCH_STATUS, [OVS_DPCTL, 'show']) tree_output(CAP_VSWITCH_STATUS, VSWITCH_CORE_DIR) for d in dp_list(): -- 2.30.2