- vhostmd

[PATCH] vhostmd.xml cleanup (xm-xl, support for kvm, etc...)
by Mike Latimer 13 Jun '14

13 Jun '14

The xl toolstack has replaced xm in recent versions of Xen. This patch updates action commands using xm syntax to xl syntax. In addition, support for non-Xen environments has been added by testing for a Xen specific file (/proc/xen/privcmd) and branching to a non-Xen command if not found. Summary of changes: - Support both Xen and non-Xen hypervisors (kvm) - Replace xm commands with xl commands - Document reserved characters in 'action' field - Syntax and legibility cleanup - Add /sbin and /bin to <path> - Use TotalCPUTime script from FC21 for non-Xen environments --- vhostmd.xml | 101 ++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 82 insertions(+), 19 deletions(-) diff --git a/vhostmd.xml b/vhostmd.xml index 6f56b58..daf7545 100644 --- a/vhostmd.xml +++ b/vhostmd.xml @@ -3,7 +3,7 @@  <vhostmd> @@ -28,52 +34,74 @@ within the vm element. <size unit="k">256</size> </disk> <update_period>5</update_period> - <path>/usr/bin:/usr/sbin:/usr/share/vhostmd/scripts</path> + <path>/usr/sbin:/sbin:/usr/bin:/bin:/usr/share/vhostmd/scripts</path> <transport>vbd</transport> -  </globals> <metrics> <metric type="string" context="host"> <name>HostName</name> - <action>virsh CONNECT hostname | tr -d '[:space:]'</action> + <action> + virsh CONNECT hostname | tr -d '[:space:]' + </action> </metric> <metric type="string" context="host"> <name>VirtualizationVendor</name> - <action>/bin/rpm -q --info xen | grep Vendor: | \ - awk '{print substr($0, index($0,$5)) }'</action> + <action> + [ -f /proc/xen/privcmd ] && RPM="xen" || RPM="libvirt"; \ + rpm -q --queryformat "%{VENDOR}\n" $RPM | sort -u | sed -e 's/<.*//' -e 's/ *$//' + </action> </metric> <metric type="string" context="host"> <name>VirtualizationProductInfo</name> - <action>xm info | gawk '/^xen_(major|minor|extra)/ {print $3}' | \ - tr -d . | tr '[:space:]' .</action> + <action> + [ -f /proc/xen/privcmd ] && xl info | \ + awk '/^xen_(major|minor|extra)/ {print $3}' | sed -e 'N;s/\n/./' -e 'N;s/\n//' || \ + rpm -q --queryformat "%{VERSION}-%{RELEASE}\n" libvirt | sort -u + </action> </metric> <metric type="uint32" context="host"> <name>TotalPhyCPUs</name> - <action>xm info | gawk '/^nr_cpus/ {print $3}'</action> + <action> + virsh nodeinfo | awk '/^CPU$s$/ {print $2}' + </action> </metric> <metric type="uint32" context="host"> <name>NumCPUs</name> - <action>xm info | gawk '/^nr_cpus/ {print $3}'</action> + <action> + virsh nodeinfo | awk '/^CPU$s$/ {print $2}' + </action> </metric> <metric type="uint64" context="host"> <name>TotalPhyMem</name> - <action>xm info | gawk '/^total_memory/ {print $3}'</action> + <action> + echo $((`virsh nodeinfo | awk '/^Memory/ {print $3}'` / 1024)) + </action> </metric> <metric type="uint64" context="host"> <name>UsedMem</name> - <action>echo "$((`xentop -b -i 1 | gawk '/Domain-0/ {print $5}'` / 1024))"</action> + <action> + [ -f /proc/xen/privcmd ] && echo "$((`xentop -b -i 1 | awk '/Domain-0/ {print $5}'` / 1024))" || \ + free | egrep -i '^[[:space:]]*(.*buffers/cache:)' | awk '{ printf "%d\n", $3/1024; }' + </action> </metric> <metric type="uint64" context="host"> <name>FreeMem</name> - <action>xm info | gawk '/^max_free_memory/ {print $3}'</action> + <action> + [ -f /proc/xen/privcmd ] && xl info | awk '/^free_memory/ {print $3}' || \ + free | egrep -i '^[[:space:]]*(.*buffers/cache:)' | awk '{ printf "%d\n", $4/1024; }' + </action> </metric> <metric type="uint64" context="host"> <name>PagedInMemory</name> - <action>echo "$((`vmstat -s | gawk '/pages paged in/ {print $1}'` / 1024))"</action> + <action> + vmstat -s | awk '/pages paged in/ {printf "%d\n", $1 / 1024 * $(getconf PAGESIZE) / 1024;}' + </action> </metric> <metric type="uint64" context="host"> <name>PagedOutMemory</name> - <action>echo "$((`vmstat -s | gawk '/pages paged out/ {print $1}'` / 1024))"</action> + <action> + vmstat -s | awk '/pages paged out/ {printf "%d\n", $1 / 1024 * $(getconf PAGESIZE) / 1024;}' + </action> </metric> <metric type="group" context="host"> <name>PageRates</name> @@ -83,13 +111,48 @@ within the vm element. </metric> <metric type="real64" context="host"> <name>TotalCPUTime</name> - <action>virsh CONNECT dominfo 0 | sed 's/: */:/' | \ - gawk -F: '/CPU time/ {print $2;}'</action> + <action> + [ -f /proc/xen/privcmd ] && xl list | awk '/^Domain-0/ {print $6}' || \ + awk ' + function user_hz( hz) + { + cmd = "getconf CLK_TCK"; + cmd | getline; + hz = $1; + close(cmd); + + return hz; + } + + BEGIN { + USER_HZ = user_hz(); + TotalCPUTime = 0; + + while ( 0 < ( getline < "/proc/stat" ) ) + { + if ( "cpu" == $1 ) + { + TotalCPUTime = $2 + $3 + $4; + + break; + } + } + close("/proc/stat"); + + #printf "USER_HZ = %d\n", USER_HZ | "cat 1>&2"; + TotalCPUTime /= USER_HZ; + printf "%f\n", TotalCPUTime; + + #close("cat 1>&2"); + }' + </action> </metric> <metric type="real64" context="vm"> <name>TotalCPUTime</name> - <action>virsh CONNECT dominfo NAME | sed 's/: */:/' | \ - gawk -F: '/CPU time/ {print $2;}'</action> + <action> + virsh CONNECT dominfo NAME | sed 's/: */:/' | \ + awk -F: '/CPU time/ {print $2;}' | sed 's/s//' + </action> </metric> </metrics> </vhostmd> -- 1.8.4.5 -- To unsubscribe, e-mail: vhostmd+unsubscribe(a)opensuse.org To contact the owner, e-mail: vhostmd+owner(a)opensuse.org

1 0

[PATCH] Make Xen Libraries really optional
by Eduardo Otubo 06 Aug '12

06 Aug '12

The default behavior in the configure script was to make with_xenstore set to 'true', which caused the compilation to break in my case because I don't have xen libraries, therefore, xs.h Now the default behavior is set according to its existence or not. Same thing for xenstat and xenctrl. Signed-off-by: Eduardo Otubo <eduardo.otubo(a)gmail.com> --- configure.ac | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index ee9c446..fb4309b 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,7 @@ AC_ARG_ENABLE([libxenstat], ;; no) libxenstat=false ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-libxenstat) ;; - esac],[libxenstat=false]) + esac],[AC_CHECK_HEADER(xenstat.h, libxenstat=true, libxenstat=false)]) AM_CONDITIONAL(LIBXENSTAT, test x$libxenstat = xtrue) # Configure argument to support using xenctrl library for vm enumeration @@ -60,7 +60,7 @@ AC_ARG_ENABLE([xenctrl], ;; no) xenctrl=false ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-xenctrl) ;; - esac],[xenctrl=false]) + esac],[AC_CHECK_HEADER(xenctrl.h, xenctrl=true, xenctrl=false,)]) AM_CONDITIONAL(XENCTRL, test x$xenctrl = xtrue) libvirt=false @@ -79,7 +79,7 @@ AC_ARG_WITH([xenstore], yes) with_xenstore=true;; no) with_xenstore=false;; *) AC_MSG_ERROR(bad value ${withval} for --with-xenstore) ;; - esac],[with_xenstore=true]) + esac],[AC_CHECK_HEADER(xs.h, with_xenstore=true)]) AM_CONDITIONAL(WITH_XENSTORE, test x$with_xenstore = xtrue) AC_OUTPUT(vhostmd/Makefile -- 1.7.1 -- To unsubscribe, e-mail: vhostmd+unsubscribe(a)opensuse.org To contact the owner, e-mail: vhostmd+owner(a)opensuse.org

2 1

[PATCH] libmetrics: Return error indication up through get_metric.
by Richard W.M. Jones 10 May '12

10 May '12

-- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org

2 1

Important: vhostmd security fix pushed upstream.
by Richard W.M. Jones 05 Mar '12

05 Mar '12

https://gitorious.org/vhostmd/vhostmd/commit/8684995d87e08fadd44e1814e810c7… This fixes the following bug: https://bugzilla.redhat.com/show_bug.cgi?id=741289 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org -- To unsubscribe, e-mail: vhostmd+unsubscribe(a)opensuse.org To contact the owner, e-mail: vhostmd+owner(a)opensuse.org

1 0

New vhostmd release: 0.5
by Richard W.M. Jones 16 Jan '12

16 Jan '12

I just pushed a new release (to git). There are no major changes -- just a series of small fixes to allow vhostmd to compile with GCC 4.7 without errors and warnings. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top -- To unsubscribe, e-mail: vhostmd+unsubscribe(a)opensuse.org To contact the owner, e-mail: vhostmd+owner(a)opensuse.org

1 0

[PATCH] Fix build when './configure --enable-xenctrl' is used
by Alex Zeffertt 07 Jan '10

07 Jan '10

Hi all, The attached patch against v0.4 fixes the build when --enable-xenctrl is used. If this configure option is used vhostmd does not link against libvirt or virt-util.o, but a few bits of code were assuming that these were always linked in. Please could you consider this patch for inclusion in the vhostmd project. Regards, Alex Zeffertt Fix build when "./configure --enable-xenctrl" is used. This option disables the use of libvirt. Instead libxc gets used to find out stuff about VMs. If this option is used then virt-util.c does not get built. This patch removes the linker dependencies on virt-util.o when --enable-xenctrl is used. Signed-off-by: <alex.zeffertt(a)eu.citrix.com> diff -urN a/configure.ac b/configure.ac --- a/configure.ac 2009-12-09 09:41:52.000000000 -0500 +++ b/configure.ac 2010-01-07 06:18:44.000000000 -0500 @@ -55,7 +55,8 @@ AC_ARG_ENABLE([xenctrl], [ --enable-xenctrl use xenctrl specific vm enumeration instead of libvirt], [case "${enableval}" in - yes) xenctrl=true + yes) xenctrl=true + CFLAGS="$CFLAGS -DXENCTRL" ;; no) xenctrl=false ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-xenctrl) ;; diff -urN a/include/util.h b/include/util.h --- a/include/util.h 2009-12-09 09:41:52.000000000 -0500 +++ b/include/util.h 2010-01-07 06:25:53.000000000 -0500 @@ -47,10 +47,13 @@ char *uuid; } vu_vm; + +#ifndef XENCTRL /* The libvirt URI to connect to (-c argument on the command line). If * not set, this will be NULL. */ extern const char *libvirt_uri; +#endif /* * Init logging interface. If running as daemon messages diff -urN a/vhostmd/metric.c b/vhostmd/metric.c --- a/vhostmd/metric.c 2009-12-09 09:41:52.000000000 -0500 +++ b/vhostmd/metric.c 2010-01-07 06:25:16.000000000 -0500 @@ -71,6 +71,10 @@ return -1; } +#ifdef XENCTRL + temp = replace (temp, "CONNECT", ""); + if (temp == NULL) return -1; +#else /* LIBVIRT used instead */ if (libvirt_uri) { temp = replace (temp, "CONNECT", "--connect '%s'", libvirt_uri); if (temp == NULL) return -1; @@ -78,6 +82,7 @@ temp = replace (temp, "CONNECT", ""); if (temp == NULL) return -1; } +#endif if (m->ctx == METRIC_CONTEXT_VM) { temp = replace (temp, "NAME", "%s", m->vm->name); diff -urN a/vhostmd/vhostmd.c b/vhostmd/vhostmd.c --- a/vhostmd/vhostmd.c 2009-12-09 09:41:52.000000000 -0500 +++ b/vhostmd/vhostmd.c 2010-01-07 06:24:16.000000000 -0500 @@ -976,7 +976,9 @@ { "config", required_argument, NULL, 'f'}, { "pid-file", required_argument, NULL, 'p'}, { "user", required_argument, NULL, 'u'}, +#ifndef XENCTRL { "connect", required_argument, NULL, 'c'}, +#endif { "help", no_argument, NULL, '?' }, {0, 0, 0, 0} }; @@ -1009,9 +1011,11 @@ case 'u': user = optarg; break; +#ifndef XENCTRL case 'c': libvirt_uri = optarg; break; +#endif case '?': usage(argv[0]); return 2;

2 1

Version 0.4 released
by Richard W.M. Jones 09 Dec '09

09 Dec '09

http://gitorious.org/vhostmd/ [There are no tarballs. You have to check out the 0.4 branch and run 'make dist' yourself.] Essentially this is one big bugfix release. You can read the details here: http://gitorious.org/vhostmd/vhostmd/commits/master Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://et.redhat.com/~rjones/libguestfs/ See what it can do: http://et.redhat.com/~rjones/libguestfs/recipes.html -- To unsubscribe, e-mail: vhostmd+unsubscribe(a)opensuse.org For additional commands, e-mail: vhostmd+help(a)opensuse.org

1 0

[PATCH] configure.ac: Fix C compiler detection to be compatible with automake.
by Richard W.M. Jones 09 Dec '09

09 Dec '09

-- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

2 1

[PATCH] Bug fix: chdir ("/") when daemonizing self.
by Richard W.M. Jones 09 Dec '09

09 Dec '09

This is quite a serious bug in the daemonization code. If we don't chdir, then an arbitrary directory can be held open. For example: # cd /tmp/foo # /etc/init.d/vhostmd start # pgrep vhostmd 19538 # ls -l /proc/19538/cwd lrwxrwxrwx 1 root root 0 Dec 9 07:20 /proc/19538/cwd -> /tmp/foo [This bug was identified by Dan Berrange] Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones New in Fedora 11: Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 70 libraries supprt'd http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw

2 1

Time for version 0.4 ?
by Richard W.M. Jones 09 Dec '09

09 Dec '09

We've been shipping the bleeding edge HEAD of git in Fedora for quite a while, and only found one bug (the cwd problem -- see previous patch). I think it's time for 0.4, including the two outstanding patches ... don't you agree? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones New in Fedora 11: Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 70 libraries supprt'd http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw -- To unsubscribe, e-mail: vhostmd+unsubscribe(a)opensuse.org For additional commands, e-mail: vhostmd+help(a)opensuse.org

1 0