projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb: Fix ovsdb-server crash when specifying nonexistent file.
[openvswitch]
/
xenserver
/
usr_sbin_xen-bugtool
diff --git
a/xenserver/usr_sbin_xen-bugtool
b/xenserver/usr_sbin_xen-bugtool
index 39df1c836ae5bd6e66fc362bc3e51168fb7c19a0..92fd27fcb6b518998e144bddd4b3ba2d93175b57 100755
(executable)
--- a/
xenserver/usr_sbin_xen-bugtool
+++ b/
xenserver/usr_sbin_xen-bugtool
@@
-120,8
+120,8
@@
HP_HPASMD_LOG = '/var/spool/compaq/hpasmd.log'
VAR_LOG_DIR = '/var/log/'
VNCTERM_CORE_DIR = '/var/xen/vncterm'
VSWITCH_CORE_DIR = '/var/xen/vswitch'
VAR_LOG_DIR = '/var/log/'
VNCTERM_CORE_DIR = '/var/xen/vncterm'
VSWITCH_CORE_DIR = '/var/xen/vswitch'
-OVS_VSWITCH_CONF = '/etc/ovs-vswitchd.conf'
-OVS_VSWITCH_DBCACHE = '/
etc/ovs-vswitch
.dbcache'
+OVS_VSWITCH_CONF = '/etc/ovs-vswitchd.conf
.db
'
+OVS_VSWITCH_DBCACHE = '/
var/xapi/network
.dbcache'
XENSOURCE_INVENTORY = '/etc/xensource-inventory'
OEM_CONFIG_DIR = '/var/xsconfig'
OEM_CONFIG_FILES_RE = re.compile(r'^.*xensource-inventory$')
XENSOURCE_INVENTORY = '/etc/xensource-inventory'
OEM_CONFIG_DIR = '/var/xsconfig'
OEM_CONFIG_FILES_RE = re.compile(r'^.*xensource-inventory$')
@@
-715,10
+715,11
@@
exclude those logs from the archive.
file_output(CAP_VSWITCH_LOGS,
[ VAR_LOG_DIR + x for x in
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' ] +
+ [ 'ovs-brcompatd.log', 'ovs-vswitchd.log', '
ovsdb-server.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',
[ 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']]])
+ 'ovs-vswitchd.log.%d', 'ovs-vswitchd.log.%d.gz',
+ 'ovsdb-server.log.%d', 'ovsdb-server.log.%d.gz']]])
cmd_output(CAP_VSWITCH_STATUS, [OVS_DPCTL, 'show'])
tree_output(CAP_VSWITCH_STATUS, VSWITCH_CORE_DIR)
cmd_output(CAP_VSWITCH_STATUS, [OVS_DPCTL, 'show'])
tree_output(CAP_VSWITCH_STATUS, VSWITCH_CORE_DIR)