Hello community, here is the log from the commit of package openais for openSUSE:Factory checked in at 2013-05-27 09:55:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openais (Old) and /work/SRC/openSUSE:Factory/.openais.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openais" Changes: -------- --- /work/SRC/openSUSE:Factory/openais/openais.changes 2011-10-21 16:33:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openais.new/openais.changes 2013-05-27 09:55:02.000000000 +0200 @@ -1,0 +2,8 @@ +Fri May 10 13:24:07 UTC 2013 - [email protected] + +- Fix checkpoint syncing problem in CKPT service (bnc#813139) + + Added bnc813139-fix-ckpt-syncing.patch +- init script: remove setting LRM max children +- init script: optional stop dependency on rpcbind/portmap (bnc#812967) + +------------------------------------------------------------------- New: ---- bnc813139-fix-ckpt-syncing.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openais.spec ++++++ --- /var/tmp/diff_new_pack.Nbsqqo/_old 2013-05-27 09:55:02.000000000 +0200 +++ /var/tmp/diff_new_pack.Nbsqqo/_new 2013-05-27 09:55:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package openais # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,13 +22,14 @@ Name: openais Summary: The OpenAIS Standards-Based Cluster Framework executive and APIs -Version: 1.1.4 -Release: 7 License: BSD-3-Clause Group: Productivity/Clustering/HA -URL: http://www.openais.org/ +Version: 1.1.4 +Release: 0 +Url: http://www.openais.org/ Source0: http://www.osdl.org/downloads/openais-%{version}/openais-%{version}.tar.gz Patch1: openais-suse-init.patch +Patch2: bnc813139-fix-ckpt-syncing.patch # Runtime bits Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -39,7 +40,8 @@ %define buildtrunk 0 %{?_with_buildtrunk: %define buildtrunk 1} %if %{buildtrunk} -BuildRequires: autoconf automake +BuildRequires: autoconf +BuildRequires: automake %endif BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,6 +49,7 @@ %prep %setup -q -n openais-%{version} %patch1 -p1 +%patch2 -p1 %build %if %{buildtrunk} @@ -194,7 +197,6 @@ %{_sbindir}/openais-instantiate %package -n libopenais3 -License: BSD-3-Clause Summary: The openais Standards-Based Cluster Framework libraries Group: Productivity/Clustering/HA Obsoletes: libopenais2 @@ -242,7 +244,6 @@ %postun -n libopenais3 -p /sbin/ldconfig %package -n libopenais-devel -License: BSD-3-Clause Summary: The openais Standards-Based Cluster Framework libraries Group: Development/Libraries/C and C++ Requires: libopenais3 = %{version}-%{release} ++++++ bnc813139-fix-ckpt-syncing.patch ++++++ Index: openais-1.1.4/services/ckpt.c =================================================================== --- openais-1.1.4.orig/services/ckpt.c +++ openais-1.1.4/services/ckpt.c @@ -776,14 +776,17 @@ static void ckpt_confchg_fn ( unsigned int i, j; unsigned int lowest_nodeid; + if (!memcmp (&my_saved_ring_id, ring_id,sizeof (struct memb_ring_id))) { + if (my_sync_state != SYNC_STATE_NOT_STARTED) { + return; + } + } + if (configuration_type != TOTEM_CONFIGURATION_REGULAR) { + return; + } + memcpy (&my_saved_ring_id, ring_id, sizeof (struct memb_ring_id)); - if (configuration_type != TOTEM_CONFIGURATION_REGULAR) { - return; - } - if (my_sync_state != SYNC_STATE_NOT_STARTED) { - return; - } my_sync_state = SYNC_STATE_STARTED; ++++++ openais-suse-init.patch ++++++ --- /var/tmp/diff_new_pack.Nbsqqo/_old 2013-05-27 09:55:02.000000000 +0200 +++ /var/tmp/diff_new_pack.Nbsqqo/_new 2013-05-27 09:55:02.000000000 +0200 @@ -15,7 +15,7 @@ =================================================================== --- /dev/null +++ openais-1.1.4/init/suse -@@ -0,0 +1,208 @@ +@@ -0,0 +1,182 @@ +#!/bin/bash +# +# Corosync daemon init script for LSB-compliant Linux distributions. @@ -32,11 +32,11 @@ +# Short-Description: openais cluster services. +# Provides: openais +# Required-Start: $network -+# Should-Start: $syslog sshd drbd $named $remote_fs logd xendomains xend iscsi libvirtd ++# Should-Start: $syslog sshd drbd $named $remote_fs logd xendomains xend iscsi libvirtd portmap rpcbind +# Required-Stop: $network +# Default-Start: 3 5 +# Default-Stop: 0 6 -+# Should-Stop: $syslog sshd drbd $named $remote_fs logd xendomains xend iscsi libvirtd ++# Should-Stop: $syslog sshd drbd $named $remote_fs logd xendomains xend iscsi libvirtd portmap rpcbind +### END INIT INFO + +do_force=0 @@ -51,7 +51,6 @@ +if [ -f $PACEMAKER_SYSCONFIG ]; then + . $PACEMAKER_SYSCONFIG +fi -+LRMADMIN="/usr/sbin/lrmadmin" + +SBD_CONFIG=/etc/sysconfig/sbd +SBD_BIN="/usr/sbin/sbd" @@ -92,30 +91,6 @@ + echo -n "done " +} + -+wait_for_lrmd() { -+ local maxwait=30 -+ local i=0 -+ while [ $i -lt $maxwait ]; do -+ $LRMADMIN -C > /dev/null 2>&1 && -+ break -+ sleep 1 -+ i=$(($i+1)) -+ done -+ if [ $i -lt $maxwait ]; then -+ return 0 -+ else -+ echo "lrmd apparently didn't start" -+ return 1 -+ fi -+} -+set_lrmd_options() { -+ test -x $LRMADMIN || return -+ if [ -n "$LRMD_MAX_CHILDREN" ]; then -+ wait_for_lrmd || return -+ $LRMADMIN -p max-children $LRMD_MAX_CHILDREN -+ fi -+} -+ +internal_status() { + checkproc $exec > /dev/null 2>&1 + return $? @@ -144,7 +119,6 @@ + sleep 2 # give it time to fail... $? isn't definitive + + if internal_status; then -+ set_lrmd_options + echo "OK" + return 0 + fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
