xenserver: Collect /proc/slabinfo in a Server Status Report

/proc/slabinfo gives information about memory usage
as slab level and can be used to diagnose memory issues
on memory-limited systems

diff --git a/debian/copyright.in b/debian/copyright.in
index 3bd68f1e43f39624f51cb2e4465b1df057f54f5e..d7ca64af68e8b2f72807dc7b6b3436ee5ad06cea 100644 (file)
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -53,6 +53,7 @@ License:
   GNU Lesser General Public Licence version 2.1.
 
        debian/ovs-bugtool
+       xenserver/etc_xensource_bugtool_kernel-info_openvswitch.xml [*]
        xenserver/etc_xensource_bugtool_network-status_openvswitch.xml [*]
        xenserver/usr_share_openvswitch_scripts_xen-bugtool-tc-class-show [*]
 

diff --git a/xenserver/README b/xenserver/README
index 3e63374c7a8d723fb793287614cbb5ab61a93ee4..3f2677602ebf4d6f096d58cf5e32259dc70c02b7 100644 (file)
--- a/xenserver/README
+++ b/xenserver/README
@@ -40,6 +40,11 @@ files are:
         Open vSwitch. Runs
         usr_share_openvswitch_scripts_xen-bugtool-tc-class-show.
 
+    etc_xensource_bugtool_kernel-info_openvswitch.xml
+
+        xen-bugtool extension to collect kernel information relevant to
+        Open vSwitch.
+
     etc_xensource_scripts_vif
 
         Open vSwitch-aware replacement for Citrix script of the same name.

diff --git a/xenserver/automake.mk b/xenserver/automake.mk
index 0a44797d7d23adb15d7b43b0b788d98a3d52203b..225386b90cee138355dadb77cc2d5048241bce09 100644 (file)
--- a/xenserver/automake.mk
+++ b/xenserver/automake.mk
@@ -16,6 +16,7 @@ EXTRA_DIST += \
        xenserver/etc_profile.d_openvswitch.sh \
        xenserver/etc_xapi.d_plugins_openvswitch-cfg-update \
        xenserver/etc_xensource_bugtool_network-status_openvswitch.xml \
+       xenserver/etc_xensource_bugtool_kernel-info_openvswitch.xml \
        xenserver/etc_xensource_scripts_vif \
        xenserver/openvswitch-xen.spec \
        xenserver/opt_xensource_libexec_InterfaceReconfigure.py \

diff --git a/xenserver/etc_xensource_bugtool_kernel-info_openvswitch.xml b/xenserver/etc_xensource_bugtool_kernel-info_openvswitch.xml
new file mode 100644 (file)
index 0000000..67d8b88
--- /dev/null
+++ b/xenserver/etc_xensource_bugtool_kernel-info_openvswitch.xml
@@ -0,0 +1,23 @@
+<!--
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of version 2.1 of the GNU Lesser General Public
+ License as published by the Free Software Foundation.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ USA.
+
+ Copyright (C) 2011 Nicira Networks.
+-->
+
+<collect>
+  <files>
+    /proc/slabinfo
+  </files>
+</collect>

diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec
index 6516086f4b752849ca60622851a356d65fa290f9..7a2e1761d331f06f12064c519d5f40db10094362 100644 (file)
--- a/xenserver/openvswitch-xen.spec
+++ b/xenserver/openvswitch-xen.spec
@@ -83,6 +83,9 @@ install -m 755 xenserver/etc_xapi.d_plugins_openvswitch-cfg-update \
 install -d -m 755 $RPM_BUILD_ROOT/etc/xensource/bugtool/network-status
 install -m 644 xenserver/etc_xensource_bugtool_network-status_openvswitch.xml \
          $RPM_BUILD_ROOT/etc/xensource/bugtool/network-status/openvswitch.xml
+install -d -m 755 $RPM_BUILD_ROOT/etc/xensource/bugtool/kernel-info
+install -m 644 xenserver/etc_xensource_bugtool_kernel-info_openvswitch.xml \
+         $RPM_BUILD_ROOT/etc/xensource/bugtool/kernel-info/openvswitch.xml
 install -d -m 755 $RPM_BUILD_ROOT/usr/share/openvswitch/scripts
 install -m 644 vswitchd/vswitch.ovsschema \
          $RPM_BUILD_ROOT/usr/share/openvswitch/vswitch.ovsschema
@@ -313,6 +316,7 @@ fi
 /etc/init.d/openvswitch-xapi-update
 /etc/xapi.d/plugins/openvswitch-cfg-update
 /etc/xensource/bugtool/network-status/openvswitch.xml
+/etc/xensource/bugtool/kernel-info/openvswitch.xml
 /etc/logrotate.d/openvswitch
 /etc/profile.d/openvswitch.sh
 /usr/share/openvswitch/python/ovs/__init__.py