Matahari August 2011

matahari@lists.fedorahosted.org

22 participants
72 discussions

Summary
by Adam Stokes 10 Aug '11

10 Aug '11

These are a work in progress but I thought I'd send them up to perhaps get some futher ideas on making anaconda/puppet automagically set everything up for the administrator. A couple ideas I do have are possibly providing some conditionals within puppet/ks to: - allow SSL/Kerberos to be enabled and configured. - Pre-define federated brokers Should we do any integration tests during kickstart/puppet to verify the custom entered hostnames, brokers are resolvable and accessible? Thanks

3 4

[PATCH] - Seperate consoles into own subpackage
by Adam Stokes 10 Aug '11

10 Aug '11

- Updates to make sure all current consoles (sysconfig) are placed into a matahari-console subpackage --- matahari.spec | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/matahari.spec b/matahari.spec index a4311df..3b74dcb 100644 --- a/matahari.spec +++ b/matahari.spec @@ -37,7 +37,6 @@ BuildRequires: pcre-devel BuildRequires: glib2-devel BuildRequires: sigar-devel BuildRequires: libcurl-devel -BuildRequires: cxxtest %if %{with systemd} BuildRequires: systemd-units @@ -162,6 +161,16 @@ Requires: glib2-devel %description devel Headers and shared libraries for developing Matahari agents. +%package console +License: GPLv2+ +Summary: QMF console for monitoring various agents +Group: Applications/System +Requires: %{name}-lib = %{version}-%{release} +Requires: %{name}-agent-lib = %{version}-%{release} + +%description console +QMF console for monitoring various agents + %prep %setup -q -n matahari-matahari-%{upstream_version} @@ -248,19 +257,15 @@ fi %post sysconfig /sbin/service matahari-sysconfig condrestart -/sbin/service matahari-sysconfig-console condrestart %preun sysconfig if [ $1 = 0 ]; then - /sbin/service matahari-sysconfig-console stop >/dev/null 2>&1 || : /sbin/service matahari-sysconfig stop >/dev/null 2>&1 || : - chkconfig --del matahari-sysconfig-console chkconfig --del matahari-sysconfig fi %postun sysconfig if [ "$1" -ge "1" ]; then - /sbin/service matahari-sysconfig-console condrestart >/dev/null 2>&1 || : /sbin/service matahari-sysconfig condrestart >/dev/null 2>&1 || : fi @@ -370,8 +375,15 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot} %if %{with qmf} %attr(755, root, root) %{_initddir}/matahari-sysconfig -%attr(755, root, root) %{_initddir}/matahari-sysconfig-console %attr(755, root, root) %{_sbindir}/matahari-qmf-sysconfigd +%endif + +%files console +%defattr(644, root, root, 755) +%doc AUTHORS COPYING + +%if %{with qmf} +%attr(755, root, root) %{_initddir}/matahari-sysconfig-console %attr(755, root, root) %{_sbindir}/matahari-qmf-sysconfig-consoled %endif -- 1.7.6

4 5

[PATCH] - Add 2 installed files to spec
by Adam Stokes 10 Aug '11

10 Aug '11

Signed-off-by: Adam Stokes <astokes(a)fedoraproject.org> --- matahari.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/matahari.spec b/matahari.spec index 5eedb3c..54aa987 100644 --- a/matahari.spec +++ b/matahari.spec @@ -1,5 +1,5 @@ -%global specversion 102 -%global upstream_version 2ce6cba +%global specversion 104 +%global upstream_version cda4481 # Keep around for when/if required %global alphatag %{upstream_version}.git @@ -418,6 +418,9 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot} %{_datadir}/polkit-1/actions/org.matahariproject.Host.policy %{_datadir}/polkit-1/actions/org.matahariproject.Network.policy %{_datadir}/polkit-1/actions/org.matahariproject.Services.policy +%{_datadir}/matahari/check-policy.xsl +%{_datadir}/polkit-1/actions/org.matahariproject.Resources.policy + %endif %files devel -- 1.7.6

2 1

[PATCH] Host: rhbz#728977 - Catch exception on broker disconnect
by Zane Bitter 10 Aug '11

10 Aug '11

Signed-off-by: Zane Bitter <zbitter(a)redhat.com> --- src/host/host-qmf.cpp | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/host/host-qmf.cpp b/src/host/host-qmf.cpp index 13cacd1..97530cf 100644 --- a/src/host/host-qmf.cpp +++ b/src/host/host-qmf.cpp @@ -240,7 +240,13 @@ HostAgent::heartbeat() qmf::Data event = qmf::Data(_package.event_heartbeat); event.setProperty("timestamp", timestamp); event.setProperty("sequence", _heartbeat_sequence); - getSession().raiseEvent(event); + try { + getSession().raiseEvent(event); + } catch (const qpid::messaging::ConnectionError& e) { + mh_log(LOG_ERR, "Connection error sending event to broker. (%s)", e.what()); + } catch (const qpid::types::Exception& e) { + mh_log(LOG_ERR, "Exception sending event to broker. (%s)", e.what()); + } return interval * 1000; }

2 1

[PATCH] Host: Fix schema for heartbeat event
by Zane Bitter 10 Aug '11

10 Aug '11

Broken by commit bfa436e5cf4e2ada5460f5f12d1983cbae8ce485. This caused the host agent to abort pretty much immediately. Related: rhbz#729063 Signed-off-by: Zane Bitter <zbitter(a)redhat.com> --- src/host/schema.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/host/schema.xml b/src/host/schema.xml index 2200fa9..932f3a1 100644 --- a/src/host/schema.xml +++ b/src/host/schema.xml @@ -71,6 +71,6 @@ </class> - <event name="heartbeat" args="timestamp,sequence" /> + <event name="heartbeat" args="timestamp,sequence,hostname,uuid" /> </schema>

2 1

matahari/libvirt integration for guest control
by Perry Myers 10 Aug '11

10 Aug '11

libvirt folks: this idea is half-baked, so I've refrained from cross-posting to libvir-list initially, but depending on how this shapes up, next step would be to take to libvir-list of course I imagine the following sequence of events... * virt-manager user selects VM and tells guest to shutdown * virt-manager uses libvirt remote interface to talk to libvirtd on host that guest is running on * libvirtd via a QMF console (embedded or separate, TBD) sends shutdown call through host qpid broker (or it could just talk to guest broker directly, not sure if host broker is even needed if we always have a guest broker installed) * host qpid broker sends this over vios-proxy up to the guest * guest processes shutdown command via matahari-host Agent The idea is that for a very limited set of matahari APIs we expose these via libvirt directly... Things like invoking an internal guest shutdown, causing a filesystem sync/freeze, etc The trickiness here is that libvirt in in C, but QMF consoles are in C++, so I'm open to suggestions on how to work around this... Possibilities would be: * linking C++ libs/runtime into libvirt (yeah, I know this is probably not a viable option) * separate QMF console daemon running on host that libvirtd communicates to Long term, if we had the ability to create a QMF console directly in C, then this could be integrated into libvirt directly (making things much easier) Thoughts? Perry

5 12

[PATCH v2] Fix unit tests for DNS SRV lookup
by Zane Bitter 10 Aug '11

10 Aug '11

Signed-off-by: Zane Bitter <zbitter(a)redhat.com> --- src/tests/mh_hsa_linux.h | 8 ++++---- src/tests/mh_hsa_windows.h | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/tests/mh_hsa_linux.h b/src/tests/mh_hsa_linux.h index 2e46784..9305076 100644 --- a/src/tests/mh_hsa_linux.h +++ b/src/tests/mh_hsa_linux.h @@ -45,14 +45,14 @@ class MhHsaSuite : public CxxTest::TestSuite void testSrvLookup(void) { - char target[NS_MAXDNAME]; + char *target; const char *host = "_matahari._tcp.matahariproject.org"; - int ret = 0; - ret = mh_srv_lookup(host, target, NS_MAXDNAME); - TS_ASSERT(ret == 0); + target = mh_os_dnssrv_lookup(host); + TS_ASSERT(target != NULL); TS_ASSERT((mh_test_is_match("^www\\.matahariproject\\.org$", target)) >= 0); + free(target); } }; diff --git a/src/tests/mh_hsa_windows.h b/src/tests/mh_hsa_windows.h index 1cf1ea8..ee77188 100644 --- a/src/tests/mh_hsa_windows.h +++ b/src/tests/mh_hsa_windows.h @@ -45,14 +45,15 @@ class MhHsaSuite : public CxxTest::TestSuite void testSrvLookup(void) { - char target[NI_MAXHOST]; + char *target; const char *host = "_matahari._tcp.matahariproject.org"; int ret = 0; - ret = mh_srv_lookup(host, target, NI_MAXHOST); - TS_ASSERT(ret == 0); - TS_ASSERT((mh_test_is_match("^qpid.*matahariproject\\.org$", + target = mh_os_dnssrv_lookup(host); + TS_ASSERT(target != NULL); + TS_ASSERT((mh_test_is_match("^www\\.matahariproject\\.org$", target)) >= 0); + free(target); } };

2 1

[PATCH] Fix unit tests for DNS SRV lookup
by Zane Bitter 10 Aug '11

10 Aug '11

Signed-off-by: Zane Bitter <zbitter(a)redhat.com> --- src/tests/mh_hsa_linux.h | 7 +++---- src/tests/mh_hsa_windows.h | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/tests/mh_hsa_linux.h b/src/tests/mh_hsa_linux.h index 2e46784..a93ddae 100644 --- a/src/tests/mh_hsa_linux.h +++ b/src/tests/mh_hsa_linux.h @@ -45,12 +45,11 @@ class MhHsaSuite : public CxxTest::TestSuite void testSrvLookup(void) { - char target[NS_MAXDNAME]; + char *target; const char *host = "_matahari._tcp.matahariproject.org"; - int ret = 0; - ret = mh_srv_lookup(host, target, NS_MAXDNAME); - TS_ASSERT(ret == 0); + target = mh_os_dnssrv_lookup(host); + TS_ASSERT(target != NULL); TS_ASSERT((mh_test_is_match("^www\\.matahariproject\\.org$", target)) >= 0); } diff --git a/src/tests/mh_hsa_windows.h b/src/tests/mh_hsa_windows.h index 1cf1ea8..a7fd597 100644 --- a/src/tests/mh_hsa_windows.h +++ b/src/tests/mh_hsa_windows.h @@ -45,13 +45,13 @@ class MhHsaSuite : public CxxTest::TestSuite void testSrvLookup(void) { - char target[NI_MAXHOST]; + char *target; const char *host = "_matahari._tcp.matahariproject.org"; int ret = 0; - ret = mh_srv_lookup(host, target, NI_MAXHOST); - TS_ASSERT(ret == 0); - TS_ASSERT((mh_test_is_match("^qpid.*matahariproject\\.org$", + target = mh_os_dnssrv_lookup(host); + TS_ASSERT(target != NULL); + TS_ASSERT((mh_test_is_match("^www\\.matahariproject\\.org$", target)) >= 0); } };

1 0

[PATCH] Perform host domain lookup in t_dnssrv.c
by Antoine van Gelder 09 Aug '11

09 Aug '11

Perform host domain lookup in t_dnssrv.c Added gethostdomain() Modified test to use gethostdomain() for domain lookup Modified test to do SRV lookup for _matahari._tcp as per Bug# 688199 Signed-off-by: Antoine van Gelder <antoine(a)7degrees.co.za> --- src/tests/t_dnssrv.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 50 insertions(+), 2 deletions(-) diff --git a/src/tests/t_dnssrv.c b/src/tests/t_dnssrv.c index 91b2772..855a6f3 100644 --- a/src/tests/t_dnssrv.c +++ b/src/tests/t_dnssrv.c @@ -16,22 +16,70 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <sys/utsname.h> +#include <netdb.h> +#include <string.h> +#include <stdio.h> #include <glib.h> #include "dnssrv_private.h" + +int +gethostdomain(char* domain, size_t domainlen) +{ + struct utsname sysinfo; + struct addrinfo hints, *res, *p; + int error; + char* offset; + + if (uname(&sysinfo) != 0) { + return -1; + } + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_CANONNAME; + + if ((error = getaddrinfo(sysinfo.nodename, NULL, &hints, &res)) != 0) { + printf("warning: %s", gai_strerror(error)); + goto fail; + } + + /* strip host from fqdn */ + if ((offset = strchr(res->ai_canonname, '.')) == NULL) { + goto fail; + } + strncpy(domain, ++offset, domainlen); + freeaddrinfo(res); + + return 0; + +fail: + freeaddrinfo(res); + return -1; +} + + int main(int argc, char **argv) { struct srv_reply **srvl = NULL, *srv = NULL; int i; - if (srvl = srv_lookup("qpid-broker", "tcp", "qpid-broker:49000")) { + char hostdomain[MAX_NAME_LEN]; + if (gethostdomain(hostdomain, sizeof hostdomain) != 0) { + perror("Could not determine host domain"); + return 0; + } + + if (srvl = srv_lookup("matahari", "tcp", hostdomain)) { srv = *srvl; for (i = 1; srvl[i]; i++) { if (srvl[i]->prio < srv->prio) srv = srvl[i]; } - fprintf("\tAccessible QPID Broker: %s\n", srv->name); + printf("\tAccessible QPID Broker: %s\n", srv->name); return 0; } return -1; -- 1.7.5.2

4 7

Support multiple classes in schema; check for PolicyKit action
by Radek Novacek 08 Aug '11

08 Aug '11

This serie of patches introduces checking for missing PolicyKit actions. It shows CMake warning when property|statistic|method in schema doesn't have corresponding action defined. Missing actions were also added. It also allows to have multiple classes defined in one schema. DBus agents didn't supported that, so Resources API was missing in services DBus agent. Another improvement is support for IO arguments in DBus. Because DBus don't support them directly, each IO argument is replaced by two, one for input, one for output. Last change is addition of messages in definition of PolicyKit actions. This messages is shown to user when he is authenticating for the action. Bug [1] (already fixed in new polkit) made polkit to crash when authenticating action without message. [1] https://bugzilla.redhat.com/show_bug.cgi?id=702600 Radek Novacek

2 7

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Matahari August 2011