Hello community, here is the log from the commit of package resource-agents for openSUSE:Factory checked in at 2014-08-30 16:03:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/resource-agents (Old) and /work/SRC/openSUSE:Factory/.resource-agents.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "resource-agents" Changes: -------- --- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes 2014-07-24 06:58:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.resource-agents.new/resource-agents.changes 2014-08-30 16:04:23.000000000 +0200 @@ -1,0 +2,72 @@ +Thu Aug 28 08:18:51 UTC 2014 - [email protected] + +- Add COPYING.LGPL + +------------------------------------------------------------------- +Wed Aug 27 14:35:29 UTC 2014 - [email protected] + +- Disable monitoring-plugins-metadata + +------------------------------------------------------------------- +Tue Aug 26 12:34:00 UTC 2014 - [email protected] + +- Add patch findif-multiple-routes-bnc892755.patch + - findif.sh: Use the most specific matching route (bnc#892755) + +------------------------------------------------------------------- +Thu Aug 14 15:19:21 UTC 2014 - [email protected] + +- drop dependency on monitoring-plugins-udp since it is folded into + monitoring-plugins-tcp + +------------------------------------------------------------------- +Thu Aug 7 07:00:28 UTC 2014 - [email protected] + +- Rename nagios-plugins-metadata to monitoring-plugins-metadata (bnc#890337) + +------------------------------------------------------------------- +Tue Aug 5 16:33:20 UTC 2014 - [email protected] + +- Medium: Xen: Properly quote domain name in call to create +- Updated patch: xen-replace-xm-with-xl.patch + +------------------------------------------------------------------- +Tue Aug 5 13:58:13 UTC 2014 - [email protected] + +- Low: oracledb.sh: remove process path from process search results +- Low: Dummy: add sample usage of 'ocf_exit_reason' +- High: shellfuncs: set exit error reason string +- Medium: oracle: fix setting monitor user profile for other languages (nls) +- Low: LVM: Warn users about the danger of lvmetad +- Low: nfsnotify: fixes error message output +- Low: nfsserver: fix usage of rquatad_port option +- Low: nfsserver: warn user when nfs port options can not be set +- Low: nfsserver: fixes issue with proc/fs/nfsd not being mounted during start on some distros +- Low: ocf-shellfunctions: handle local nodename when version has distro postfix +- Low: bind-mount.sh: Update meta-data to reflect required arguments +- Low: mysql: Refactoring mysql logic into common library that can be shared with galera agent +- Medium: oracle: reset MONUSR password if it expired +- High: oracle: try as sysdba if monitor as MONUSR fails +- High: oralistener.sh: Do not fail during stop if listener has already stopped +- Low: oracledb.sh: Fix exit_idle loop to exit process wait loop correctly +- Low: orainstance.sh: the exit_idle function was a no-op because of a malformed grep search +- Low: oralsnr: ignore listener case during grep for pid +- dropped merged patches: + - 0001-High-oracle-Require-monitoring-user-as-parameter-bnc.patch + - 0001-Medium-VirtualDomain-Try-xen-list-if-no-emulator-is-.patch + - 0001-Medium-mysql-Update-mysql-with-more-sensible-default.patch + - apache-fix-bnc884674.patch +- upstream cs: v3.9.5-508-g4f369d8 + +------------------------------------------------------------------- +Tue Aug 5 11:03:31 UTC 2014 - [email protected] + +- Update license to include GPL-3.0+ + +------------------------------------------------------------------- +Tue Aug 5 07:15:07 UTC 2014 - [email protected] + +- Reintroduce nagios plugins metadata (bnc#890337) + - Add nagios-plugins-metadata.tar.bz2 + +------------------------------------------------------------------- Old: ---- 0001-High-oracle-Require-monitoring-user-as-parameter-bnc.patch 0001-Medium-VirtualDomain-Try-xen-list-if-no-emulator-is-.patch 0001-Medium-mysql-Update-mysql-with-more-sensible-default.patch apache-fix-bnc884674.patch resource-agents-3.9.5+git453.tar.xz New: ---- findif-multiple-routes-bnc892755.patch monitoring-plugins-metadata.tar.bz2 resource-agents-3.9.5+git508.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ resource-agents.spec ++++++ --- /var/tmp/diff_new_pack.gPKRoA/_old 2014-08-30 16:04:25.000000000 +0200 +++ /var/tmp/diff_new_pack.gPKRoA/_new 2014-08-30 16:04:25.000000000 +0200 @@ -40,15 +40,20 @@ %define _rundir %{_localstatedir}/run %endif +# Disabled by default since openSUSE:Factory +# lacks monitoring-plugins +%define with_monitoring 0 + Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts -License: GPL-2.0 and LGPL-2.1+ +License: GPL-2.0 and LGPL-2.1+ and GPL-3.0+ Group: Productivity/Clustering/HA -Version: 3.9.5+git453 +Version: 3.9.5+git508 Release: 0 Url: http://linux-ha.org/ Source: resource-agents-%{version}.tar.xz Source1: resource-agents.conf +Source2: monitoring-plugins-metadata.tar.bz2 # PATCH-FIX-OPENSUSE: activate VG with partial PV by default Patch2: lvm-vg-partial-active.diff # PATCH-FIX-OPENSUSE: fix path to sm-notify @@ -61,10 +66,6 @@ Patch8: 0006-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch # PATCH-FIX-OPENSUSE: fix sg_persist for code normalization Patch10: fix-sg_persist-for-code-normalization.patch -# PATCH-FIX-UPSTREAM: Require monitoring user as parameter (bnc#850589, bnc#859683), [email protected] -Patch12: 0001-High-oracle-Require-monitoring-user-as-parameter-bnc.patch -# PATCH-FIX-UPSTREAM: mysql: Update mysql with more sensible defaults (bnc#863844) -Patch16: 0001-Medium-mysql-Update-mysql-with-more-sensible-default.patch # PATCH-FIX-UPSTREAM: sg_persist: fix commented by Lars Patch17: fix-sg_persist-commented-byLars.patch # PATCH: sg_persist: fix demote error @@ -75,10 +76,8 @@ Patch20: sg_persist-ocft-not-configure-iscsi.patch # PATCH-FIX-UPSTREAM: Allow Xen RA to use xl if available (bnc#882548) Patch21: xen-replace-xm-with-xl.patch -# PATCH-FIX-OPENSUSE: VirtualDomain: Try xen-list if no emulator is set (bnc#885292) -Patch22: 0001-Medium-VirtualDomain-Try-xen-list-if-no-emulator-is-.patch -# PATCH-FIX-UPSTREAM: Revised fix for apache RA on SUSE distributions (bnc#884674) -Patch23: apache-fix-bnc884674.patch +# PATCH-FIX-UPSTREAM: findif.sh: Use the most specific matching route (bnc#892755) +Patch22: findif-multiple-routes-bnc892755.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: heartbeat-resources @@ -114,6 +113,7 @@ %package -n ldirectord Summary: A Monitoring Daemon for Maintaining High Availability Resources +License: GPL-2.0 and LGPL-2.1+ Group: Productivity/Clustering/HA Requires: %{SSLeay} Requires: %{name} @@ -147,6 +147,29 @@ See 'ldirectord -h' and linux-ha/doc/ldirectord for more information. +%if %{with_monitoring} + +%package -n monitoring-plugins-metadata +Summary: Metadata for Monitoring plugins +License: LGPL-2.1+ and GPL-2.0+ +Group: Productivity/Clustering/HA +Provides: nagios-plugins-metadata +Requires: monitoring-plugins-fping +Requires: monitoring-plugins-http +Requires: monitoring-plugins-ldap +Requires: monitoring-plugins-mysql +Requires: monitoring-plugins-pgsql +Requires: monitoring-plugins-tcp +Requires: resource-agents +#BuildArch: noarch + +%description -n monitoring-plugins-metadata +XML files containing metadata which facilitates using nagios +plugins as resource agents. These files were produced from help +pages of individual nagios plugins. + +%endif + %prep ########################################################### %setup -q @@ -156,15 +179,12 @@ %patch5 -p1 %patch8 -p1 %patch10 -p1 -%patch12 -p1 -%patch16 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 %patch20 -p1 %patch21 -p1 %patch22 -p1 -%patch23 -p1 ########################################################### %build @@ -231,6 +251,15 @@ done ) +%if %{with_monitoring} +# install nagios plugins XML metadata +tar -xjf %{SOURCE2} +mkdir -p %{buildroot}%{_datadir}/nagios/plugins-metadata +for file in $(find plugins-metadata -type f); do + install -m 644 $file %{buildroot}%{_datadir}/nagios/plugins-metadata +done +%endif + ########################################################### %clean @@ -310,6 +339,7 @@ %ghost %dir %attr (1755, root, root) %{_rundir}/resource-agents %doc AUTHORS %doc COPYING +%doc COPYING.LGPL %doc COPYING.GPLv3 %doc %{_datadir}/%{name}/ra-api-1.dtd %doc %{_mandir}/man7/*.7* @@ -347,4 +377,13 @@ %{_sysconfdir}/ha.d/resource.d/ldirectord %config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord +%if %{with_monitoring} +%files -n monitoring-plugins-metadata +########################################################### +%defattr(-,root,root) +%dir %{_datadir}/nagios +%dir %{_datadir}/nagios/plugins-metadata +%attr(0644,root,root) %{_datadir}/nagios/plugins-metadata/* +%endif + %changelog ++++++ findif-multiple-routes-bnc892755.patch ++++++ commit b1d41edf4cab34f86facf7fc037a6a0783e79167 Author: Vincent Untz <[email protected]> Date: Wed Aug 20 16:17:33 2014 +0200 findif.sh: Use the most specific matching route When more than one interface is configured with a network that matches the IP address we're looking for, but with different networks, the "ip route" command we're using returns more than one line: ip -o -f inet route list match 10.122.24.59 scope link 10.122.0.0/18 dev eth1.12 proto kernel src 10.122.24.159 10.122.24.0/25 dev eth0 proto kernel src 10.122.24.53 The code assumed that only one line would be returned, and so it's parsing only the first line, without trying to find out which line is the best match. What we want is the route with the bigger netmask. It turns out that it also means that it's the route with the bigger network IP. https://bugzilla.novell.com/show_bug.cgi?id=892755 diff --git a/heartbeat/findif.sh b/heartbeat/findif.sh index fd92d9b..feb26ec 100644 --- a/heartbeat/findif.sh +++ b/heartbeat/findif.sh @@ -137,9 +137,9 @@ findif() fi if [ -n "$nic" ] ; then # NIC supports more than two. - set -- `ip -o -f $family route list match $match $scope | grep "dev $nic"` + set -- `ip -o -f $family route list match $match $scope | sort | tail -n1 | grep "dev $nic"` else - set -- `ip -o -f $family route list match $match $scope` + set -- `ip -o -f $family route list match $match $scope | sort | tail -n1` fi if [ $# = 0 ] ; then case $OCF_RESKEY_ip in ++++++ resource-agents-3.9.5+git453.tar.xz -> resource-agents-3.9.5+git508.tar.xz ++++++ ++++ 2094 lines of diff (skipped) ++++++ xen-replace-xm-with-xl.patch ++++++ --- /var/tmp/diff_new_pack.gPKRoA/_old 2014-08-30 16:04:25.000000000 +0200 +++ /var/tmp/diff_new_pack.gPKRoA/_new 2014-08-30 16:04:25.000000000 +0200 @@ -1,5 +1,5 @@ diff --git a/heartbeat/Xen b/heartbeat/Xen -index cbc7c373bfa2..c673faa54844 100755 +index cbc7c37..6659169 100755 --- a/heartbeat/Xen +++ b/heartbeat/Xen @@ -6,7 +6,7 @@ @@ -56,11 +56,19 @@ and stop actions used for Dom0 and the DomUs. The default is to not adjust memory dynamically. </longdesc> -@@ -187,30 +189,30 @@ Xen_Status() { +@@ -187,30 +189,38 @@ Xen_Status() { return $OCF_SUCCESS fi fi - STATUS=`xm list --long $1 2>/dev/null | grep status 2>/dev/null` ++ if have_binary xenstore-ls; then ++ xenstore-ls -f /vm | grep -E "/vm.*name = \"$1\"" > /dev/null 2>&1 ++ if [ $? -ne 0 ]; then ++ return $OCF_NOT_RUNNING ++ else ++ return $OCF_SUCCESS ++ fi ++ fi + STATUS=`$xentool list --long $1 2>/dev/null | grep status 2>/dev/null` if [ "X${STATUS}" != "X" ]; then # we have Xen 3.0.4 or higher @@ -92,7 +100,7 @@ # running; apparently, this period lasts only for a second or # two # If a status returns not running, then test status -@@ -251,16 +253,16 @@ Xen_Adjust_Memory() { +@@ -251,16 +261,16 @@ Xen_Adjust_Memory() { #NEWMEM=`echo "(${MAXMEM}-${OCF_RESKEY_reserved_Dom0_memory})/(${RUNCNT}+${CNTNEW})"|bc` NEWMEM=$(( (${MAXMEM} - ${OCF_RESKEY_reserved_Dom0_memory}) / (${RUNCNT} + ${CNTNEW} ) )) # do not rely on ballooning add dom0_mem=512 instead to force memory for dom0 @@ -112,7 +120,7 @@ } Xen_List_running() { ALL_DOMS=`Xen_List_all` -@@ -298,7 +300,7 @@ Xen_Monitor() { +@@ -298,7 +308,7 @@ Xen_Monitor() { } Xen_Total_Memory() { @@ -121,7 +129,7 @@ } Xen_Start() { -@@ -316,16 +318,16 @@ Xen_Start() { +@@ -316,16 +326,16 @@ Xen_Start() { Xen_Adjust_Memory 1 ocf_log info "New memory for virtual domains: ${NEWMEM}" sed -i -e "/^memory=/ s/^memory=.*/memory=${NEWMEM}/" ${OCF_RESKEY_xmfile} @@ -130,7 +138,7 @@ fi - xm create ${OCF_RESKEY_xmfile} name=$DOMAIN_NAME -+ $xentool create ${OCF_RESKEY_xmfile} name=$DOMAIN_NAME ++ $xentool create ${OCF_RESKEY_xmfile} name=\"$DOMAIN_NAME\" rc=$? if [ $rc -ne 0 ]; then return $OCF_ERR_GENERIC @@ -142,7 +150,7 @@ fi fi while sleep 1; do -@@ -350,18 +352,18 @@ xen_domain_stop() { +@@ -350,18 +360,18 @@ xen_domain_stop() { if [ "$timeout" -gt 0 ]; then ocf_log info "Xen domain $dom will be stopped (timeout: ${timeout}s)" if ocf_is_true "${OCF_RESKEY_shutdown_acpi}"; then @@ -165,7 +173,7 @@ if [ "$timeout" -eq 0 ]; then while Xen_Status $dom; do ocf_log warn "Xen domain $dom will be destroyed!" -@@ -369,7 +371,7 @@ xen_domain_stop() { +@@ -369,7 +379,7 @@ xen_domain_stop() { sleep 1 done # Note: This does not give up. stop isn't allowed to to fail. @@ -174,7 +182,7 @@ # This is the correct behaviour. fi -@@ -381,18 +383,18 @@ Xen_Stop() { +@@ -381,18 +391,18 @@ Xen_Stop() { if Xen_Status_with_Retry ${DOMAIN_NAME}; then vm=${DOMAIN_NAME} elif Xen_Status migrating-${DOMAIN_NAME}; then @@ -198,7 +206,7 @@ $xenkill ${DOMAIN_NAME} fi -@@ -404,10 +406,10 @@ Xen_Migrate_To() { +@@ -404,10 +414,10 @@ Xen_Migrate_To() { target_node="$OCF_RESKEY_CRM_meta_migrate_target" target_attr="$OCF_RESKEY_node_ip_attribute" target_addr="$target_node" @@ -212,7 +220,7 @@ if [ -n "$target_attr" ]; then nodevalue=`crm_attribute --type nodes --node-uname $target_node --attr-name $target_attr --get-value -q` if [ -n "${nodevalue}" -a "${nodevalue}" != "(null)" ]; then -@@ -416,15 +418,18 @@ Xen_Migrate_To() { +@@ -416,15 +426,18 @@ Xen_Migrate_To() { fi fi @@ -236,7 +244,7 @@ return $OCF_SUCCESS fi else -@@ -495,19 +500,19 @@ else +@@ -495,19 +508,19 @@ else DOMAIN_NAME=${DOMAIN_NAME:-${OCF_RESOURCE_INSTANCE}} fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
