Hello community, here is the log from the commit of package cluster-glue for openSUSE:Factory checked in at 2015-08-29 20:03:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old) and /work/SRC/openSUSE:Factory/.cluster-glue.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cluster-glue" Changes: -------- --- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes 2015-08-17 17:25:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes 2015-08-29 20:03:55.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Aug 26 22:30:12 UTC 2015 - [email protected] + +- high: hb_report: Always prefer syslog if available (bsc#942906) +- low: hb_report: Increase time to wait for the logmark +- low: hb_report: Collect libqb version (bsc#943327) +- Add 0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch +- Add 0004-low-hb_report-increase-time-to-wait-for-the-logmark.patch +- Add 0005-low-hb_report-collect-libqb-version-bsc-943327.patch + +------------------------------------------------------------------- New: ---- 0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch 0004-low-hb_report-increase-time-to-wait-for-the-logmark.patch 0005-low-hb_report-collect-libqb-version-bsc-943327.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cluster-glue.spec ++++++ --- /var/tmp/diff_new_pack.yXvVoP/_old 2015-08-29 20:03:56.000000000 +0200 +++ /var/tmp/diff_new_pack.yXvVoP/_new 2015-08-29 20:03:56.000000000 +0200 @@ -56,6 +56,12 @@ Patch6: cluster-glue-gcc5.patch # PATCH-FIX-OPENSUSE: high: hb_report: Prefer pacemaker.log if it exists (bsc#941681) Patch7: 0002-high-hb_report-Prefer-pacemaker.log-if-it-exists-bsc.patch +# PATCH-FIX-OPENSUSE: high: hb_report: Always prefer syslog if available (bsc#942906) +Patch8: 0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch +# PATCH-FIX-OPENSUSE: low: hb_report: Increase time to wait for the logmark +Patch9: 0004-low-hb_report-increase-time-to-wait-for-the-logmark.patch +# PATCH-FIX-OPENSUSE: low: hb_report: Collect libqb version (bsc#943327) +Patch10: 0005-low-hb_report-collect-libqb-version-bsc-943327.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: OpenIPMI-devel BuildRequires: asciidoc @@ -165,6 +171,9 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 ########################################################### %build ++++++ 0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch ++++++ commit 395dad096f401deeec3bca80c3f9db7a38128a53 Author: Kristoffer Grönlund <[email protected]> Date: Tue Aug 25 14:47:15 2015 +0200 high: hb_report: Always prefer syslog if available (bsc#942906) diff --git a/hb_report/hb_report.in b/hb_report/hb_report.in index 07ab23c..b228665 100755 --- a/hb_report/hb_report.in +++ b/hb_report/hb_report.in @@ -295,10 +295,6 @@ logmark() { # findlog() { local logf="" - if [ -f "$PCMK_LOG" ]; then - echo $PCMK_LOG - return - fi if [ "$HA_LOGFACILITY" ]; then logf=`findmsg $UNIQUE_MSG | awk '{print $1}'` @@ -308,13 +304,16 @@ findlog() { return fi - - collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F if [ -f "$WORKDIR/$JOURNAL_F" ]; then echo $WORKDIR/$JOURNAL_F return fi + if [ -f "$PCMK_LOG" ]; then + echo $PCMK_LOG + return + fi + echo ${HA_DEBUGFILE:-$HA_LOGFILE} [ "${HA_DEBUGFILE:-$HA_LOGFILE}" ] && debug "will try with ${HA_DEBUGFILE:-$HA_LOGFILE}" @@ -1051,6 +1050,9 @@ getlog() { local outf outf=$WORKDIR/$HALOG_F + # collect journal from systemd + collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F + if [ "$HA_LOG" ]; then # log provided by the user? [ -f "$HA_LOG" ] || { # not present is_collector || # warning if not on slave diff --git a/hb_report/utillib.sh b/hb_report/utillib.sh index 1f16967..ff54df8 100644 --- a/hb_report/utillib.sh +++ b/hb_report/utillib.sh @@ -118,22 +118,14 @@ findmsg() { mark=$1 log="" - if [ -f /var/log/pacemaker.log ]; then - log=`grep -l -e "$mark" /var/log/pacemaker.log` - if [ ! "$log" ]; then - log=`grep -l -e "$mark" /var/log/pacemaker.log*` && break - fi - fi + for d in $syslogdirs; do + [ -d $d ] || continue + log=`grep -l -e "$mark" $d/$favourites` && break + test "$log" && break + log=`grep -l -e "$mark" $d/*` && break + test "$log" && break + done 2>/dev/null - if [ ! "$log" ]; then - for d in $syslogdirs; do - [ -d $d ] || continue - log=`grep -l -e "$mark" $d/$favourites` && break - test "$log" && break - log=`grep -l -e "$mark" $d/*` && break - test "$log" && break - done 2>/dev/null - fi [ "$log" ] && ls -t $log | tr '\n' ' ' [ "$log" ] && ++++++ 0004-low-hb_report-increase-time-to-wait-for-the-logmark.patch ++++++ commit 77a0a18e5bc82bb66eaf84e29b083cbb804dbda6 Author: Kristoffer Grönlund <[email protected]> Date: Tue Aug 25 15:05:38 2015 +0200 low: hb_report: Increase time to wait for the logmark diff --git a/hb_report/hb_report.in b/hb_report/hb_report.in index b228665..0817b74 100755 --- a/hb_report/hb_report.in +++ b/hb_report/hb_report.in @@ -1406,7 +1406,7 @@ if is_collector && [ "$HA_LOGFACILITY" ]; then logmark $HA_LOGFACILITY.$HA_LOGLEVEL $UNIQUE_MSG # allow for the log message to get (hopefully) written to the # log file - sleep 1 + sleep 2 fi # ++++++ 0005-low-hb_report-collect-libqb-version-bsc-943327.patch ++++++ commit 890d86e8bbd0bf4f762ebafa0f6dd9f566022788 Author: Kristoffer Grönlund <[email protected]> Date: Wed Aug 26 18:21:27 2015 +0200 low: hb_report: Collect libqb version (bsc#943327) diff --git a/hb_report/hb_report.in b/hb_report/hb_report.in index 0817b74..342a145 100755 --- a/hb_report/hb_report.in +++ b/hb_report/hb_report.in @@ -1279,7 +1279,7 @@ CORES_DIRS="`2>/dev/null ls -d $HA_VARLIB/cores $PCMK_LIB/cores | uniq`" PACKAGES="pacemaker libpacemaker3 pacemaker-pygui pacemaker-pymgmt pymgmt-client openais libopenais2 libopenais3 corosync libcorosync4 -resource-agents cluster-glue libglue2 ldirectord +resource-agents cluster-glue libglue2 ldirectord libqb0 heartbeat heartbeat-common heartbeat-resources libheartbeat2 ocfs2-tools ocfs2-tools-o2cb ocfs2console ocfs2-kmp-default ocfs2-kmp-pae ocfs2-kmp-xen ocfs2-kmp-debug ocfs2-kmp-trace
