commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2020-09-23 18:42:13
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new.4249 (New)
Package is "booth"
Wed Sep 23 18:42:13 2020 rev:46 rq:836115 version:1.0
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2018-04-30
22:59:37.358963662 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new.4249/booth.changes2020-09-23
18:43:22.249485252 +0200
@@ -1,0 +2,48 @@
+Wed Sep 16 12:37:52 UTC 2020 - aburla...@suse.com
+
+- Update to version 1.0+20200702.2f043da:
+ * transport: Check fcntl return value
+ * transport: setsockopt failures are not critical
+ * pacemaker: Change rv handling of pcmk_get_attr
+ * pacemaker: Express intention about logical or
+ * main: mkdir failure is not critical
+ * pacemaker: Handle updated exit code of crm_ticket
+ * main: Delete lockfile when signal arrive too early
+ * main: Accept longer config and lock file names
+ * Fix gcc-10 warnings for multiple definition of pcmk_handler
+ * Fix gcc-10 warnings for packed struct members
+ * Use pkg-config to configure libxml-2.0
+
+---
+Wed Aug 19 12:34:16 UTC 2020 - Callum Farmer
+
+- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075)
+
+---
+Mon Jan 28 08:51:31 UTC 2019 - aburla...@suse.com
+
+- test: fix read -a <<< issue (bsc#1123313)
+ * test-fix-read-a-issue.patch
+
+---
+Thu Jan 17 11:43:22 UTC 2019 - aburla...@suse.com
+
+- Update to version 1.0+20190112.497c0b9:
+ * fix_asciidoc_build.patch is removed, because the tarball already contains
the changes.
+ * Low: handler: fix spurious warning on alleged "fall-through" in switch
(bsc#1123312)
+ * Low: main: fix hypothetical file path double traversal discrepancy
(bsc#1123310)
+ * Med: attr: fix derefence of unspecified value pointer (bsc#1123308)
+ * maint: ocf + script: eliminate some false positives with ShellCheck
(bsc#1123303)
+ * test: unit-test.py: daemon will not stay in foreground with -D anymore
(bsc#1123302)
+ * test: avoid dangerous mutable/sticky default value (bsc#1123301)
+ * test: drop/comment out superfluous imports (bsc#1123300)
+ * test: drop underqualified identifier in unittest's 2.6 compat "polyfill"
(bsc#1123299)
+ * test: remove superfluous shebangs for import-only modules (bsc#1123297)
+ * maint: fix typos introduced in 4bb484a (bsc#1123296)
+ * maint: fix thinko in .gitignore introduced in 5a457ee (bsc#1123294)
+ * Fix malformed man title (bsc#1123290)
+ * Handle multi-leader situation for manual tickets. Added manual tickets to
Life Tests framework (bsc#1123289)
+ * Feature: add manual mode to booth tickets (bsc#1123287)
+ * Fix GCC-7 warning on buffer size (bsc#1123285)
+
+---
Old:
booth-1.0+20180417.c2389e3.tar.bz2
fix_asciidoc_build.patch
New:
booth-1.0+20200702.2f043da.tar.bz2
test-fix-read-a-issue.patch
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.jJa0r7/_old 2020-09-23 18:43:27.609490184 +0200
+++ /var/tmp/diff_new_pack.jJa0r7/_new 2020-09-23 18:43:27.613490188 +0200
@@ -1,7 +1,7 @@
#
# spec file for package booth
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -21,7 +21,7 @@
%bcond_with glue
# local commit:
-%global commit 1.0+20180417.c2389e3
+%global commit 1.0+20200702.2f043da
%global uname hacluster
%global gname haclient
@@ -29,18 +29,18 @@
%global test_path %{_datadir}/booth/tests
%define _libexecdir %{_libdir}
-%define _fwdefdir %{_libexecdir}/firewalld/services
+%define _fwdefdir %{_prefix}/lib/firewalld/services
Name: booth
Version:1.0
Release:0
Summary:Ticket Manager for Multi-site Clusters
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: Productivity/Clustering/HA
Url:https://github.com/ClusterLabs/booth
Source: %{name}-%{commit}.tar.bz2
Source1:%{name}-rpmlintrc
-Patch1: fi
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2018-04-30 22:58:33
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Mon Apr 30 22:58:33 2018 rev:45 rq:602541 version:1.0
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2018-02-27
16:57:09.753766188 +0100
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2018-04-30
22:59:37.358963662 +0200
@@ -1,0 +2,8 @@
+Mon Apr 30 06:52:34 UTC 2018 - ckowalc...@suse.com
+
+- Doc: fix the documentation build with asciidoctor (bsc#1075764):
+ * fix_asciidoc_build.patch
+- Service: restart arbitrator on failure
+- Upstream version cs: c2389e3020e8a3780b679cf0c9857bd608e99fa1
+
+---
Old:
booth-1.0+20180201.80199f9.tar.bz2
New:
booth-1.0+20180417.c2389e3.tar.bz2
fix_asciidoc_build.patch
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.UtVJB1/_old 2018-04-30 22:59:37.990940601 +0200
+++ /var/tmp/diff_new_pack.UtVJB1/_new 2018-04-30 22:59:37.994940455 +0200
@@ -21,7 +21,7 @@
%bcond_with glue
# local commit:
-%global commit 1.0+20180201.80199f9
+%global commit 1.0+20180417.c2389e3
%global uname hacluster
%global gname haclient
@@ -40,6 +40,7 @@
Url:https://github.com/ClusterLabs/booth
Source: %{name}-%{commit}.tar.bz2
Source1:%{name}-rpmlintrc
+Patch1: fix_asciidoc_build.patch
BuildRequires: asciidoc
BuildRequires: autoconf
BuildRequires: automake
@@ -78,6 +79,7 @@
%prep
%setup -q -n %{name}-%{commit}
+%patch1 -p1
%build
autoreconf -fvi
++ booth-1.0+20180201.80199f9.tar.bz2 -> booth-1.0+20180417.c2389e3.tar.bz2
++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20180201.80199f9/.git_info
new/booth-1.0+20180417.c2389e3/.git_info
--- old/booth-1.0+20180201.80199f9/.git_info2018-02-22 10:01:37.572481757
+0100
+++ new/booth-1.0+20180417.c2389e3/.git_info2018-04-30 08:41:55.389581125
+0200
@@ -1 +1 @@
-v1.0-133-g80199f9
+v1.0-139-gc2389e3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20180201.80199f9/booth.spec
new/booth-1.0+20180417.c2389e3/booth.spec
--- old/booth-1.0+20180201.80199f9/booth.spec 2018-02-01 10:57:55.0
+0100
+++ new/booth-1.0+20180417.c2389e3/booth.spec 2018-04-17 12:21:32.0
+0200
@@ -45,7 +45,7 @@
Source: booth.tar.bz2
Source1:%name-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: asciidoc
+BuildRequires: asciidoctor
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: pkgconfig
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/booth-1.0+20180201.80199f9/conf/booth-arbitrator.service.in
new/booth-1.0+20180417.c2389e3/conf/booth-arbitrator.service.in
--- old/booth-1.0+20180201.80199f9/conf/booth-arbitrator.service.in
2018-02-01 10:57:55.0 +0100
+++ new/booth-1.0+20180417.c2389e3/conf/booth-arbitrator.service.in
2018-04-17 12:21:32.0 +0200
@@ -14,3 +14,6 @@
Type=simple
@NOTIFY_ACCESS_SWITCH@NotifyAccess=main
ExecStart=/usr/sbin/boothd daemon -S -c /etc/booth/booth.conf
+
+# Restart options include: no, on-success, on-failure, on-abnormal,
on-watchdog, on-abort, or always
+Restart=on-failure
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20180201.80199f9/configure.ac
new/booth-1.0+20180417.c2389e3/configure.ac
--- old/booth-1.0+20180201.80199f9/configure.ac 2018-02-01 10:57:55.0
+0100
+++ new/booth-1.0+20180417.c2389e3/configure.ac 2018-04-17 12:21:32.0
+0200
@@ -61,11 +61,15 @@
AC_PATH_PROGS(PKGCONFIG, pkg-config)
AC_PATH_PROGS(ASCIIDOC, asciidoc)
+AC_PATH_PROGS(ASCIIDOCTOR, asciidoctor)
+AC_PATH_PROGS(A2X, a2x)
AC_PATH_PROGS(XML2CONFIG, xml2-config)
-AM_CONDITIONAL(BUILD_ASCIIDOC, test x"${ASCIIDOC}" != x"")
+AM_CONDITIONAL(IS_ASCIIDOC, test "x{ASCIIDOC}" = "xasciidoc")
+AM_CONDITIONAL(IS_A2X, test "x${A2X}" = "xa2x")
+AM_CONDITIONAL(BUILD_ASCIIDOC, test x"${A2X}" != x"" || test x"${ASCIIDOCTOR}"
!= x"")
AM_CONDITIONAL(BUILD_ASCIIDOC_HTML_MAN,
- test "x${ASCIIDOC}" != "x" && test "x$with_html_man" = "xyes")
+ (test "x${ASCIIDOC}" != "x" || test x"${ASCIIDOCTOR}" != x"") &&
test "x$with_html_man" = "xyes")
# libgcrypt or mhash for hmac
libgcrypt_installed="yes"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20180201.80199f9/docs/Makefile.am
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2018-02-27 16:57:09
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Tue Feb 27 16:57:09 2018 rev:44 rq:578987 version:1.0
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2017-12-01
15:55:01.741034009 +0100
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2018-02-27
16:57:09.753766188 +0100
@@ -1,0 +2,6 @@
+Thu Feb 22 09:23:51 UTC 2018 - ckowalc...@suse.com
+
+- Build: replace SuSEFirewall2 by firewalld (fate#320794) in booth.spec
+- Upstream version cs: 80199f9477fb4fbf8809f31986139efe3f4ef790
+
+---
Old:
booth-1.0+20171123.d4cb8cb.tar.bz2
New:
booth-1.0+20180201.80199f9.tar.bz2
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.c8Fblb/_old 2018-02-27 16:57:11.033719941 +0100
+++ /var/tmp/diff_new_pack.c8Fblb/_new 2018-02-27 16:57:11.037719797 +0100
@@ -1,7 +1,7 @@
#
# spec file for package booth
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,14 +21,15 @@
%bcond_with glue
# local commit:
-%global commit 1.0+20171123.d4cb8cb
+%global commit 1.0+20180201.80199f9
%global uname hacluster
%global gname haclient
%global test_path %{_datadir}/booth/tests
-%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
+%define _libexecdir %{_libdir}
+%define _fwdefdir %{_libexecdir}/firewalld/services
Name: booth
Version:1.0
@@ -110,9 +111,9 @@
rm -f %{buildroot}/%{test_path}/test/*.pyc
%if 0%{?suse_version}
-#SUSE firewall rule
+#Firewalld rule
mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir}
-install -m 644 contrib/geo-cluster.fwd $RPM_BUILD_ROOT/%{_fwdefdir}/booth
+install -m 644 contrib/geo-cluster.firewalld.xml
$RPM_BUILD_ROOT/%{_fwdefdir}/booth.xml
#install -m 644 %{S:2} $RPM_BUILD_ROOT/%{_fwdefdir}/booth
%endif
@@ -120,6 +121,10 @@
%service_add_pre booth-arbitrator.service
%post
+#Reload firewalld if already installed
+if [ -e /usr/sbin/firewalld ]; then
+%firewalld_reload
+fi
%service_add_post booth-arbitrator.service
%preun
@@ -151,7 +156,9 @@
%{_prefix}/lib/ocf/resource.d/booth/geostore
%config %attr (644, %{uname}, %{gname}) %{_sysconfdir}/booth/booth.conf.example
%if 0%{?suse_version}
-%config %{_fwdefdir}/booth
+%dir %{_libexecdir}/firewalld
+%dir %{_fwdefdir}
+%{_fwdefdir}/booth.xml
%endif
%{_unitdir}/booth@.service
%{_unitdir}/booth-arbitrator.service
++ booth-1.0+20171123.d4cb8cb.tar.bz2 -> booth-1.0+20180201.80199f9.tar.bz2
++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20171123.d4cb8cb/.git_info
new/booth-1.0+20180201.80199f9/.git_info
--- old/booth-1.0+20171123.d4cb8cb/.git_info2017-12-01 10:44:10.863914778
+0100
+++ new/booth-1.0+20180201.80199f9/.git_info2018-02-22 10:01:37.572481757
+0100
@@ -1 +1 @@
-v1.0-131-gd4cb8cb
+v1.0-133-g80199f9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20171123.d4cb8cb/booth.spec
new/booth-1.0+20180201.80199f9/booth.spec
--- old/booth-1.0+20171123.d4cb8cb/booth.spec 2017-11-23 14:07:59.0
+0100
+++ new/booth-1.0+20180201.80199f9/booth.spec 2018-02-01 10:57:55.0
+0100
@@ -20,11 +20,11 @@
%if 0%{?suse_version}
%define _libexecdir %{_libdir}
+%define _fwdefdir %{_libexecdir}/firewalld/services
%endif
%define with_extra_warnings0
%define with_debugging 0
%define without_fatal_warnings 1
-%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
%define pkg_group System Environment/Daemons
%else
@@ -51,6 +51,8 @@
BuildRequires: pkgconfig
%if 0%{?suse_version}
BuildRequires: glib2-devel
+# SuSEFirewall2 replaced by Firewalld (fate#323460)
+BuildRequires: firewall-macros
%else
BuildRequires: pkgconfig(glib-2.0)
%endif
@@ -135,10 +137,13 @@
rm -f %{buildroot}/%{test_path}/test/*.pyc
%if 0%{?suse_version}
-#SUSE firewall rule
+#Firewalld rule
mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir}
-install -m 644 contrib/geo-cluster.fwd $RPM_BUILD_ROOT/%{_fwdefdir}/booth
+install -m 644 contrib/geo-cluster.firewalld.xml
$RPM_BUILD_ROOT/%{_fwdefdir}/booth.xml
#install -m 644 %{S:2} $RPM_BUILD_ROOT/%{_fwdefdir}/booth
+
+%post
+%firewalld_reload
%endif
%check
@@ -174,7 +179,9 @@
/usr/lib/ocf/resource.d/booth/g
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2017-12-01 15:54:31
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Fri Dec 1 15:54:31 2017 rev:43 rq:547071 version:1.0
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2017-06-23
09:18:58.593248682 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2017-12-01
15:55:01.741034009 +0100
@@ -1,0 +2,12 @@
+Fri Dec 1 10:50:28 UTC 2017 - ckowalc...@suse.com
+
+- Tickets: added manual tickets, which allow handling 2-site setup
+ (fate#322100)
+- Debug mode: fixed the interaction with resource agents (bsc#1046790)
+- Patch file bug-1045067_booth-fix-booth-grant-cmd.patch has been removed
+ after the code being merged to upstream:
+ * Clinet commands: fixed local IP addresses for booth grant, list,
+and peers commands (bsc#1045067)
+- Upstream version cs: d4cb8cbdaf87e46f636c3d06730b902b79bdcb9c
+
+---
Old:
booth-1.0+20170619.766d618.tar.bz2
bug-1045067_booth-fix-booth-grant-cmd.patch
New:
booth-1.0+20171123.d4cb8cb.tar.bz2
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.7fmU46/_old 2017-12-01 15:55:02.425009396 +0100
+++ /var/tmp/diff_new_pack.7fmU46/_new 2017-12-01 15:55:02.429009252 +0100
@@ -21,7 +21,7 @@
%bcond_with glue
# local commit:
-%global commit 1.0+20170619.766d618
+%global commit 1.0+20171123.d4cb8cb
%global uname hacluster
%global gname haclient
@@ -39,7 +39,6 @@
Url:https://github.com/ClusterLabs/booth
Source: %{name}-%{commit}.tar.bz2
Source1:%{name}-rpmlintrc
-Patch1: bug-1045067_booth-fix-booth-grant-cmd.patch
BuildRequires: asciidoc
BuildRequires: autoconf
BuildRequires: automake
@@ -78,7 +77,6 @@
%prep
%setup -q -n %{name}-%{commit}
-%patch1 -p1
%build
autoreconf -fvi
++ booth-1.0+20170619.766d618.tar.bz2 -> booth-1.0+20171123.d4cb8cb.tar.bz2
++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20170619.766d618/.git_info
new/booth-1.0+20171123.d4cb8cb/.git_info
--- old/booth-1.0+20170619.766d618/.git_info2017-06-22 10:32:51.935559567
+0200
+++ new/booth-1.0+20171123.d4cb8cb/.git_info2017-12-01 10:44:10.863914778
+0100
@@ -1 +1 @@
-v1.0-114-g766d618
+v1.0-131-gd4cb8cb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20170619.766d618/README-testing
new/booth-1.0+20171123.d4cb8cb/README-testing
--- old/booth-1.0+20170619.766d618/README-testing 2017-06-19
12:23:29.0 +0200
+++ new/booth-1.0+20171123.d4cb8cb/README-testing 2017-11-23
14:07:59.0 +0100
@@ -16,9 +16,9 @@
emulation functions.
There are some restrictions on how booth.conf is formatted.
-There could be several tickets defined, but only the first ticket
-is used for testing. This ticket must have expire and timeout
-parameters configured.
+There may be several tickets defined and all of them will be
+tested, one after another (they will be tested separately).
+The tickets must have expire and timeout parameters configured.
Example booth.conf:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20170619.766d618/docs/boothd.8.txt
new/booth-1.0+20171123.d4cb8cb/docs/boothd.8.txt
--- old/booth-1.0+20170619.766d618/docs/boothd.8.txt2017-06-19
12:23:29.0 +0200
+++ new/booth-1.0+20171123.d4cb8cb/docs/boothd.8.txt2017-11-23
14:07:59.0 +0100
@@ -74,6 +74,9 @@
'immediate grant': Don't wait for unreachable sites to
relinquish the ticket. See the 'Booth ticket management'
section below for more details.
+ For manual tickets this option allows to grant a ticket
+ which is currently granted. See the 'Manual tickets' section
+ below for more details.
+
This option may be DANGEROUS. It makes booth grant the ticket
even though it cannot ascertain that unreachable sites don't
@@ -97,12 +100,11 @@
Report version information.
*-S*::
- 'systemd' mode: don't fork. This is like '-D' but without the debug
output.
+ 'systemd' mode: don't fork.
+ Disables daemonizing, the process will remain in the foreground.
*-D*::
- Debug output/don't daemonize.
- Increases the debug output level; booth daemon remains
- in the foreground.
+ Increases the debug output level.
*-l* 'lockfile'::
Use another lock file. By default, the lock file name is
@@ -367,6 +369,14 @@
Note that there c
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2017-06-23 09:18:37
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Fri Jun 23 09:18:37 2017 rev:42 rq:505692 version:1.0
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2017-06-12
15:33:55.739690404 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2017-06-23
09:18:58.593248682 +0200
@@ -1,0 +2,10 @@
+Thu Jun 22 15:32:53 UTC 2017 - ckowalc...@suse.com
+
+- Clinet commands: fixed local IP addresses for booth grant, list, and peers
+ commands (bsc#1045067)
+ * bug-1045067_booth-fix-booth-grant-cmd.patch
+- Patch bug-1039727_booth-build.patch merged to upstream:
+ * Build: create and set working directory (bsc#1039727)
+- Upstream version cs: 766d61881b2cb576645821322edda0edea04828d
+
+---
Old:
booth.tar.bz2
bug-1039727_booth-build.patch
New:
booth-1.0+20170619.766d618.tar.bz2
bug-1045067_booth-fix-booth-grant-cmd.patch
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.PqgEjY/_old 2017-06-23 09:19:00.676954248 +0200
+++ /var/tmp/diff_new_pack.PqgEjY/_new 2017-06-23 09:19:00.680953683 +0200
@@ -20,6 +20,9 @@
%bcond_with glue
+# local commit:
+%global commit 1.0+20170619.766d618
+
%global uname hacluster
%global gname haclient
@@ -34,9 +37,9 @@
License:GPL-2.0+
Group: Productivity/Clustering/HA
Url:https://github.com/ClusterLabs/booth
-Source: booth.tar.bz2
+Source: %{name}-%{commit}.tar.bz2
Source1:%{name}-rpmlintrc
-Patch1: bug-1039727_booth-build.patch
+Patch1: bug-1045067_booth-fix-booth-grant-cmd.patch
BuildRequires: asciidoc
BuildRequires: autoconf
BuildRequires: automake
@@ -74,7 +77,7 @@
the Cluster Ticket Manager for Pacemaker.
%prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{commit}
%patch1 -p1
%build
++ bug-1045067_booth-fix-booth-grant-cmd.patch ++
diff --git a/src/transport.c b/src/transport.c
index b3e4432..7793926 100644
--- a/src/transport.c
+++ b/src/transport.c
@@ -237,16 +237,38 @@ int _find_myself(int family, struct booth_site **mep, int
fuzzy_allowed)
BOOTH_IPADDR_LEN);
}
- /* First try with exact addresses, then
optionally with subnet matching. */
+ /* Try to find the exact address or the address
with subnet matching.
+* The function find_address will be called for
each address received
+* from NLMSG_DATA above.
+* The exact match will be prefered. If no
exact match is found,
+* the function find_address will try to return
another, most similar
+* address (with the longest possible number of
same bytes). */
if (ifa->ifa_prefixlen > address_bits_matched) {
find_address(ipaddr,
ifa->ifa_family,
ifa->ifa_prefixlen,
fuzzy_allowed, &me,
&address_bits_matched);
+
if (me) {
log_debug("found myself at %s
(%d bits matched)",
site_string(me), address_bits_matched);
}
}
+ /* If the previous NLMSG_DATA calls have
already allowed us
+* to find an address with address_bits_matched
matching bits,
+* then no other better non-exact address can
bo found.
+* But we can still try to find an exact match,
so let us
+* call the function find_address with disabled
searching of
+* similar addresses (fuzzy_allowed == 0) */
+ else if (ifa->ifa_prefixlen ==
address_bits_matched) {
+ find_address(ipaddr,
+ ifa->ifa_family,
ifa->ifa_prefixlen,
+ 0 /* fuzzy_allowed */,
&me, &address_bits_matched);
+
+ if (me) {
+
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2017-06-12 15:33:55
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Mon Jun 12 15:33:55 2017 rev:41 rq:502676 version:1.0
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2017-06-02
10:34:19.347511043 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2017-06-12
15:33:55.739690404 +0200
@@ -2 +2 @@
-Thu Jun 1 13:23:42 UTC 2017 - ckowalc...@suse.com
+Thu Jun 2 14:11:42 UTC 2017 - ckowalc...@suse.com
@@ -4,2 +4,4 @@
-- configuration: handle hostnames in booth.conf file
-- build: create and set working directory
+- Build: create and set working directory (bsc#1039727)
+ * bug-1039727_booth-build.patch
+- Configuration: handle hostnames in booth.conf file (bsc#1037422)
+- Upstream version cs: bbddf969550969784b76b743baecdcf72796bdf7
Old:
booth-1.0+20170601.9647c6d.tar.bz2
New:
booth.tar.bz2
bug-1039727_booth-build.patch
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.Wqkpo0/_old 2017-06-12 15:33:57.091499744 +0200
+++ /var/tmp/diff_new_pack.Wqkpo0/_new 2017-06-12 15:33:57.095499180 +0200
@@ -25,9 +25,6 @@
%global test_path %{_datadir}/booth/tests
-# local commit:
-%global commit 1.0+20170601.9647c6d
-
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
Name: booth
@@ -37,8 +34,9 @@
License:GPL-2.0+
Group: Productivity/Clustering/HA
Url:https://github.com/ClusterLabs/booth
-Source: %{name}-%{commit}.tar.bz2
+Source: booth.tar.bz2
Source1:%{name}-rpmlintrc
+Patch1: bug-1039727_booth-build.patch
BuildRequires: asciidoc
BuildRequires: autoconf
BuildRequires: automake
@@ -76,7 +74,8 @@
the Cluster Ticket Manager for Pacemaker.
%prep
-%setup -q -n %{name}-%{commit}
+%setup -q -n %{name}
+%patch1 -p1
%build
autoreconf -fvi
@@ -161,6 +160,9 @@
%doc AUTHORS README COPYING
%doc README.upgrade-from-v0.1
+%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/
+%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/cores
+
%files test
%defattr(-,root,root)
%doc README-testing
++ booth-1.0+20170601.9647c6d.tar.bz2 -> booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20170601.9647c6d/.git_info
new/booth/.git_info
--- old/booth-1.0+20170601.9647c6d/.git_info2017-06-01 15:45:18.779767136
+0200
+++ new/booth/.git_info 1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-v1.0-114-g9647c6d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20170601.9647c6d/Makefile.am
new/booth/Makefile.am
--- old/booth-1.0+20170601.9647c6d/Makefile.am 2017-06-01 14:54:29.0
+0200
+++ new/booth/Makefile.am 2017-06-01 13:52:09.0 +0200
@@ -83,10 +83,6 @@
$(INSTALL) -d $(DESTDIR)/${boothsitedir}
$(INSTALL) -d $(DESTDIR)/${boothocfdir}
$(INSTALL) -d $(DESTDIR)/${SOCKETDIR}
- $(INSTALL) -d $(DESTDIR)/${BOOTH_LIB_DIR} -m 750
- -chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP)
$(DESTDIR)/${BOOTH_LIB_DIR}
- $(INSTALL) -d $(DESTDIR)/${BOOTH_CORE_DIR} -m 750
- -chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP)
$(DESTDIR)/${BOOTH_CORE_DIR}
install-exec-hook:
ln -sf ${sbindir}/boothd $(DESTDIR)/${sbindir}/booth
@@ -97,8 +93,6 @@
rmdir $(DESTDIR)/${bootharbitratordir} || :;
rmdir $(DESTDIR)/${boothsitedir} || :;
rmdir $(DESTDIR)/${SOCKETDIR} || :;
- rmdir $(DESTDIR)/${BOOTH_CORE_DIR} || :;
- rmdir $(DESTDIR)/${BOOTH_LIB_DIR} || :;
test: check
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20170601.9647c6d/booth.spec
new/booth/booth.spec
--- old/booth-1.0+20170601.9647c6d/booth.spec 2017-06-01 14:54:29.0
+0200
+++ new/booth/booth.spec2017-06-01 13:52:09.0 +0200
@@ -166,8 +166,6 @@
%dir /usr/lib/ocf/lib
%dir /usr/lib/ocf/lib/booth
%dir %{_sysconfdir}/booth
-%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/
-%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/cores
%{_sbindir}/rcbooth-arbitrator
/usr/lib/ocf/resource.d/pacemaker/booth-site
/usr/lib/ocf/lib/booth/geo_attr.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20170601.9647c6d/configure.ac
new/booth/configure.ac
--- old/booth-1.0+20170601.9647c6d/configure.ac 2017-06-01 14:54:29.0
+0200
+++ new/booth/configure.ac 2017-06-01 13:52:09.0 +0200
@@ -169,31 +169,6 @@
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2017-06-02 10:34:06
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Fri Jun 2 10:34:06 2017 rev:40 rq:500434 version:1.0
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2017-04-12
17:12:57.262966323 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2017-06-02
10:34:19.347511043 +0200
@@ -1,0 +2,6 @@
+Thu Jun 1 13:23:42 UTC 2017 - ckowalc...@suse.com
+
+- configuration: handle hostnames in booth.conf file
+- build: create and set working directory
+
+---
Old:
booth.tar.bz2
New:
booth-1.0+20170601.9647c6d.tar.bz2
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.LfcruO/_old 2017-06-02 10:34:20.043412717 +0200
+++ /var/tmp/diff_new_pack.LfcruO/_new 2017-06-02 10:34:20.043412717 +0200
@@ -25,6 +25,9 @@
%global test_path %{_datadir}/booth/tests
+# local commit:
+%global commit 1.0+20170601.9647c6d
+
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
Name: booth
@@ -34,7 +37,7 @@
License:GPL-2.0+
Group: Productivity/Clustering/HA
Url:https://github.com/ClusterLabs/booth
-Source: booth.tar.bz2
+Source: %{name}-%{commit}.tar.bz2
Source1:%{name}-rpmlintrc
BuildRequires: asciidoc
BuildRequires: autoconf
@@ -73,7 +76,7 @@
the Cluster Ticket Manager for Pacemaker.
%prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{commit}
%build
autoreconf -fvi
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2017-04-12 17:12:55
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Wed Apr 12 17:12:55 2017 rev:39 rq:458685 version:1.0
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2016-08-31
00:11:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2017-04-12
17:12:57.262966323 +0200
@@ -1,0 +2,31 @@
+Wed Feb 15 14:38:58 UTC 2017 - y...@suse.com
+
+- spec: fix booth-test containing undesired build sources
+- make log contain source address of unknown site
+- main: initialize Libcrypt properly before the first use (bsc#1025463)
+- extprog: fix race condition on ticket loss (bsc#1025463)
+- attr: fix wrong order for hash free functions (bsc#1025463)
+- attr: set time string to "" when time is not set
+- extprog: fix pid test
+- ticket: reset next state on ticket reset
+- alternative logger (in service-runnable script)
+- allow skipping "coredump nursing" phase
+- alternative "nametag" provider: libsystemd
+- alternative range2random provider: glib
+- alternative logging provider: libqb
+- offer alternatives to libraries from (cluster-)glue
+- setup_tcp_listener: close socket when no longer needed
+- read_client: sizeof(*struct_ptr) instead of sizeof(struct_ptr) (bsc#1025463)
+- get_local_id: denoopize dependent condition (signedness issue) (bsc#1025463)
+- list_ticket: fix a memleak in case of buffer too small (bsc#1025463)
+- do_status: close lock file when no longer needed
+- format_peers: fix a memleak in case of buffer too small (bsc#1025463)
+- read_config: close config file when no longer needed
+- make foreach_* macros use variable refs passed as arguments (bsc#1025463)
+- prevent possible truncation w/ invalid geoattrs in CIB (bsc#1025463)
+- build: add proper zlib build-time check + link flag + spec's BR
+- build: allow requesting no HTML man + use in spec
+- fixup: sanitize true-false logic for "daemonize"
+- Upstream version cs: b270a78130f40e648844671b3652919d86e1aef4
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.oPv6VZ/_old 2017-04-12 17:12:59.070710419 +0200
+++ /var/tmp/diff_new_pack.oPv6VZ/_new 2017-04-12 17:12:59.074709853 +0200
@@ -1,7 +1,7 @@
#
# spec file for package booth
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,10 +16,17 @@
#
+%bcond_with html_man
+
+%bcond_with glue
+
%global uname hacluster
%global gname haclient
%global test_path %{_datadir}/booth/tests
+
+%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
+
Name: booth
Version:1.0
Release:0
@@ -33,11 +40,19 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libgcrypt-devel
+%if 0%{?with_glue}
BuildRequires: libglue-devel
+%else
+# logging provider
+BuildRequires: pkgconfig(libqb)
+# nametag provider
+BuildRequires: pkgconfig(libsystemd)
+%endif
BuildRequires: pkgconfig
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(pacemaker)
+BuildRequires: pkgconfig(zlib)
Requires: pacemaker-ticket-support >= 2.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -64,7 +79,9 @@
autoreconf -fvi
%configure \
--with-initddir=%{_initddir} \
---docdir=%{_docdir}/%{name}
+--docdir=%{_docdir}/%{name} \
+%{!?with_html_man:--without-html_man} \
+%{!?with_glue:--without-glue}
make %{?_smp_mflags}
%install
@@ -79,8 +96,9 @@
ln -s service %{buildroot}%{_sbindir}/rcbooth-arbitrator
#install test-parts
-mkdir -p %{buildroot}/%{test_path}
-cp -a unit-tests/ script/unit-test.py test conf %{buildroot}/%{test_path}/
+mkdir -p %{buildroot}/%{test_path}/conf
+cp -a unit-tests/ script/unit-test.py test %{buildroot}/%{test_path}/
+cp -a conf/booth.conf.example %{buildroot}/%{test_path}/conf/
chmod +x %{buildroot}/%{test_path}/test/booth_path
chmod +x %{buildroot}/%{test_path}/test/live_test.sh
@@ -88,6 +106,13 @@
ln -s %{_sbindir}/boothd %{buildroot}/%{test_path}/src/
rm -f %{buildroot}/%{test_path}/test/*.pyc
+%if 0%{?suse_version}
+#SUSE firewall rule
+mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir}
+install -m 644 contrib/geo-cluster.fwd $RPM_BUILD_ROOT/%{_fwdefdir}/booth
+#install -m 644 %{S:2} $RPM_BUILD_ROOT/%{_fwdefdir}/booth
+%endif
+
%pre
%service_add_pre booth-arbitrator.service
@@ -122,6 +147,
commit booth for openSUSE:Factory
Hello community, here is the log from the commit of package booth for openSUSE:Factory checked in at 2016-08-31 00:10:42 Comparing /work/SRC/openSUSE:Factory/booth (Old) and /work/SRC/openSUSE:Factory/.booth.new (New) Package is "booth" Changes: --- /work/SRC/openSUSE:Factory/booth/booth.changes 2016-07-14 09:50:31.0 +0200 +++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2016-08-31 00:11:54.0 +0200 @@ -17 +17 @@ - + main: fix address matching procedure + + main: fix address matching procedure (bsc#994999) Other differences: -- ++ _servicedata ++ --- /var/tmp/diff_new_pack.xOiWrl/_old 2016-08-31 00:11:55.0 +0200 +++ /var/tmp/diff_new_pack.xOiWrl/_new 2016-08-31 00:11:55.0 +0200 @@ -1,4 +1,4 @@ git://github.com/ClusterLabs/booth.git - 106efdf386c23aa7c740f1d238ecd04fd63f5ebc \ No newline at end of file + 4d35ac7ffe9e7ec4a8d32020a7c4e62a0f205b61
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2016-07-14 09:50:27
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2016-07-03
12:28:43.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2016-07-14
09:50:31.0 +0200
@@ -1,0 +2,5 @@
+Wed Jul 13 12:53:22 UTC 2016 - y...@suse.com
+
+- spec: Set the owner of /etc/booth and booth.conf.example to
hacluster:haclient (bsc#968865)
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.2ucLZN/_old 2016-07-14 09:50:32.0 +0200
+++ /var/tmp/diff_new_pack.2ucLZN/_new 2016-07-14 09:50:32.0 +0200
@@ -16,6 +16,9 @@
#
+%global uname hacluster
+%global gname haclient
+
%global test_path %{_datadir}/booth/tests
Name: booth
Version:1.0
@@ -113,12 +116,12 @@
%dir %{_prefix}/lib/ocf/resource.d/booth
%dir %{_prefix}/lib/ocf/lib
%dir %{_prefix}/lib/ocf/lib/booth
-%dir %{_sysconfdir}/booth
+%dir %attr (755, %{uname}, %{gname}) %{_sysconfdir}/booth
%{_sbindir}/rcbooth-arbitrator
%{_prefix}/lib/ocf/resource.d/pacemaker/booth-site
%{_prefix}/lib/ocf/lib/booth/geo_attr.sh
%{_prefix}/lib/ocf/resource.d/booth/geostore
-%config %{_sysconfdir}/booth/booth.conf.example
+%config %attr (644, %{uname}, %{gname}) %{_sysconfdir}/booth/booth.conf.example
%{_unitdir}/booth@.service
%{_unitdir}/booth-arbitrator.service
%exclude %{_initddir}/booth-arbitrator
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2016-07-03 12:28:41
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2016-04-28
16:57:02.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2016-07-03
12:28:43.0 +0200
@@ -1,0 +2,7 @@
+Thu Jun 30 13:57:46 UTC 2016 - tchva...@suse.com
+
+- Reduce conditionals to only keep the default values
+- Run systemd macros in proper phases
+- Convert to pkgconfig dependencies
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.OdlVpH/_old 2016-07-03 12:28:44.0 +0200
+++ /var/tmp/diff_new_pack.OdlVpH/_new 2016-07-03 12:28:44.0 +0200
@@ -16,60 +16,27 @@
#
-%if 0%{?suse_version}
-%global booth_docdir %{_defaultdocdir}/%{name}
-%else
-# newer fedora distros have _pkgdocdir, rely on that when
-# available
-%{!?_pkgdocdir: %global _pkgdocdir %%{_docdir}/%{name}-%{version}}
-# Directory where we install documentation
-%global booth_docdir %{_pkgdocdir}
-%endif
-
%global test_path %{_datadir}/booth/tests
-
-%if 0%{?suse_version}
-%define _libexecdir %{_libdir}
-%endif
-%define with_extra_warnings0
-%define with_debugging 0
-%define without_fatal_warnings 1
-%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
-%define pkg_group System Environment/Daemons
-%else
-%define pkg_group Productivity/Clustering/HA
-%endif
-
Name: booth
-Url:https://github.com/ClusterLabs/booth
-Summary:Ticket Manager for Multi-site Clusters
-License:GPL-2.0+
-Group: %{pkg_group}
Version:1.0
Release:0
+Summary:Ticket Manager for Multi-site Clusters
+License:GPL-2.0+
+Group: Productivity/Clustering/HA
+Url:https://github.com/ClusterLabs/booth
Source: booth.tar.bz2
-Source1:%name-rpmlintrc
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Source1:%{name}-rpmlintrc
BuildRequires: asciidoc
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: glib2-devel
BuildRequires: libgcrypt-devel
-%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
-BuildRequires: cluster-glue-libs-devel
-BuildRequires: pacemaker-libs-devel
-%else
BuildRequires: libglue-devel
-BuildRequires: libpacemaker-devel
-%endif
-BuildRequires: libxml2-devel
BuildRequires: pkgconfig
-%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
-Requires: cluster-glue-libs >= 1.0.6
-Requires: pacemaker >= 1.1.8
-%else
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(pacemaker)
Requires: pacemaker-ticket-support >= 2.0
-%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Booth manages tickets which authorize cluster sites located in
@@ -77,41 +44,38 @@
facilitates support of geographically distributed clustering in
Pacemaker.
+%package test
+Summary:Test scripts for Booth
+Group: Productivity/Clustering/HA
+Requires: booth
+Requires: python
+
+%description test
+This package contains automated tests for Booth,
+the Cluster Ticket Manager for Pacemaker.
+
%prep
%setup -q -n %{name}
%build
-./autogen.sh
+autoreconf -fvi
%configure \
- --with-initddir=%{_initrddir} \
- --docdir=%{booth_docdir}
-
-make
-
-#except check
-#%check
-#make check
+--with-initddir=%{_initddir} \
+--docdir=%{_docdir}/%{name}
+make %{?_smp_mflags}
%install
-make DESTDIR=$RPM_BUILD_ROOT install docdir=%{booth_docdir}
+%make_install
-mkdir -p %{buildroot}/%{_mandir}/man8/
-gzip < docs/boothd.8 > %{buildroot}/%{_mandir}/man8/booth.8.gz
-ln %{buildroot}/%{_mandir}/man8/booth.8.gz
%{buildroot}/%{_mandir}/man8/boothd.8.gz
+ln -s boothd.8 %{buildroot}/%{_mandir}/man8/booth.8
-%if %{defined _unitdir}
# systemd
mkdir -p %{buildroot}/%{_unitdir}
cp -a conf/booth@.service %{buildroot}/%{_unitdir}/booth@.service
cp -a conf/booth-arbitrator.service
%{buildroot}/%{_unitdir}/booth-arbitrator.service
-ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcbooth-arbitrator
-%else
-# sysV init
-ln -s ../../%{_initddir}/booth-arbitrator
%{buildroot}%{_sbindir}/rcbooth-arbitrator
-%endif
+ln -s service %{buildroot}%{_sbindir}/rcbooth-arbitrator
#install test-parts
-
mkdir -p %{buildroot}/%{test_path}
cp -a unit-tests/ script/unit-test.py test conf %{buildroot}/%{test_path}/
chmod +x %{buildroot}/%{test_path}/test/booth_path
@@ -121,16 +85,17 @@
ln -s %{_sbindir}/boothd %{buildroot}/%{test_path}/src/
commit booth for openSUSE:Factory
Hello community, here is the log from the commit of package booth for openSUSE:Factory checked in at 2016-04-28 16:54:09 Comparing /work/SRC/openSUSE:Factory/booth (Old) and /work/SRC/openSUSE:Factory/.booth.new (New) Package is "booth" Changes: --- /work/SRC/openSUSE:Factory/booth/booth.changes 2016-04-01 13:02:49.0 +0200 +++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2016-04-28 16:57:02.0 +0200 @@ -1,0 +2,6 @@ +Fri Apr 8 12:54:22 UTC 2016 - dmuhameda...@suse.com + +- Update to version v1.0_14_g4d35ac7: + + main: fix address matching procedure + +--- Other differences: -- ++ booth.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/.git_info new/booth/.git_info --- old/booth/.git_info 2016-03-23 17:32:51.0 +0100 +++ new/booth/.git_info 2016-04-08 14:52:54.0 +0200 @@ -1 +1 @@ -v1.0-6-g106efdf +v1.0-14-g4d35ac7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/GNUmakefile new/booth/GNUmakefile --- old/booth/GNUmakefile 2016-03-23 17:31:14.0 +0100 +++ new/booth/GNUmakefile 2016-04-08 14:52:22.0 +0200 @@ -11,9 +11,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -include Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/docs/Makefile.am new/booth/docs/Makefile.am --- old/booth/docs/Makefile.am 2016-03-23 17:31:14.0 +0100 +++ new/booth/docs/Makefile.am 2016-04-08 14:52:22.0 +0200 @@ -13,9 +13,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # MAINTAINERCLEANFILES= Makefile.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/script/booth-keygen new/booth/script/booth-keygen --- old/booth/script/booth-keygen 2016-03-23 17:31:14.0 +0100 +++ new/booth/script/booth-keygen 2016-04-08 14:52:22.0 +0200 @@ -17,9 +17,9 @@ # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # DFLT_AUTHFILE=/etc/booth/authkey diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/script/ocf/booth-site new/booth/script/ocf/booth-site --- old/booth/script/ocf/booth-site 2016-03-23 17:31:14.0 +0100 +++ new/booth/script/ocf/booth-site 2016-04-08 14:52:22.0 +0200 @@ -18,9 +18,9 @@ # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # ### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/script/ocf/geo_attr.sh new/booth/script/ocf/g
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2016-04-01 13:02:45
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2016-01-22
01:09:43.0 +0100
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2016-04-01
13:02:49.0 +0200
@@ -1,0 +2,14 @@
+Wed Mar 23 16:35:54 UTC 2016 - opensuse-packag...@opensuse.org
+
+- Update to version v1.0_6_g106efdf:
+ + Feature: extprog: add capability to run a set of programs
+ + Medium: extprog: external tests timeout after renewal interval
+
+---
+Wed Mar 16 15:53:29 UTC 2016 - dmuhameda...@suse.com
+
+- Update to release v1.0
+ + systemd: add booth-arbitrator.service (bsc#967036)
+ + main: improve address matching procedure
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.Mqf5sy/_old 2016-04-01 13:02:50.0 +0200
+++ /var/tmp/diff_new_pack.Mqf5sy/_new 2016-04-01 13:02:50.0 +0200
@@ -46,7 +46,7 @@
License:GPL-2.0+
Group: %{pkg_group}
Version:1.0
-Release:0rc1
+Release:0
Source: booth.tar.bz2
Source1:%name-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -103,6 +103,7 @@
# systemd
mkdir -p %{buildroot}/%{_unitdir}
cp -a conf/booth@.service %{buildroot}/%{_unitdir}/booth@.service
+cp -a conf/booth-arbitrator.service
%{buildroot}/%{_unitdir}/booth-arbitrator.service
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcbooth-arbitrator
%else
# sysV init
@@ -156,6 +157,7 @@
%if %{defined _unitdir}
%{_unitdir}/booth@.service
+%{_unitdir}/booth-arbitrator.service
%exclude %{_initddir}/booth-arbitrator
%else
%{_initddir}/booth-arbitrator
@@ -167,22 +169,6 @@
%doc AUTHORS README COPYING
%doc README.upgrade-from-v0.1
-# this should be preun, but...
-%pre
-# new installation?
-test -x %{_sbindir}/booth || exit 0
-# stop the arbitrator if it's the previous paxos version 1.0
-if [ "`booth version | awk '{print $2}'`" = "1.0" ]; then
- echo "booth v0.1 found"
- if grep -qs 'ticket.*;' /etc/booth/booth.conf; then
- echo "Convert the booth configuration in /etc/booth/booth.conf!"
- fi
- if ps -o pid,cmd -e | grep -qs "[b]oothd arbitrator"; then
- rcbooth-arbitrator stop
- fi
-fi
-exit 0
-
%package test
Summary:Test scripts for Booth
Group: %{pkg_group}
++ _servicedata ++
--- /var/tmp/diff_new_pack.Mqf5sy/_old 2016-04-01 13:02:50.0 +0200
+++ /var/tmp/diff_new_pack.Mqf5sy/_new 2016-04-01 13:02:50.0 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/booth.git
- 9c5c19f2c9217db9bf6265e8e753ac15ba631ae0
\ No newline at end of file
+ 106efdf386c23aa7c740f1d238ecd04fd63f5ebc
\ No newline at end of file
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/.git_info new/booth/.git_info
--- old/booth/.git_info 2016-01-12 15:03:32.0 +0100
+++ new/booth/.git_info 2016-03-23 17:32:51.0 +0100
@@ -1 +1 @@
-v1.0rc1
+v1.0-6-g106efdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/ChangeLog new/booth/ChangeLog
--- old/booth/ChangeLog 2016-01-12 11:50:01.0 +0100
+++ new/booth/ChangeLog 2016-03-23 17:31:14.0 +0100
@@ -1,3 +1,8 @@
+* Mar Jan 16 2016 Dejan Muhamedagic and others
+- stable release 1.0
+- systemd: add booth-arbitrator.service (bsc#967036)
+- main: improve address matching procedure
+
* Mon Jan 11 2016 Dejan Muhamedagic and others
- release candidate 1.0 rc1
- main: prevent segfault on no arguments
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/README new/booth/README
--- old/booth/README2016-01-12 11:50:01.0 +0100
+++ new/booth/README2016-03-23 17:31:14.0 +0100
@@ -118,14 +118,18 @@
renewals are configurable and by default set to half ticket
expire time.
-Before ticket renewal, the leader runs an external program if
-such program is set in 'before-acquire-handler'. The external
-program should ensure that the cluster managed service which is
-protected by this ticket can run at this site. If that program
-fails, the leader relinquishes the ticket. It announces its
-intention to step down by broadcasting an unsolicited VOTE_FOR
-with an empty vote. On receiving such RPC other servers start new
-el
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2016-01-21 23:44:05
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2015-12-09
22:13:08.0 +0100
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2016-01-22
01:09:43.0 +0100
@@ -1,0 +2,7 @@
+Tue Jan 12 14:00:41 UTC 2016 - dmuhameda...@suse.com
+
+- Update to release candidate v1.0 rc1
+ + main: prevent segfault on no arguments
+ + ticket: term 0 is a valid term (bsc#952426)
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.VY4M2y/_old 2016-01-22 01:09:45.0 +0100
+++ /var/tmp/diff_new_pack.VY4M2y/_new 2016-01-22 01:09:45.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package booth
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -45,8 +45,8 @@
Summary:Ticket Manager for Multi-site Clusters
License:GPL-2.0+
Group: %{pkg_group}
-Version:0.2.0
-Release:0
+Version:1.0
+Release:0rc1
Source: booth.tar.bz2
Source1:%name-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/.git_info new/booth/.git_info
--- old/booth/.git_info 2015-12-03 11:52:44.0 +0100
+++ new/booth/.git_info 2016-01-12 15:03:32.0 +0100
@@ -1 +1 @@
-v0.2.0-130-g9c5c19f
+v1.0rc1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/ChangeLog new/booth/ChangeLog
--- old/booth/ChangeLog 1970-01-01 01:00:00.0 +0100
+++ new/booth/ChangeLog 2016-01-12 11:50:01.0 +0100
@@ -0,0 +1,39 @@
+* Mon Jan 11 2016 Dejan Muhamedagic and others
+- release candidate 1.0 rc1
+- main: prevent segfault on no arguments
+- ticket: term 0 is a valid term (bsc#952426)
+- main: add 'other' as possible site reference
+- arbitrator: mark expired tickets as lost (bsc#956321)
+- geo attributes support
+- booth-keygen: key generate auxiliary program
+- ticket: prevent running external program twice
+- ticket: make sure that we're the leader if granting ticket (bsc#940037)
+- docs: add booth processing FSM dot graphs
+- main: add booth peers command
+- main: don't allow zero poll timeout (bsc#938820)
+- pcmk: don't log error when ticket not in CIB
+- client: fix memory leak in ticket list
+- client: fix memory growing indefinitely on new client connect
+- extprog: ignore running external program on revoke
+- client: make sure that the client is still there to be notified
+- client: don't allow SIGPIPE to kill the server (if the client leaves too
early)
+- extprog: preserve child exit status
+- extprog: run programs asynchronously
+- clients: fix memory leak when removing client
+- transport: use non-blocking read
+- hmac based authentication support
+- ticket: ignore late MY_INDEX requests
+- contrib: add geo-cluster.fwd (suse firewall rules)
+- ticket: restart elections after last candidate disappears
+- ticket: add -C option (wait for commit)
+- raft: handle duplicate ticket release requests
+- booth-site: exit early in start if daemon cannot start
+- raft: ignore messages with invalid term (lower than already committed)
+- raft: better control of term increment
+- ticket: allow finer resolution time in messages
+- use subsecond timers internally
+- booth-arbitrator: fix exit codes for all actions
+- booth-arbitrator: set the right LSB exit code in status
+- booth-arbitrator: fix stop exit code (bnc#914306)
+- booth-arbitrator: update exit codes
+- main: use /proc/self/oom_score_adj instead of oom_adj (bnc#914037)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/booth.spec new/booth/booth.spec
--- old/booth/booth.spec2015-12-03 11:52:35.0 +0100
+++ new/booth/booth.spec2016-01-12 11:50:01.0 +0100
@@ -28,8 +28,8 @@
Summary:Ticket Manager for Multi-site Clusters
License:GPL-2.0+
Group: %{pkg_group}
-Version:0.2.0
-Release:0
+Version:1.0
+Release:rc1
Source: booth.tar.bz2
Source1:%name-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2015-12-09 19:50:48
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2015-11-28
15:19:06.0 +0100
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2015-12-09
22:13:08.0 +0100
@@ -1,0 +2,23 @@
+Thu Dec 03 10:59:27 UTC 2015 - dmuhameda...@suse.com
+
+- Update to version v0.2.0_130_g9c5c19f:
+ + test: use SSH_OPTS for rsync too
+ + test: fix external/booth ip use
+
+---
+Wed Dec 02 11:31:24 UTC 2015 - opensuse-packag...@opensuse.org
+
+- Update to version v0.2.0_128_g29be3ec:
+ + test: create and distribute authfile
+ + test: allow alternative ip addresses
+ + config: support for comments
+
+---
+Mon Nov 30 18:20:49 UTC 2015 - dmuhameda...@suse.com
+
+- Update to version v0.2.0_126_g2154ade:
+ + main: add 'other' as possible site reference
+ + attr: GEO attributes OCF RA support (fate#318182)
+ + ocf: add geostore sample RA (fate#318182)
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.pnHeyN/_old 2015-12-09 22:13:09.0 +0100
+++ /var/tmp/diff_new_pack.pnHeyN/_new 2015-12-09 22:13:09.0 +0100
@@ -144,9 +144,14 @@
%dir /usr/lib/ocf
%dir /usr/lib/ocf/resource.d
%dir /usr/lib/ocf/resource.d/pacemaker
+%dir /usr/lib/ocf/resource.d/booth
+%dir /usr/lib/ocf/lib
+%dir /usr/lib/ocf/lib/booth
%dir %{_sysconfdir}/booth
%{_sbindir}/rcbooth-arbitrator
/usr/lib/ocf/resource.d/pacemaker/booth-site
+/usr/lib/ocf/lib/booth/geo_attr.sh
+/usr/lib/ocf/resource.d/booth/geostore
%config %{_sysconfdir}/booth/booth.conf.example
%if %{defined _unitdir}
++ _servicedata ++
--- /var/tmp/diff_new_pack.pnHeyN/_old 2015-12-09 22:13:09.0 +0100
+++ /var/tmp/diff_new_pack.pnHeyN/_new 2015-12-09 22:13:09.0 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/booth.git
- 88c3d6a865cea676778bdeb7858f715a6ece6b10
\ No newline at end of file
+ 9c5c19f2c9217db9bf6265e8e753ac15ba631ae0
\ No newline at end of file
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/.git_info new/booth/.git_info
--- old/booth/.git_info 2015-11-24 14:08:30.0 +0100
+++ new/booth/.git_info 2015-12-03 11:52:44.0 +0100
@@ -1 +1 @@
-v0.2.0-120-gf3d73a5
+v0.2.0-130-g9c5c19f
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/Makefile.am new/booth/Makefile.am
--- old/booth/Makefile.am 2015-11-23 19:13:11.0 +0100
+++ new/booth/Makefile.am 2015-12-03 11:52:35.0 +0100
@@ -55,7 +55,10 @@
boothsite_SCRIPTS = script/ocf/booth-site
boothocfdir= /usr/lib/ocf/resource.d/booth
-boothocf_SCRIPTS = script/ocf/sharedrsc
+boothocf_SCRIPTS = script/ocf/sharedrsc script/ocf/geostore
+
+boothocflibdir = /usr/lib/ocf/lib/booth
+boothocflib_DATA = script/ocf/geo_attr.sh
bootharbitratordir = ${INITDDIR}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/booth.spec new/booth/booth.spec
--- old/booth/booth.spec2015-11-23 19:13:11.0 +0100
+++ new/booth/booth.spec2015-12-03 11:52:35.0 +0100
@@ -133,9 +133,14 @@
%dir /usr/lib/ocf
%dir /usr/lib/ocf/resource.d
%dir /usr/lib/ocf/resource.d/pacemaker
+%dir /usr/lib/ocf/resource.d/booth
+%dir /usr/lib/ocf/lib
+%dir /usr/lib/ocf/lib/booth
%dir %{_sysconfdir}/booth
%{_sbindir}/rcbooth-arbitrator
/usr/lib/ocf/resource.d/pacemaker/booth-site
+/usr/lib/ocf/lib/booth/geo_attr.sh
+/usr/lib/ocf/resource.d/booth/geostore
%config %{_sysconfdir}/booth/booth.conf.example
%if 0%{?suse_version}
%config %{_fwdefdir}/booth
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/docs/boothd.8.txt new/booth/docs/boothd.8.txt
--- old/booth/docs/boothd.8.txt 2015-11-23 19:13:11.0 +0100
+++ new/booth/docs/boothd.8.txt 2015-12-03 11:52:35.0 +0100
@@ -65,6 +65,10 @@
*-s*::
Site address or name.
++
+ The special value 'other' can be used to specify the other
+ site. Obviously, in that case, the booth configuration must
+ have exactly two sites defined.
*-F*::
'immediate grant': Don't wait for unreachable sites to
diff -urN '--exclude=CVS' '--exclude=.cvsig
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2015-11-28 15:19:04
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2015-11-08
11:26:58.0 +0100
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2015-11-28
15:19:06.0 +0100
@@ -1,0 +2,14 @@
+Tue Nov 24 13:11:00 UTC 2015 - dmuhameda...@suse.com
+
+- Update to version v0.2.0_120_gf3d73a5:
+ + arbitrator: mark expired tickets as lost (bsc#956321)
+ + attr: better control of election cause
+
+---
+Fri Nov 20 11:37:43 UTC 2015 - dmuhameda...@suse.com
+
+- Update to version v0.2.0_116_g88c3d6a:
+ + attr: attribute prerequisites (fate#318182)
+ + attr: keep attributes in the CIB (fate#318182)
+
+---
Other differences:
--
++ _servicedata ++
--- /var/tmp/diff_new_pack.amwQe7/_old 2015-11-28 15:19:07.0 +0100
+++ /var/tmp/diff_new_pack.amwQe7/_new 2015-11-28 15:19:07.0 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/booth.git
- 3e73b683b36c38650d1d2ff4c9393cb1bb2056e6
\ No newline at end of file
+ 88c3d6a865cea676778bdeb7858f715a6ece6b10
\ No newline at end of file
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/.git_info new/booth/.git_info
--- old/booth/.git_info 2015-11-06 10:07:54.0 +0100
+++ new/booth/.git_info 2015-11-24 14:08:30.0 +0100
@@ -1 +1 @@
-v0.2.0-113-gaeef08d
+v0.2.0-120-gf3d73a5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/configure.ac new/booth/configure.ac
--- old/booth/configure.ac 2015-11-06 09:20:07.0 +0100
+++ new/booth/configure.ac 2015-11-23 19:13:11.0 +0100
@@ -61,6 +61,7 @@
AC_PATH_PROGS(PKGCONFIG, pkg-config)
AC_PATH_PROGS(ASCIIDOC, asciidoc)
+AC_PATH_PROGS(XML2CONFIG, xml2-config)
AM_CONDITIONAL(BUILD_ASCIIDOC, test x"${ASCIIDOC}" != x"")
@@ -82,6 +83,17 @@
AM_CONDITIONAL(BUILD_AUTH_C, test "x${mhash_installed}" = "xyes")
fi
+AC_MSG_CHECKING(for special libxml2 includes)
+if test "x$XML2CONFIG" = "x"; then
+ AC_MSG_ERROR(libxml2 config not found)
+else
+ XML2HEAD="`$XML2CONFIG --cflags`"
+ AC_MSG_RESULT($XML2HEAD)
+ AC_CHECK_LIB(xml2, xmlReadMemory)
+fi
+
+CPPFLAGS="$CPPFLAGS $XML2HEAD"
+
PKG_CHECK_MODULES(GLIB, [glib-2.0])
# Checks for header files.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/docs/boothd.8.txt new/booth/docs/boothd.8.txt
--- old/booth/docs/boothd.8.txt 2015-11-06 09:20:07.0 +0100
+++ new/booth/docs/boothd.8.txt 2015-11-23 19:13:11.0 +0100
@@ -325,6 +325,38 @@
The distributed 'service-runnable' script is an example which may
be used to test whether a pacemaker resource can be started.
+*'attr-prereq'*::
+ Sites can have GEO attributes managed with the 'geostore(8)'
+ program. Attributes are within ticket's scope and may be
+ tested by 'boothd' for additional control of ticket failover
+ (automatic) or ticket acquire (manual).
++
+Attributes are typically used to convey extra information about
+resources, for instance database replication status. The
+attributes are commonly updated by resource agents.
++
+Attribute values are referenced in expressions and may be tested
+for equality with the 'eq' binary operator or inequality with the
+'ne' operator. The usage is as follows:
+
+ attr-prereq =
+
+ : "auto" | "manual"
+ : attribute name
+ : "eq" | "ne"
+ : attribute value
++
+The two grant types are 'auto' for ticket failover and 'manual'
+for grants using the booth client. Only in case the expression
+evaluates to true can the ticket be granted.
++
+It is not clear whether the 'manual' grant type has any practical
+use because, obviously, this operation is anyway controlled by a
+human.
++
+Note that there can be no guarantee on whether an attribute value
+is up to date, i.e. if it actually reflects the current state.
+
One example of a booth configuration file:
---
@@ -345,6 +377,7 @@
retries = 5
renewal-freq = 60
before-acquire-handler = /usr/share/booth/service-runnable db8
+attr-prereq = auto repl_state eq ACTIVE
---
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/src/attr.c new/booth/src/a
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2015-11-08 11:26:48
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2015-08-31
22:59:50.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2015-11-08
11:26:58.0 +0100
@@ -1,0 +2,7 @@
+Fri Nov 6 09:16:45 UTC 2015 - dmuhameda...@suse.com
+
+- Update to version v0.2.0_113_gaeef08d:
+ + doc: add the geostore(8) man page
+ + geo attributes (fate#318182)
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.DILOyM/_old 2015-11-08 11:26:59.0 +0100
+++ /var/tmp/diff_new_pack.DILOyM/_new 2015-11-08 11:26:59.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package booth
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -136,9 +136,11 @@
%{_sbindir}/booth
%{_sbindir}/boothd
%{_sbindir}/booth-keygen
+%{_sbindir}/geostore
%{_mandir}/man8/booth.8.gz
%{_mandir}/man8/boothd.8.gz
%{_mandir}/man8/booth-keygen.8.gz
+%{_mandir}/man8/geostore.8.gz
%dir /usr/lib/ocf
%dir /usr/lib/ocf/resource.d
%dir /usr/lib/ocf/resource.d/pacemaker
++ booth.tar.bz2 ++
1829 lines of diff (skipped)
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2015-08-31 22:59:50
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2015-08-05
06:51:53.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2015-08-31
22:59:50.0 +0200
@@ -1,0 +2,10 @@
+Mon Aug 31 12:55:06 UTC 2015 - dmuhameda...@suse.com
+
+- Update to version v0.2.0_107_g3e73b68:
+ + booth-keygen: older dd don't have status=none option
+ + ticket: move election start out of the signal handler (bsc#942346)
+ + extprog: handle better multiple children signal delivery
+ + client: prevent garbage characters at the end of the list
+ + service-runnable: improve error checking
+
+---
Other differences:
--
++ _servicedata ++
--- /var/tmp/diff_new_pack.UIg6sO/_old 2015-08-31 22:59:51.0 +0200
+++ /var/tmp/diff_new_pack.UIg6sO/_new 2015-08-31 22:59:51.0 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/booth.git
- f79df7bd441a797da5fde8a7949334209bc7befe
\ No newline at end of file
+ 3e73b683b36c38650d1d2ff4c9393cb1bb2056e6
\ No newline at end of file
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/.git_info new/booth/.git_info
--- old/booth/.git_info 2015-08-03 17:38:16.0 +0200
+++ new/booth/.git_info 2015-08-31 14:53:31.0 +0200
@@ -1 +1 @@
-v0.2.0-97-gda68360
+v0.2.0-107-g3e73b68
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/script/booth-keygen
new/booth/script/booth-keygen
--- old/booth/script/booth-keygen 2015-08-03 17:01:03.0 +0200
+++ new/booth/script/booth-keygen 2015-08-28 20:03:37.0 +0200
@@ -54,9 +54,10 @@
fi
umask 077
-dd if=$RND_SRC of=$keyf bs=$KEYSIZE count=1 status=none
+errout=`dd if=$RND_SRC of=$keyf bs=$KEYSIZE count=1 2>&1`
rc=$?
if [ $rc -ne 0 ]; then
+ echo "$errout" >&2
exit $rc
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/script/service-runnable
new/booth/script/service-runnable
--- old/booth/script/service-runnable 2015-08-03 17:01:03.0 +0200
+++ new/booth/script/service-runnable 2015-08-28 20:03:37.0 +0200
@@ -5,14 +5,30 @@
# acquire the ticket here.
service="${1:?Need a resource name as first argument.}"
+if [ -z "$service" ]; then
+ ha_logger "$0: bad usage: no resource name"
+ exit 1
+fi
tmpshadow=`mktemp booth-check.XX`
+if [ $? -ne 0 -o ! -f "$tmpshadow" ]; then
+ ha_logger "$0: mktemp failed"
+ exit 1
+fi
+
trap "rm -f $tmpshadow" EXIT
# We expect an output like
# p_dummy(ocf::pacemaker:Dummy): Started geo-rz2-a
-if crm_simulate -O $tmpshadow --ticket-grant "$BOOTH_TICKET" --simulate
--live-check |
+status=`crm_simulate -O $tmpshadow --ticket-grant "$BOOTH_TICKET" --simulate
--live-check 2>&1`
+if [ $? -ne 0 ]; then
+ ha_logger "$0: crm_simulate failed"
+ ha_logger "$0: crm_simulate: $status"
+ exit 1
+fi
+
+if echo "$status" |
sed -n '/^Revised cluster status:/,$p' |
egrep "^[[:space:]]+$service[[:space:]]+\(.*\):[[:space:]]+Started
([^[:space:]]+) *$" >/dev/null
then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/src/config.c new/booth/src/config.c
--- old/booth/src/config.c 2015-08-03 17:01:03.0 +0200
+++ new/booth/src/config.c 2015-08-28 20:03:37.0 +0200
@@ -337,8 +337,8 @@
}
/* make arguments for execv(2)
- * tk->clu_test.prog points to the path
- * tk->clu_test.argv is argument vector (starts with the prog)
+ * tk_test.prog points to the path
+ * tk_test.argv is argument vector (starts with the prog)
* (strtok pokes holes in the configuration parameter value, i.e.
* we don't need to allocate memory for arguments)
*/
@@ -347,24 +347,24 @@
char *p;
int i = 0;
- if (tk->clu_test.prog) {
- free(tk->clu_test.prog);
+ if (tk_test.prog) {
+ free(tk_test.prog);
}
- if (!(tk->clu_test.prog = strdup(val))) {
+ if (!(tk_test.prog = strdup(val))) {
log_error("out of memory");
return -1;
}
- p = strtok(tk->clu_test.prog, " \t");
- tk->clu_test.argv[i++] = p;
+ p = strtok(tk_test.prog, " \t");
+ tk_test.argv[i++] = p;
do {
p = strtok(NU
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2015-08-05 06:51:50
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2015-08-02
22:45:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2015-08-05
06:51:53.0 +0200
@@ -1,0 +2,6 @@
+Mon Aug 3 15:40:24 UTC 2015 - dmuhameda...@suse.com
+
+- Update to version v0.2.0_97_gda68360:
+ + add booth-keygen (fate#319318)
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.1z4nvJ/_old 2015-08-05 06:51:54.0 +0200
+++ /var/tmp/diff_new_pack.1z4nvJ/_new 2015-08-05 06:51:54.0 +0200
@@ -135,8 +135,10 @@
%defattr(-,root,root,-)
%{_sbindir}/booth
%{_sbindir}/boothd
+%{_sbindir}/booth-keygen
%{_mandir}/man8/booth.8.gz
%{_mandir}/man8/boothd.8.gz
+%{_mandir}/man8/booth-keygen.8.gz
%dir /usr/lib/ocf
%dir /usr/lib/ocf/resource.d
%dir /usr/lib/ocf/resource.d/pacemaker
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/.git_info new/booth/.git_info
--- old/booth/.git_info 2015-07-31 13:59:36.0 +0200
+++ new/booth/.git_info 2015-08-03 17:38:16.0 +0200
@@ -1 +1 @@
-v0.2.0-96-g9dae592
+v0.2.0-97-gda68360
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/Makefile.am new/booth/Makefile.am
--- old/booth/Makefile.am 2015-07-31 13:56:22.0 +0200
+++ new/booth/Makefile.am 2015-08-03 17:01:03.0 +0200
@@ -45,7 +45,7 @@
dist_doc_DATA = AUTHORS README COPYING README.upgrade-from-v0.1
-notrans_dist_man8_MANS = docs/boothd.8
+notrans_dist_man8_MANS = docs/boothd.8 docs/booth-keygen.8
boothconfdir = ${BOOTHSYSCONFDIR}
@@ -65,6 +65,8 @@
boothnoarch_SCRIPTS= script/service-runnable
+sbin_SCRIPTS = script/booth-keygen
+
TESTS = test/runtests.py
SUBDIRS= src docs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/README new/booth/README
--- old/booth/README2015-07-31 13:56:22.0 +0200
+++ new/booth/README2015-08-03 17:01:03.0 +0200
@@ -188,8 +188,4 @@
recent than the previous one from the same peer are accepted. The
time skew can be configured in the booth configuration file.
-There is no way to configure booth to use a hash different from
-SHA1. That should not be a problem in practice as SHA1 provides
-sufficient security (the lesser MD5 would too).
-
# vim: set ft=asciidoc :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/booth.spec new/booth/booth.spec
--- old/booth/booth.spec2015-07-31 13:56:22.0 +0200
+++ new/booth/booth.spec2015-08-03 17:01:03.0 +0200
@@ -124,8 +124,10 @@
%defattr(-,root,root,-)
%{_sbindir}/booth
%{_sbindir}/boothd
+%{_sbindir}/booth-keygen
%{_mandir}/man8/booth.8.gz
%{_mandir}/man8/boothd.8.gz
+%{_mandir}/man8/booth-keygen.8.gz
%dir /usr/lib/ocf
%dir /usr/lib/ocf/resource.d
%dir /usr/lib/ocf/resource.d/pacemaker
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/docs/Makefile.am new/booth/docs/Makefile.am
--- old/booth/docs/Makefile.am 2015-07-31 13:56:22.0 +0200
+++ new/booth/docs/Makefile.am 2015-08-03 17:01:03.0 +0200
@@ -19,7 +19,7 @@
#
MAINTAINERCLEANFILES= Makefile.in
-asciiman = boothd.8.txt
+asciiman = boothd.8.txt booth-keygen.8.txt
doc_DATA = $(generated_docs)
generated_docs =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/docs/booth-keygen.8.txt
new/booth/docs/booth-keygen.8.txt
--- old/booth/docs/booth-keygen.8.txt 1970-01-01 01:00:00.0 +0100
+++ new/booth/docs/booth-keygen.8.txt 2015-08-03 17:01:03.0 +0200
@@ -0,0 +1,52 @@
+BOOTH-KEYGEN(8)
+===
+:doctype: manpage
+
+
+NAME
+
+booth-keygen - generate authentication key
+
+
+SYNOPSIS
+
+*booth-keygen* ['-h'] ['auth-file']
+
+
+DESCRIPTION
+---
+This program generates an authentication key suitable for 'booth'
+using '/dev/urandom' as source.
+
+
+PARAMETERS
+--
+
+*'auth-file'*::
+ The file to contain the generated key. Defaults to
+ '/etc/booth/authkey'. Use absolute paths.
+
+
+OPTIONS
+---
+*-h*, *--help*::
+ Print usage.
+
+
+EXIT STATUS
+---
+*0*::
+Success.
+
+*!
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2015-08-02 22:45:59
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2015-07-22
09:19:52.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2015-08-02
22:45:59.0 +0200
@@ -1,0 +2,10 @@
+Fri Jul 31 12:00:39 UTC 2015 - dmuhameda...@suse.com
+
+- Update to version v0.2.0_96_g9dae592:
+ + ticket: prevent running external program twice
+ + ticket: make sure that we're the leader if granting ticket (bsc#940037)
+ + docs: add booth operation FSM dot graphs
+ + main: add peer statistics
+ + main: add booth peers command
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.LOvlQQ/_old 2015-08-02 22:46:01.0 +0200
+++ /var/tmp/diff_new_pack.LOvlQQ/_new 2015-08-02 22:46:01.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package booth
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/.git_info new/booth/.git_info
--- old/booth/.git_info 2015-07-21 11:57:16.0 +0200
+++ new/booth/.git_info 2015-07-31 13:59:36.0 +0200
@@ -1 +1 @@
-v0.2.0-89-gd9f16ba
+v0.2.0-96-g9dae592
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/README new/booth/README
--- old/booth/README2015-07-21 11:45:06.0 +0200
+++ new/booth/README2015-07-31 13:56:22.0 +0200
@@ -168,7 +168,7 @@
over TCP) and other booth servers (connecting over UDP). The
authentication is based on SHA1 HMAC (Keyed-Hashing Message
Authentication) and shared key. The HMAC implementation is
-provided by the mhash library.
+provided by the libgcrypt or mhash library.
Message encryption is not included as the information exchanged
between various booth parties does not seem to justify that.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/docs/boothd.8.txt new/booth/docs/boothd.8.txt
--- old/booth/docs/boothd.8.txt 2015-07-21 11:45:06.0 +0200
+++ new/booth/docs/boothd.8.txt 2015-07-31 13:56:22.0 +0200
@@ -18,6 +18,8 @@
*booth* 'revoke' [-s 'site'] [-c 'config'] [-w] 'ticket'
+*booth* 'peers' [-s 'site'] [-c 'config']
+
*booth* 'status' [-D] [-c 'config']
@@ -145,7 +147,33 @@
an OCF-compatible return code.
With '-D', a human-readable message is printed to STDERR as well.
+*'peers'*::
+ List the other 'boothd' servers we know about.
++
+In addition to the type, name (IP address), and the last time the
+server was heard from, network statistics are also printed. The
+statistics are split into two rows, the first one consists of
+counters for the sent packets and the second one for the received
+packets. The first counter is the total number of packets and
+descriptions of the other counters follows:
+
+'resends'::
+ Packets which had to be resent because the recipient didn't
+ acknowledge a message. This usually means that either the
+ message or the acknowledgement got lost. The number of
+ resends usually reflect the network reliability.
+
+'error'::
+ Packets which either couldn't be sent, got truncated, or were
+ badly formed. Should be zero.
+
+'invalid'::
+ These packets contain either invalid or non-existing ticket
+ name or refer to a non-existing ticket leader. Should be
+ zero.
+'authfail'::
+ Packets which couldn't be authenticated. Should be zero.
CONFIGURATION FILE
--
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/docs/fsm-full.dot new/booth/docs/fsm-full.dot
--- old/booth/docs/fsm-full.dot 1970-01-01 01:00:00.0 +0100
+++ new/booth/docs/fsm-full.dot 2015-07-31 13:56:22.0 +0200
@@ -0,0 +1,17 @@
+digraph G {
+
+ label="Booth full FSM";
+ fontname="Helvetica";
+ fontsize="11";
+ compound="true";
+ ST_INIT -> ST_CANDIDATE [label="grant"];
+ ST_INIT -> ST_FOLLOWER [label="HrtB|UpdE"];
+ ST_FOLLOWER -> ST_CANDIDATE [label="VtFr(tkt_drop)\ntkt_lost"];
+ ST_LEADER -> ST_FOLLOWER [label="lost_maj"];
+ ST_CANDIDAT
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2015-07-22 09:19:51
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2015-07-21
13:29:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2015-07-22
09:19:52.0 +0200
@@ -1,0 +2,7 @@
+Tue Jul 21 11:28:34 UTC 2015 - dmuhameda...@suse.com
+
+- Update to version v0.2.0_89_gd9f16ba:
+ + main: don't allow zero poll timeout (bsc#938820)
+ + pcmk: don't log error when ticket not in CIB
+
+---
Other differences:
--
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/.git_info new/booth/.git_info
--- old/booth/.git_info 2015-07-17 18:31:28.0 +0200
+++ new/booth/.git_info 2015-07-21 11:57:16.0 +0200
@@ -1 +1 @@
-v0.2.0-87-gf59231b
+v0.2.0-89-gd9f16ba
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/src/config.c new/booth/src/config.c
--- old/booth/src/config.c 2015-07-17 18:08:48.0 +0200
+++ new/booth/src/config.c 2015-07-21 11:45:06.0 +0200
@@ -716,6 +716,9 @@
}
poll_timeout = min(POLL_TIMEOUT, min_timeout/10);
+ if (!poll_timeout)
+ poll_timeout = POLL_TIMEOUT;
+
return 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/src/pacemaker.c new/booth/src/pacemaker.c
--- old/booth/src/pacemaker.c 2015-07-17 18:08:48.0 +0200
+++ new/booth/src/pacemaker.c 2015-07-21 11:45:06.0 +0200
@@ -281,6 +281,8 @@
rv = pclose(p);
if (!rv) {
log_debug("command \"%s\" value %" PRIi64, cmd, v);
+ } else if (rv == 6) {
+ log_info("command \"%s\", ticket not found", cmd);
} else {
log_error("command \"%s\" %s, value %" PRIi64, cmd,
interpret_rv(rv), v);
}
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2015-07-21 13:27:27
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2015-07-14
17:44:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2015-07-21
13:29:04.0 +0200
@@ -1,0 +2,6 @@
+Sat Jul 18 10:09:17 UTC 2015 - dmuhameda...@suse.com
+
+- Update to version v0.2.0_87_gf59231b:
+ + auth: add support for libgcrypt (bsc#938403)
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.onF4LE/_old 2015-07-21 13:29:05.0 +0200
+++ /var/tmp/diff_new_pack.onF4LE/_new 2015-07-21 13:29:05.0 +0200
@@ -54,7 +54,7 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: glib2-devel
-BuildRequires: mhash-devel
+BuildRequires: libgcrypt-devel
%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
BuildRequires: cluster-glue-libs-devel
BuildRequires: pacemaker-libs-devel
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/.git_info new/booth/.git_info
--- old/booth/.git_info 2015-07-10 12:21:58.0 +0200
+++ new/booth/.git_info 2015-07-17 18:31:28.0 +0200
@@ -1 +1 @@
-v0.2.0-86-g62eee28
+v0.2.0-87-gf59231b
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/booth.spec new/booth/booth.spec
--- old/booth/booth.spec2015-07-10 12:16:12.0 +0200
+++ new/booth/booth.spec2015-07-17 18:08:48.0 +0200
@@ -37,7 +37,7 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: glib2-devel
-BuildRequires: mhash-devel
+BuildRequires: libgcrypt-devel
%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
BuildRequires: cluster-glue-libs-devel
BuildRequires: pacemaker-libs-devel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/configure.ac new/booth/configure.ac
--- old/booth/configure.ac 2015-07-10 12:16:12.0 +0200
+++ new/booth/configure.ac 2015-07-17 18:08:48.0 +0200
@@ -69,11 +69,18 @@
AC_CHECK_LIB([nsl], [t_open])
AC_CHECK_LIB([gpl], [cl_log])
-# mhash for hmac
-mhash_installed="yes"
-AC_CHECK_HEADERS(mhash.h, , [mhash_installed="no"],)
-AC_CHECK_LIB(mhash, mhash_init, , [mhash_installed="no"])
-AM_CONDITIONAL(BUILD_AUTH_C, test "x${mhash_installed}" = "xyes")
+# libgcrypt or mhash for hmac
+libgcrypt_installed="yes"
+AC_CHECK_HEADERS(gcrypt.h, , [libgcrypt_installed="no"],)
+AC_CHECK_LIB(gcrypt, gcry_md_open, , [libgcrypt_installed="no"])
+AM_CONDITIONAL(BUILD_AUTH_C, test "x${libgcrypt_installed}" = "xyes")
+
+if test "x$libgcrypt_installed" = "xno"; then
+ mhash_installed="yes"
+ AC_CHECK_HEADERS(mhash.h, , [mhash_installed="no"],)
+ AC_CHECK_LIB(mhash, mhash_init, , [mhash_installed="no"])
+ AM_CONDITIONAL(BUILD_AUTH_C, test "x${mhash_installed}" = "xyes")
+fi
PKG_CHECK_MODULES(GLIB, [glib-2.0])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/src/auth.c new/booth/src/auth.c
--- old/booth/src/auth.c2015-07-10 12:16:12.0 +0200
+++ new/booth/src/auth.c2015-07-17 18:08:48.0 +0200
@@ -18,6 +18,60 @@
#include "auth.h"
+#if HAVE_LIBGCRYPT
+/* calculate the HMAC of the message in data and store it in result
+ * it is up to the caller to make sure that there's enough space
+ * at result for the MAC
+ */
+int calc_hmac(const void *data, size_t datalen,
+ int hid, unsigned char *result, char *key, int keylen)
+{
+ static gcry_md_hd_t digest;
+ gcry_error_t err;
+
+ if (!digest) {
+ err = gcry_md_open(&digest, hid, GCRY_MD_FLAG_HMAC);
+ if (err) {
+ log_error("gcry_md_open: %s", gcry_strerror(err));
+ return -1;
+ }
+ err = gcry_md_setkey(digest, key, keylen);
+ if (err) {
+ log_error("gcry_md_open: %s", gcry_strerror(err));
+ return -1;
+ }
+ }
+ gcry_md_write(digest, data, datalen);
+ memcpy(result, gcry_md_read(digest, 0), gcry_md_get_algo_dlen(hid));
+ gcry_md_reset(digest);
+ return 0;
+}
+
+/* test HMAC
+ */
+int verify_hmac(const void *data, size_t datalen,
+ int hid, unsigned char *hmac, char *key, int keylen)
+{
+ unsigned char *our_hmac;
+ int rc;
+
+ our_hmac = malloc(gcry_md_get_algo_dl
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2015-07-14 17:43:41
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2015-04-12
00:10:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2015-07-14
17:44:47.0 +0200
@@ -1,0 +2,22 @@
+Fri Jul 10 10:34:21 UTC 2015 - dmuhameda...@suse.com
+
+- Update to version v0.2.0_86_g62eee28:
+ + auth: hmac based authentication (fate#318466)
+ + auth: test timestamps in packets (replay attacks defense)
+ + doc: describe auth in the README
+ + transport: use non-blocking read (fate#318465)
+ + clients: free request when removing client
+ + extprog: run programs asynchronously (fate#318463)
+ + extprog: preserve pclose(2) child exit status
+ + pacemaker: report error if crm_ticket fails
+ + doc: remove warning about running external program synchronously
+ + client: don't allow SIGPIPE to kill the server (if the client leaves too
early)
+ + extprog: update ticket grant/reacquire procedure
+ + client: make sure that the client is still there to be notified
+ + extprog: ignore running external program on revoke
+ + main: don't comment on successful list
+ + client: fix memory growing indefinitely on new client connect
+ + client: reference client fd instead of pointer in requests
+ + client: fix memory leak in ticket list
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.A3OiP3/_old 2015-07-14 17:44:48.0 +0200
+++ /var/tmp/diff_new_pack.A3OiP3/_new 2015-07-14 17:44:48.0 +0200
@@ -54,6 +54,7 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: glib2-devel
+BuildRequires: mhash-devel
%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
BuildRequires: cluster-glue-libs-devel
BuildRequires: pacemaker-libs-devel
++ _servicedata ++
--- /var/tmp/diff_new_pack.A3OiP3/_old 2015-07-14 17:44:48.0 +0200
+++ /var/tmp/diff_new_pack.A3OiP3/_new 2015-07-14 17:44:48.0 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/booth.git
- 03bdf8abc14bb9890330aca20adda641a8cf495d
\ No newline at end of file
+ f79df7bd441a797da5fde8a7949334209bc7befe
\ No newline at end of file
++ booth.tar.bz2 ++
2748 lines of diff (skipped)
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2015-04-12 00:10:32
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2015-02-18
20:36:52.0 +0100
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2015-04-12
00:10:40.0 +0200
@@ -1,0 +2,20 @@
+Thu Apr 09 14:45:37 UTC 2015 - opensuse-packag...@opensuse.org
+
+- Update to version v0.2.0_50_g03bdf8a:
+ + build: update spec, doc, add AUTHORS
+ + doc: add sample pacemaker configuration to the testing README
+ + spec: skip the update procedure on new installations
+ + use subsecond timers internally
+ + ticket: allow finer resolution time in messages
+ + test: add sharedrsc OCF test RA
+ + raft: better control of term increment
+ + raft: ignore messages with invalid term (lower than already committed)
+ + booth-site: exit early in start if daemon cannot start
+ + raft: handle duplicate ticket release requests
+ + ticket: add -C option (wait for commit)
+ + ticket: restart elections after last candidate disappears
+ + contrib: add geo-cluster.fwd (suse firewall rules)
+ + ticket: ignore late MY_INDEX requests
+ + timer: round to seconds when converting from timeval
+
+---
New:
_servicedata
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.EE6s8e/_old 2015-04-12 00:10:42.0 +0200
+++ /var/tmp/diff_new_pack.EE6s8e/_new 2015-04-12 00:10:42.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package booth
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -159,6 +159,8 @@
# this should be preun, but...
%pre
+# new installation?
+test -x %{_sbindir}/booth || exit 0
# stop the arbitrator if it's the previous paxos version 1.0
if [ "`booth version | awk '{print $2}'`" = "1.0" ]; then
echo "booth v0.1 found"
@@ -186,5 +188,9 @@
%doc README-testing
%{test_path}
+%dir /usr/lib/ocf
+%dir /usr/lib/ocf/resource.d
+%dir /usr/lib/ocf/resource.d/booth
+/usr/lib/ocf/resource.d/booth/sharedrsc
%changelog
++ _service ++
--- /var/tmp/diff_new_pack.EE6s8e/_old 2015-04-12 00:10:42.0 +0200
+++ /var/tmp/diff_new_pack.EE6s8e/_new 2015-04-12 00:10:42.0 +0200
@@ -3,28 +3,15 @@
git://github.com/ClusterLabs/booth.git
git
.git
-
-
-
-
-
-
+booth
+@PARENT_TAG@
+master
+enable
-
booth*.tar
bz2
-
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2015-02-18 20:36:51
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-10-05
20:33:12.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2015-02-18
20:36:52.0 +0100
@@ -1,0 +2,9 @@
+Wed Feb 18 13:23:24 UTC 2015 - dmuhameda...@suse.com
+
+- booth-arbitrator: fix exit codes for all actions
+- booth-arbitrator: set the right LSB exit code in status
+- booth-arbitrator: fix stop exit code (bsc#914306)
+- main: use /proc/self/oom_score_adj instead of oom_adj (bsc#914037)
+- upstream version: v0.2.0-6-g9eae45f
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.W0xS4u/_old 2015-02-18 20:36:53.0 +0100
+++ /var/tmp/diff_new_pack.W0xS4u/_new 2015-02-18 20:36:53.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package booth
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -26,7 +26,7 @@
%global booth_docdir %{_pkgdocdir}
%endif
-Url:https://github.com/ClusterLabs/booth
+%global test_path %{_datadir}/booth/tests
%if 0%{?suse_version}
%define _libexecdir %{_libdir}
@@ -40,9 +40,8 @@
%define pkg_group Productivity/Clustering/HA
%endif
-%global test_path %{_datadir}/booth/tests
-
Name: booth
+Url:https://github.com/ClusterLabs/booth
Summary:Ticket Manager for Multi-site Clusters
License:GPL-2.0+
Group: %{pkg_group}
@@ -72,18 +71,10 @@
%endif
%description
-Booth manages the ticket which authorizes one of the cluster sites located in
-geographically dispersed distances to run certain resources. It is designed to
-be an add-on of Pacemaker, which extends Pacemaker to support geographically
-dispersed clustering.
-
-
-
-Authors:
-
-Jiaju Zhang
-Philipp Marek
-Dejan Muhamedagic
+Booth manages tickets which authorize cluster sites located in
+geographically dispersed locations to run resources. It
+facilitates support of geographically distributed clustering in
+Pacemaker.
%prep
%setup -q -n %{name}
@@ -96,6 +87,10 @@
make
+#except check
+#%check
+#make check
+
%install
make DESTDIR=$RPM_BUILD_ROOT install docdir=%{booth_docdir}
@@ -117,8 +112,8 @@
mkdir -p %{buildroot}/%{test_path}
cp -a unit-tests/ script/unit-test.py test conf %{buildroot}/%{test_path}/
-chmod +x %{buildroot}/%{test_path}/test/live_test.sh
chmod +x %{buildroot}/%{test_path}/test/booth_path
+chmod +x %{buildroot}/%{test_path}/test/live_test.sh
mkdir -p %{buildroot}/%{test_path}/src/
ln -s %{_sbindir}/boothd %{buildroot}/%{test_path}/src/
@@ -133,11 +128,7 @@
%endif
%clean
-if
- [ -n "${RPM_BUILD_ROOT}" -a "${RPM_BUILD_ROOT}" != "/" ]
-then
- rm -rf $RPM_BUILD_ROOT
-fi
+rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
@@ -163,7 +154,7 @@
%dir %{_datadir}/booth
%{_datadir}/booth/service-runnable
-%doc README COPYING
+%doc AUTHORS README COPYING
%doc README.upgrade-from-v0.1
# this should be preun, but...
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/.git_info new/booth/.git_info
--- old/booth/.git_info 2014-10-02 10:04:28.0 +0200
+++ new/booth/.git_info 2015-02-18 15:43:54.0 +0100
@@ -1 +1 @@
-v0.2.0
+v0.2.0-7-gbf21e72
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/AUTHORS new/booth/AUTHORS
--- old/booth/AUTHORS 1970-01-01 01:00:00.0 +0100
+++ new/booth/AUTHORS 2015-02-18 15:41:48.0 +0100
@@ -0,0 +1,17 @@
+Adam Spiers
+Daniel Gollub
+Dejan Muhamedagic
+Dirk Mueller
+Dongmao Zhang
+Ferritt1975
+Florian Haas
+Guangliang Zhao
+Jiaju Zhang
+Joerg Frede
+Kazunori INOUE
+Philipp Marek
+seabres
+Steven Dake
+Xia Li
+Yuichi SEINO
+Yuusuke Iida
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/Makefile.am new/booth/Makefile.am
--- old/booth/Makefile.am 2014-10-02 09:19:51.0 +0200
+++ new/booth/Makefile.am 2015-02-18 15:41:48.0 +0100
@@ -43,7 +43,7 @@
config.guess config.sub missing install-sh \
autoheader automake autoconf test_lense.sh
-dist_d
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2014-10-05 20:31:44
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-08-25
11:04:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-10-05
20:33:12.0 +0200
@@ -1,0 +2,17 @@
+Fri Oct 3 14:07:24 UTC 2014 - dmuhameda...@suse.com
+
+- doc: clarify the meaning of renewal-freq
+- ra: add restart and reload actions (bnc#899244)
+- upstream version: v0.2.0
+
+---
+Fri Sep 12 14:42:30 UTC 2014 - dmuhameda...@suse.com
+
+- doc: add documentation for upgrade from v0.1
+- build: stop arbitrator on update from previous v0.1
+- ra: support the previously released v0.1
+- build: better support for sysv and systemd init files
+- ra: update library location
+- upstream version: 644df54
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.GQJqPd/_old 2014-10-05 20:33:13.0 +0200
+++ /var/tmp/diff_new_pack.GQJqPd/_new 2014-10-05 20:33:13.0 +0200
@@ -103,9 +103,15 @@
gzip < docs/boothd.8 > %{buildroot}/%{_mandir}/man8/booth.8.gz
ln %{buildroot}/%{_mandir}/man8/booth.8.gz
%{buildroot}/%{_mandir}/man8/boothd.8.gz
+%if %{defined _unitdir}
# systemd
-mkdir -p %{buildroot}/usr/lib/systemd/system/
-cp -a conf/booth@.service %{buildroot}/usr/lib/systemd/system/booth@.service
+mkdir -p %{buildroot}/%{_unitdir}
+cp -a conf/booth@.service %{buildroot}/%{_unitdir}/booth@.service
+ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcbooth-arbitrator
+%else
+# sysV init
+ln -s ../../%{_initddir}/booth-arbitrator
%{buildroot}%{_sbindir}/rcbooth-arbitrator
+%endif
#install test-parts
@@ -143,16 +149,36 @@
%dir /usr/lib/ocf/resource.d
%dir /usr/lib/ocf/resource.d/pacemaker
%dir %{_sysconfdir}/booth
-%exclude %{_initddir}/booth-arbitrator
+%{_sbindir}/rcbooth-arbitrator
/usr/lib/ocf/resource.d/pacemaker/booth-site
%config %{_sysconfdir}/booth/booth.conf.example
-/usr/lib/systemd/system/booth@.service
+%if %{defined _unitdir}
+%{_unitdir}/booth@.service
+%exclude %{_initddir}/booth-arbitrator
+%else
+%{_initddir}/booth-arbitrator
+%endif
%dir %{_datadir}/booth
%{_datadir}/booth/service-runnable
%doc README COPYING
+%doc README.upgrade-from-v0.1
+
+# this should be preun, but...
+%pre
+# stop the arbitrator if it's the previous paxos version 1.0
+if [ "`booth version | awk '{print $2}'`" = "1.0" ]; then
+ echo "booth v0.1 found"
+ if grep -qs 'ticket.*;' /etc/booth/booth.conf; then
+ echo "Convert the booth configuration in /etc/booth/booth.conf!"
+ fi
+ if ps -o pid,cmd -e | grep -qs "[b]oothd arbitrator"; then
+ rcbooth-arbitrator stop
+ fi
+fi
+exit 0
%package test
Summary:Test scripts for Booth
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/.git_info new/booth/.git_info
--- old/booth/.git_info 2014-08-21 16:30:28.0 +0200
+++ new/booth/.git_info 2014-10-02 10:04:28.0 +0200
@@ -1 +1 @@
-v0.1.7-321-g063bc2c
+v0.2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/Makefile.am new/booth/Makefile.am
--- old/booth/Makefile.am 2014-08-21 16:05:13.0 +0200
+++ new/booth/Makefile.am 2014-10-02 09:19:51.0 +0200
@@ -43,7 +43,7 @@
config.guess config.sub missing install-sh \
autoheader automake autoconf test_lense.sh
-dist_doc_DATA = README COPYING
+dist_doc_DATA = README COPYING README.upgrade-from-v0.1
notrans_dist_man8_MANS = docs/boothd.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/README.upgrade-from-v0.1
new/booth/README.upgrade-from-v0.1
--- old/booth/README.upgrade-from-v0.1 1970-01-01 01:00:00.0 +0100
+++ new/booth/README.upgrade-from-v0.1 2014-10-02 09:19:51.0 +0200
@@ -0,0 +1,57 @@
+Notes on upgrade from PAXOS booth v0.1
+==
+
+Booth v0.1 was a booth version based on the PAXOS algorithm. The
+current booth v0.2 is loosely based on raft and incompatible
+with the one running v0.1. Therefore, rolling upgrades are not
+possible.
+
+Due to the new multi-tenancy feature, the new arbitrator init
+script cannot stop or test status of the paxos v0.1 arbitrator.
+On upgrade to v0.2, the arbitrator, if running, will be stopped
commit booth for openSUSE:Factory
Hello community, here is the log from the commit of package booth for openSUSE:Factory checked in at 2014-08-25 11:03:43 Comparing /work/SRC/openSUSE:Factory/booth (Old) and /work/SRC/openSUSE:Factory/.booth.new (New) Package is "booth" Changes: --- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-08-15 09:56:16.0 +0200 +++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-08-25 11:04:44.0 +0200 @@ -1,0 +2,20 @@ +Thu Aug 21 14:30:50 UTC 2014 - dmuhameda...@suse.com + +- Doc: update client help +- upstream version: 063bc2c + +--- +Thu Aug 21 12:01:53 UTC 2014 - dmuhameda...@suse.com + +- doc: man page update +- upstream version: 1e41e32 + +--- +Wed Aug 20 12:50:17 UTC 2014 - dmuhameda...@suse.com + +- service-runnable: test also if the ticket is in standby +- service-runnable: unset -e, crm_resource fails if the meta + attribute doesn't exist +- upstream version: 2928215 + +--- Other differences: -- ++ booth.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/.git_info new/booth/.git_info --- old/booth/.git_info 2014-08-14 17:59:35.0 +0200 +++ new/booth/.git_info 2014-08-21 16:30:28.0 +0200 @@ -1 +1 @@ -v0.1.7-315-g5c48dbb +v0.1.7-321-g063bc2c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/docs/boothd.8.txt new/booth/docs/boothd.8.txt --- old/booth/docs/boothd.8.txt 2014-08-14 12:30:55.0 +0200 +++ new/booth/docs/boothd.8.txt 2014-08-21 16:05:13.0 +0200 @@ -10,15 +10,15 @@ SYNOPSIS -*boothd* 'daemon' ['-D'] [-c 'config'] +*boothd* 'daemon' [-SD] [-c 'config'] [-l 'lockfile'] -*booth* ['client'] 'list' [-s 'site'] ['-D'] [-c 'config'] +*booth* 'list' [-s 'site'] [-c 'config'] -*booth* ['client'] 'grant' [-F] [-s 'site'] ['-D'] [-t] 'ticket' [-c 'config'] +*booth* 'grant' [-s 'site'] [-c 'config'] [-Fw] 'ticket' -*booth* ['client'] 'revoke' [-s 'site'] ['-D'] [-t] 'ticket' [-c 'config'] +*booth* 'revoke' [-s 'site'] [-c 'config'] [-w] 'ticket' -*booth* 'status' ['-D'] [-c 'config'] +*booth* 'status' [-D] [-c 'config'] DESCRIPTION @@ -38,20 +38,20 @@ -- - -# boothd daemon +# boothd daemon -D # booth list -# booth grant -t ticket-nfs +# booth grant ticket-nfs -# booth revoke -t ticket-nfs +# booth revoke ticket-nfs - OPTIONS --- -*-c*:: +*-c* 'configfile':: Configuration to use. + Can be a full path to a configuration file, or a short name; in the latter @@ -61,25 +61,8 @@ The configuration name also determines the name of the PID file - for the defaults, '/var/run/booth/booth.pid'. -*-D*:: - Debug output/don't daemonize. - Increases the debug output level; for 'boothd daemon', keeps the process - in the foreground. - -*-h*, *--help*:: - Give a short usage output. - *-s*:: - Site address. - -*-t*:: - Ticket name. - -*-v*, *--version*:: - Report version information. - -*-S*:: - 'systemd' mode: don't fork. This is like '-D' but without the debug output. + Site address or name. *-F*:: 'immediate grant': Don't wait for unreachable sites to @@ -90,6 +73,25 @@ 'wait indefinitely': The client will wait forever for the server result for grant and revoke requests. +*-h*, *--help*:: + Give a short usage output. + +*--version*:: + Report version information. + +*-S*:: + 'systemd' mode: don't fork. This is like '-D' but without the debug output. + +*-D*:: + Debug output/don't daemonize. + Increases the debug output level; booth daemon remains + in the foreground. + +*-l* 'lockfile':: + Use another lock file. By default, the lock file name is + inferred from the configuration file name. Normally not + needed. + COMMANDS @@ -199,74 +201,75 @@ acquired by another site if the ticket holder is not reachable. + -'booth' renews a ticket after half the lease time. - -*'weights'*:: - A comma-separated list of integers that define the weight of individual - Raft members, in the same order as the 'site' and 'arbitrator' lines. -+ -Default is '0' for all; this means that the order in the configuration -file defines priority for conflicting requests. +The default is '600'. *'acquire-after'*:: - Try to acquire a lost ticket _after_ this period passed. + Once a ticket is lost, wait this time in addition b
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2014-08-15 09:55:57
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-08-05
21:11:22.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-08-15
09:56:16.0 +0200
@@ -1,0 +2,6 @@
+Thu Aug 14 15:59:48 UTC 2014 - dmuhameda...@suse.com
+
+- ticket: drop expired tickets in elections too (gh#17)
+- upstream version: 5c48dbb
+
+---
Other differences:
--
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/.git_info new/booth/.git_info
--- old/booth/.git_info 2014-08-04 16:30:42.0 +0200
+++ new/booth/.git_info 2014-08-14 17:59:35.0 +0200
@@ -1 +1 @@
-v0.1.7-299-g58a2b61
+v0.1.7-315-g5c48dbb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/src/inline-fn.h new/booth/src/inline-fn.h
--- old/booth/src/inline-fn.h 2014-08-04 15:56:20.0 +0200
+++ new/booth/src/inline-fn.h 2014-08-14 12:30:55.0 +0200
@@ -37,7 +37,7 @@
inline static uint32_t get_node_id(struct booth_site *node)
{
- return node ? node->site_id : NO_ONE;
+ return node ? node->site_id : 0;
}
@@ -118,7 +118,8 @@
memcpy(msg->ticket.id, tk->name, sizeof(msg->ticket.id));
msg->ticket.leader = htonl(get_node_id(
- (tk->leader && tk->leader != no_leader) ? tk->leader :
tk->voted_for));
+ (tk->leader && tk->leader != no_leader) ? tk->leader :
+ (tk->voted_for ? tk->voted_for : no_leader)));
msg->ticket.term = htonl(tk->current_term);
msg->ticket.term_valid_for = htonl(term_time_left(tk));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/src/main.c new/booth/src/main.c
--- old/booth/src/main.c2014-08-04 15:56:20.0 +0200
+++ new/booth/src/main.c2014-08-14 12:30:55.0 +0200
@@ -667,7 +667,11 @@
}
if (site->type == ARBITRATOR) {
- log_error("Site \"%s\" is an arbitrator, cannot grant/revoke
ticket there.", cl.site);
+ if (site == local) {
+ log_error("We're just an arbitrator, cannot
grant/revoke tickets here.");
+ } else {
+ log_error("%s is just an arbitrator, cannot
grant/revoke tickets there.", cl.site);
+ }
goto out_close;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/src/raft.c new/booth/src/raft.c
--- old/booth/src/raft.c2014-08-04 15:56:20.0 +0200
+++ new/booth/src/raft.c2014-08-14 12:30:55.0 +0200
@@ -660,10 +660,11 @@
/* valid tickets are not allowed only if the sender thinks
* the ticket got lost */
- if (sender != tk->leader && valid && reason == OR_TKT_LOST) {
- tk_log_warn("election from %s rejected "
+ if (sender != tk->leader && valid && reason != OR_STEPDOWN) {
+ tk_log_warn("election from %s with reason %s rejected "
"(we have %s as ticket owner), ticket still valid for
%ds",
- site_string(sender), site_string(tk->leader), valid);
+ site_string(sender), state_to_string(reason),
+ site_string(tk->leader), valid);
return send_reject(sender, tk, RLT_TERM_STILL_VALID, msg);
}
@@ -730,7 +731,6 @@
tk->current_term++;
}
- tk->term_expires = 0;
tk->election_end = now + tk->timeout;
tk->in_election = 1;
@@ -745,7 +745,6 @@
record_vote(tk, local, new_leader);
tk->voted_for = new_leader;
- tk->leader = no_leader;
tk->state = ST_CANDIDATE;
/* some callers may want just to repeat on timeout */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/src/ticket.c new/booth/src/ticket.c
--- old/booth/src/ticket.c 2014-08-04 15:56:20.0 +0200
+++ new/booth/src/ticket.c 2014-08-14 12:30:55.0 +0200
@@ -282,7 +282,7 @@
strftime(timeout_str, sizeof(timeout_str), "%F %T",
localtime(&ts));
} else
- strcpy(tim
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2014-08-05 21:11:14
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-07-26
09:42:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-08-05
21:11:22.0 +0200
@@ -1,0 +2,7 @@
+Mon Aug 4 14:30:56 UTC 2014 - dmuhameda...@suse.com
+
+- config: prevent segfaults on bad usage
+- config: allow configuring more than one ticket (bnc#889806)
+- upstream version: 58a2b61
+
+---
Other differences:
--
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/.git_info new/booth/.git_info
--- old/booth/.git_info 2014-07-25 13:23:19.0 +0200
+++ new/booth/.git_info 2014-08-04 16:30:42.0 +0200
@@ -1 +1 @@
-v0.1.7-297-g2ecb536
+v0.1.7-299-g58a2b61
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/src/config.c new/booth/src/config.c
--- old/booth/src/config.c 2014-07-25 12:57:28.0 +0200
+++ new/booth/src/config.c 2014-08-04 15:56:20.0 +0200
@@ -243,14 +243,21 @@
return 0;
}
-static int validate_ticket(struct ticket_config *tk)
+static int postproc_ticket(struct ticket_config *tk)
{
+ if (!tk)
+ return 1;
+
+ if (!tk->renewal_freq) {
+ tk->renewal_freq = tk->term_duration/2;
+ }
+
if (tk->timeout*(tk->retries+1) >= tk->renewal_freq) {
- tk_log_error("total amount of time to "
+ log_error("%s: total amount of time to "
"retry sending packets cannot exceed "
"renewal frequency "
"(%d*(%d+1) >= %d)",
- tk->timeout, tk->retries, tk->renewal_freq);
+ tk->name, tk->timeout, tk->retries, tk->renewal_freq);
return 0;
}
return 1;
@@ -515,7 +522,7 @@
if (strcmp(key, "ticket") == 0) {
if (current_tk && strcmp(current_tk->name,
"__defaults__")) {
- if (!validate_ticket(current_tk)) {
+ if (!postproc_ticket(current_tk)) {
goto out;
}
}
@@ -524,13 +531,17 @@
} else if (add_ticket(val, ¤t_tk, &defaults)) {
goto out;
}
-
- /* current_tk is valid until another one is needed -
-* and then it already has the new address and
-* is valid again. */
continue;
}
+ /* current_tk must be allocated at this point, otherwise
+* we don't know to which ticket the key refers
+*/
+ if (!current_tk) {
+ error = "Unexpected keyword";
+ goto err;
+ }
+
if (strcmp(key, "expire") == 0) {
current_tk->term_duration = strtol(val, &s, 0);
if (*s || s == val || current_tk->term_duration<10) {
@@ -595,12 +606,12 @@
continue;
}
- error = "Unknown item";
- goto out;
+ error = "Unknown keyword";
+ goto err;
}
if ((booth_conf->site_count % 2) == 0) {
- log_warn("An odd number of nodes is strongly recommended!");
+ log_warn("Odd number of nodes is strongly recommended!");
}
/* Default: make config name match config filename. */
@@ -618,8 +629,9 @@
*(booth_conf->name+(cp2-cp)) = '\0';
}
- if (!current_tk->renewal_freq)
- current_tk->renewal_freq = current_tk->term_duration/2;
+ if (!postproc_ticket(current_tk)) {
+ goto out;
+ }
return 0;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2014-07-26 09:42:09
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-07-22
06:57:52.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-07-26
09:42:24.0 +0200
@@ -1,0 +2,7 @@
+Fri Jul 25 11:23:27 UTC 2014 - dmuhameda...@suse.com
+
+- raft: be more permissive for elections for valid tickets
+- build: fix doc dir for redhat based distros
+- upstream version: 2ecb536
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.ZRQTmK/_old 2014-07-26 09:42:25.0 +0200
+++ /var/tmp/diff_new_pack.ZRQTmK/_new 2014-07-26 09:42:25.0 +0200
@@ -16,6 +16,16 @@
#
+%if 0%{?suse_version}
+%global booth_docdir %{_defaultdocdir}/%{name}
+%else
+# newer fedora distros have _pkgdocdir, rely on that when
+# available
+%{!?_pkgdocdir: %global _pkgdocdir %%{_docdir}/%{name}-%{version}}
+# Directory where we install documentation
+%global booth_docdir %{_pkgdocdir}
+%endif
+
Url:https://github.com/ClusterLabs/booth
%if 0%{?suse_version}
@@ -24,7 +34,7 @@
%define with_extra_warnings0
%define with_debugging 0
%define without_fatal_warnings 1
-%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
+%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
%define pkg_group System Environment/Daemons
%else
%define pkg_group Productivity/Clustering/HA
@@ -41,40 +51,53 @@
Source: booth.tar.bz2
Source1:%name-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# 1.1.6-2 on SLES has latest ticket support
-Requires: pacemaker-ticket-support >= 2.0
BuildRequires: asciidoc
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: glib2-devel
+%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
+BuildRequires: cluster-glue-libs-devel
+BuildRequires: pacemaker-libs-devel
+%else
BuildRequires: libglue-devel
BuildRequires: libpacemaker-devel
+%endif
BuildRequires: libxml2-devel
BuildRequires: pkgconfig
+%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
+Requires: cluster-glue-libs >= 1.0.6
+Requires: pacemaker >= 1.1.8
+%else
+Requires: pacemaker-ticket-support >= 2.0
+%endif
%description
-Booth manages the ticket which authorizes one of the cluster sites
-located in geographical dispersed distances to run certain resources.
-It is designed to be an add-on of Pacemaker, which extends Pacemaker to
-support geographical dispersed clustering.
+Booth manages the ticket which authorizes one of the cluster sites located in
+geographically dispersed distances to run certain resources. It is designed to
+be an add-on of Pacemaker, which extends Pacemaker to support geographically
+dispersed clustering.
Authors:
Jiaju Zhang
+Philipp Marek
+Dejan Muhamedagic
%prep
-%setup -n booth
+%setup -q -n %{name}
+
%build
./autogen.sh
%configure \
- --with-initddir=%{_initrddir}
+ --with-initddir=%{_initrddir} \
+--docdir=%{booth_docdir}
make
%install
-make DESTDIR=$RPM_BUILD_ROOT install docdir=%{_defaultdocdir}/%{name}
+make DESTDIR=$RPM_BUILD_ROOT install docdir=%{booth_docdir}
mkdir -p %{buildroot}/%{_mandir}/man8/
gzip < docs/boothd.8 > %{buildroot}/%{_mandir}/man8/booth.8.gz
@@ -111,7 +134,7 @@
fi
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_sbindir}/booth
%{_sbindir}/boothd
%{_mandir}/man8/booth.8.gz
@@ -133,7 +156,7 @@
%package test
Summary:Test scripts for Booth
-Group: Productivity/Clustering/HA
+Group: %{pkg_group}
Requires: booth
Requires: python
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/.git_info new/booth/.git_info
--- old/booth/.git_info 2014-07-17 16:32:16.0 +0200
+++ new/booth/.git_info 2014-07-25 13:23:19.0 +0200
@@ -1 +1 @@
-v0.1.7-285-g49c0f3d
+v0.1.7-297-g2ecb536
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/booth.spec new/booth/booth.spec
--- old/booth/booth.spec2014-07-17 16:30:12.0 +0200
+++ new/booth/booth.spec2014-07-25 12:57:28.0 +0200
@@ -1,3 +1,12 @@
+%if 0%{?suse_version}
+%global booth_docdir %{_defaultdocdir}/%{name}
+%else
+# newer fedora distros have _pkgdocdir, rely on that when
+# available
+%{!?_pkgdocdir: %global _pkgdocdir %%{_docdir}/%{name}-%{version}}
+# Directory where we install
commit booth for openSUSE:Factory
Hello community, here is the log from the commit of package booth for openSUSE:Factory checked in at 2014-07-22 06:57:51 Comparing /work/SRC/openSUSE:Factory/booth (Old) and /work/SRC/openSUSE:Factory/.booth.new (New) Package is "booth" Changes: --- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-07-11 06:45:47.0 +0200 +++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-07-22 06:57:52.0 +0200 @@ -1,0 +2,19 @@ +Thu Jul 17 14:20:58 UTC 2014 - dmuhameda...@suse.com + +- build: update setting build information +- doc: update server operation description +- client: add the -w option +- upstream version: 49c0f3d + +--- +Thu Jul 17 10:54:20 UTC 2014 - dmuhameda...@suse.com + +- build: fix setting package version in configure +- build: update booth.spec for redhat platforms +- client: wait for request outcome (bnc#887689) +- ticket: add renewal frequency (bnc#887113) +- ra: simplify process status and removal +- config: fix copying name from the configuration file name (bnc#886674) +- upstream version: 3bfdd5b + +--- Other differences: -- ++ booth.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/.git_info new/booth/.git_info --- old/booth/.git_info 2014-07-03 17:36:56.0 +0200 +++ new/booth/.git_info 2014-07-17 16:32:16.0 +0200 @@ -1 +1 @@ -v0.1.7-262-gff5b114 +v0.1.7-285-g49c0f3d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/README new/booth/README --- old/booth/README2014-07-03 17:11:10.0 +0200 +++ new/booth/README2014-07-17 16:30:12.0 +0200 @@ -1,16 +1,16 @@ The Booth Cluster Ticket Manager = -Booth manages the ticket which authorizes one of the cluster -sites located in geographically dispersed distances to run -certain resources. It is designed to be an add-on of Pacemaker, -which extends Pacemaker to support geographically distributed -clustering. +Booth manages tickets which authorize cluster sites located in +geographically dispersed locations to run resources. It +facilitates support of geographically distributed clustering in +Pacemaker. Booth is based on the Raft consensus algorithm. Though the -implementation is not complete (there is no log), booth -guarantees that the ticket is always available at just one site -as long as it has exclusive control of the tickets. +implementation is not complete (there is no log) and there are a +few additions and modifications, booth guarantees that the ticket +is always available at just one site as long as it has exclusive +control of the tickets. The git repository is available at github: @@ -27,12 +27,13 @@ of at least three servers. A booth server can be either a site or an arbitrator. Arbitrators -help resolve ties in elections, but cannot hold tickets. +take part in elections and so help resolve ties, but cannot hold +tickets. -The basic unit of operation in the booth cluster is a ticket. -Every non-granted ticket is in the initial state on all servers. -For granted tickets, the server holding the ticket is the leader -and other servers are followers. The leader issues heartbeats and +The basic unit in the booth cluster is a ticket. Every +non-granted ticket is in the initial state on all servers. For +granted tickets, the server holding the ticket is the leader and +other servers are followers. The leader issues heartbeats and ticket updates to the followers. The followers are required to obey the leader. @@ -41,14 +42,15 @@ On startup, the booth process first loads tickets, if available, from the CIB. Afterwards, it broadcasts a query to get tickets' -status from other servers. Local copies are updated from ticket -replies. +status from other servers. In-memory copies are updated from +the replies if they contain newer ticket data. If the server discovers that itself is the ticket leader, it tries to establish its authority again by broadcasting heartbeat. If it succeeds, it continues as the leader for this ticket. The other booth servers become followers. This procedure is possible -only immediately after the booth startup. +only immediately after the booth startup. It also serves as a +configuration reload. Grant and revoke operations @@ -62,7 +64,8 @@ Ticket revoke is the operation which is the opposite of grant. An administrative revoke may be started at any server, but the operation itself happens only at the leader. If the leader is -unreachable, the ticket cannot be revoked. +unreachable, the ticket cannot b
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2014-07-11 06:45:45
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-06-30
21:50:27.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-07-11
06:45:47.0 +0200
@@ -1,0 +2,11 @@
+Thu Jul 3 15:36:32 UTC 2014 - dmuhameda...@suse.com
+
+- add git version info and GNUmakefile for easier rpm package building
+- raft: make sure that elections restart if the last candidate disappears
+- use monotonic clock if available (bnc#884746)
+- raft: reset election on rejects too
+- raft: accept OP_UPDATE in candidate and init states too
+- ticket: don't write to CIB if we're in elections
+- upstream version: ff5b114
+
+---
Other differences:
--
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/.git_info new/booth/.git_info
--- old/booth/.git_info 1970-01-01 01:00:00.0 +0100
+++ new/booth/.git_info 2014-07-03 17:36:56.0 +0200
@@ -0,0 +1 @@
+v0.1.7-262-gff5b114
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/.gitignore new/booth/.gitignore
--- old/booth/.gitignore2014-06-26 19:31:25.0 +0200
+++ new/booth/.gitignore2014-07-03 17:11:10.0 +0200
@@ -9,6 +9,9 @@
depcomp
install-sh
missing
+booth.tar.bz2
+*.rpm
+Doxyfile
src/.deps
src/Makefile.in
src/b_config.h.in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/GNUmakefile new/booth/GNUmakefile
--- old/booth/GNUmakefile 1970-01-01 01:00:00.0 +0100
+++ new/booth/GNUmakefile 2014-07-03 17:11:10.0 +0200
@@ -0,0 +1,47 @@
+#
+# Copyright (C) 2008 Andrew Beekhof
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+-include Makefile
+
+PACKAGE?= booth
+TARFILE= $(PACKAGE).tar.bz2
+
+RPM_ROOT = $(shell pwd)
+RPM_OPTS = --define "_sourcedir $(RPM_ROOT)" \
+ --define "_specdir $(RPM_ROOT)" \
+ --define "_srcrpmdir $(RPM_ROOT)"
+
+
+TAG?= HEAD
+
+gitarchive:
+ rm -f $(TARFILE)
+ git archive --format=tar --prefix $(PACKAGE)/ $(TAG) | tar xf -
+ git describe --tags --always > $(PACKAGE)/.git_info
+ tar -cjf $(TARFILE) $(PACKAGE)
+ rm -r $(PACKAGE)
+ echo `date`: Rebuilt $(TARFILE)
+
+srpm: gitarchive
+ rm -f *.src.rpm
+ @echo To create custom builds, edit the flags and options in
$(PACKAGE).spec first
+ rpmbuild -bs $(RPM_OPTS) $(PACKAGE).spec
+
+rpm: srpm
+ rpmbuild $(RPM_OPTS) --rebuild $(RPM_ROOT)/*.src.rpm
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/booth-rpmlintrc new/booth/booth-rpmlintrc
--- old/booth/booth-rpmlintrc 1970-01-01 01:00:00.0 +0100
+++ new/booth/booth-rpmlintrc 2014-07-03 17:11:10.0 +0200
@@ -0,0 +1,3 @@
+addFilter("incoherent-init-script-name")
+addFilter("init-script-without-%insserv_cleanup-postun")
+addFilter("init-script-without-%stop_on_removal-preun")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/booth.spec new/booth/booth.spec
--- old/booth/booth.spec1970-01-01 01:00:00.0 +0100
+++ new/booth/booth.spec2014-07-03 17:11:10.0 +0200
@@ -0,0 +1,119 @@
+
+%global test_path %{_datadir}/booth/tests
+
+%if 0%{?suse_version}
+%define _libexecdir %{_libdir}
+%endif
+%define with_extra_warnings0
+%define with_debugging 0
+%define without_fatal_warnings 1
+%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
+%define pkg_group System Environment/Daemons
+%else
+%define pkg_group Productivity/Clustering/HA
+%endif
+
+Name:
commit booth for openSUSE:Factory
Hello community, here is the log from the commit of package booth for openSUSE:Factory checked in at 2014-06-30 21:45:14 Comparing /work/SRC/openSUSE:Factory/booth (Old) and /work/SRC/openSUSE:Factory/.booth.new (New) Package is "booth" Changes: --- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-06-16 21:25:35.0 +0200 +++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-06-30 21:45:40.0 +0200 @@ -1,0 +2,13 @@ +Thu Jun 26 17:36:55 UTC 2014 - dmuhameda...@suse.com + +- raft: match the request in acks too (bnc#882209) +- raft: add the request in reply packets +- raft: resend ticket updates (bnc#882209) +- raft: add short delay before election start (bnc#883785) +- ra: exit with success if validation fails in stop (bnc#883762) +- raft: make server stepdown more robust +- raft: remove unused commit_index (bnc#883216) +- raft: reset ticket leader before elections (bnc#883150) +- upstream version: 21b3f0 + +--- Other differences: -- ++ booth.tar.bz2 ++ 1945 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2014-06-16 21:25:34
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-06-07
07:12:34.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-06-16
21:25:35.0 +0200
@@ -1,0 +2,12 @@
+Sun Jun 15 14:08:50 UTC 2014 - dmuhameda...@suse.com
+
+- raft: preserve term for status messages
+- raft: ignore VOTE_FOR if we lost the candidate status (bnc#882209)
+- raft: always accept heartbeats and updates from a valid leader (bnc#882209)
+- raft: ack revokes (bnc#882057)
+- config: don't allow too long packet retry period
+- config: don't change ticket defaults in ticket stanzas (use __defaults__)
+- raft: don't ignore duplicate vote_for packets
+- upstream version: 4c1e97
+
+---
Other differences:
--
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/docs/boothd.8.txt new/booth/docs/boothd.8.txt
--- old/booth/docs/boothd.8.txt 2014-06-06 10:53:11.0 +0200
+++ new/booth/docs/boothd.8.txt 2014-06-15 16:01:35.0 +0200
@@ -177,9 +177,10 @@
*'ticket'*::
Registers a ticket. Multiple tickets can be handled by single
Booth instance.
-
-The next items modify per-ticket defaults. Modifications are
-inherited by tickets which follow in the configuration file.
++
+Use the special ticket name '__defaults__' to modify the
+defaults. The '__defaults__' stanza must precede all the other
+ticket specifications.
All times are in seconds.
@@ -220,10 +221,11 @@
+
Default is 10. Values lower than 3 are illegal.
+
-This counts only for a single broadcast; if ticket *renewal* runs
-into this limit (because the network was temporarily down), but
-the ticket is still valid afterwards, a new renewal run will be
-started automatically.
+Ticket *renewal*, which occurs every half expire time, cannot
+must happen after packet resending. Hence, the total retry time
+must be shorter than half the expire time:
+
+ timeout*(retries+1) < expire/2
*'before-acquire-handler'*::
If set, this command will be called before 'boothd' tries to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/src/booth.h new/booth/src/booth.h
--- old/booth/src/booth.h 2014-06-06 10:53:11.0 +0200
+++ new/booth/src/booth.h 2014-06-15 16:01:35.0 +0200
@@ -149,6 +149,7 @@
OP_REQ_VOTE = CHAR2CONST('R', 'V', 'o', 't'), /* start election */
OP_VOTE_FOR = CHAR2CONST('V', 't', 'F', 'r'), /* reply to REQ_VOTE */
OP_HEARTBEAT= CHAR2CONST('H', 'r', 't', 'B'), /* Heartbeat */
+ OP_ACK = CHAR2CONST('A', 'c', 'k', '.'), /* Ack for heartbeats and
revokes */
OP_UPDATE = CHAR2CONST('U', 'p', 'd', 'E'), /* Update ticket */
OP_REVOKE = CHAR2CONST('R', 'e', 'v', 'k'), /* Revoke ticket */
OP_REJECTED = CHAR2CONST('R', 'J', 'C', '!'),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/src/config.c new/booth/src/config.c
--- old/booth/src/config.c 2014-06-06 10:53:11.0 +0200
+++ new/booth/src/config.c 2014-06-15 16:01:35.0 +0200
@@ -154,10 +154,6 @@
exit(1);
}
- log_debug("configured %s: %s, id=%d",
- (site->type == ARBITRATOR ? "arbitrator" : "site"),
- site->addr_string, site->site_id);
-
out:
return rv;
}
@@ -214,6 +210,12 @@
tk = booth_conf->ticket + booth_conf->ticket_count;
booth_conf->ticket_count++;
+ tk->last_valid_tk = malloc(sizeof(struct ticket_config));
+ if (!tk->last_valid_tk) {
+ log_error("out of memory");
+ return -ENOMEM;
+ }
+ memset(tk->last_valid_tk, 0, sizeof(struct ticket_config));
if (!check_max_len_valid(name, sizeof(tk->name))) {
log_error("ticket name \"%s\" too long.", name);
@@ -241,6 +243,18 @@
return 0;
}
+static int validate_ticket(struct ticket_config *tk)
+{
+ if (tk->timeout*(tk->retries+1) >= tk->term_duration/2) {
+ tk_log_error("total amount of time to "
+ "retry sending packets cannot exceed "
+ "half of the expiry time "
+ "(%d*(%d+1) >= %d/2)",
+ tk->timeout, tk->retries, tk->term_duration);
+ return 0;
+ }
+ retu
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2014-06-07 07:12:33
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-05-27
11:52:00.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-06-07
07:12:34.0 +0200
@@ -1,0 +2,12 @@
+Fri Jun 6 09:04:17 UTC 2014 - dmuhameda...@suse.com
+
+- raft: don't reset acks prematurely (bnc#881508)
+- test: add more tests to live_test.sh
+- raft: on server step down reset the ticket state too
+- service-runnable: remove crm_simulate's tmp shadow (bnc#879934)
+- raft: invalidate ticket if the leader wants to step down
+- raft: delay revoke if there's another operation in progress
+- main: enable coredumps
+- upstream version: 465245
+
+---
Other differences:
--
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/docs/boothd.8.txt new/booth/docs/boothd.8.txt
--- old/booth/docs/boothd.8.txt 2014-05-26 13:08:22.0 +0200
+++ new/booth/docs/boothd.8.txt 2014-06-06 10:53:11.0 +0200
@@ -167,6 +167,13 @@
Booth needs at least three members for normal operation. Odd
number of members provides more redundancy.
+*'site-user'*, *'site-group'*, *'arbitrator-user'*, *'arbitrator-group'*::
+ These define the credentials 'boothd' will be running with.
++
+On a (Pacemaker) site the booth process will have to call 'crm_ticket', so the
+default is to use 'hacluster':'haclient'; for an arbitrator this user and
group
+might not exists, so there we default to 'nobody':'nobody'.
+
*'ticket'*::
Registers a ticket. Multiple tickets can be handled by single
Booth instance.
@@ -218,15 +225,6 @@
the ticket is still valid afterwards, a new renewal run will be
started automatically.
-
-*'site-user'*, *'site-group'*, *'arbitrator-user'*, *'arbitrator-group'*::
- These define the credentials 'boothd' will be running with.
-+
-On a (Pacemaker) site the booth process will have to call 'crm_ticket', so the
-default is to use 'hacluster':'haclient'; for an arbitrator this user and
group
-might not exists, so there we default to 'nobody':'nobody'.
-
-
*'before-acquire-handler'*::
If set, this command will be called before 'boothd' tries to
acquire or renew a ticket. On exit code other than 0,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/script/service-runnable
new/booth/script/service-runnable
--- old/booth/script/service-runnable 2014-05-26 13:08:22.0 +0200
+++ new/booth/script/service-runnable 2014-06-06 10:53:11.0 +0200
@@ -7,12 +7,14 @@
set -e
service="${1:?Need a resource name as first argument.}"
+tmpshadow=`mktemp booth-check.XX`
+trap "rm -f $tmpshadow" EXIT
# We expect an output like
# p_dummy(ocf::pacemaker:Dummy): Started geo-rz2-a
-if crm_simulate --ticket-grant "$BOOTH_TICKET" --simulate --live-check |
+if crm_simulate -O $tmpshadow --ticket-grant "$BOOTH_TICKET" --simulate
--live-check |
sed -n '/^Revised cluster status:/,$p' |
egrep "^[[:space:]]+$service[[:space:]]+\(.*\):[[:space:]]+Started
([^[:space:]]+) *$" >/dev/null
then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/src/config.c new/booth/src/config.c
--- old/booth/src/config.c 2014-05-26 13:08:22.0 +0200
+++ new/booth/src/config.c 2014-06-06 10:53:11.0 +0200
@@ -46,7 +46,7 @@
p = realloc(booth_conf->ticket,
sizeof(struct ticket_config) * want);
- if (!booth_conf) {
+ if (!p) {
log_error("can't alloc more tickets");
return -ENOMEM;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/src/inline-fn.h new/booth/src/inline-fn.h
--- old/booth/src/inline-fn.h 2014-05-26 13:08:22.0 +0200
+++ new/booth/src/inline-fn.h 2014-06-06 10:53:11.0 +0200
@@ -297,7 +297,6 @@
{
tk->retry_number = 0;
tk->acks_expected = 0;
- tk->acks_received = 0;
}
static inline int send_heartbeat(struct ticket_config *tk)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/src/main.c new/booth/src/main.c
--- old/booth/src/main.c2014-05-26 13:08:22.0 +0200
+++ new/booth/src/main.c2014-06-06 10:53:11.0 +0200
@@ -34,6 +34,8 @@
#include
#i
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2014-05-27 11:51:58
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-05-20
14:21:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-05-27
11:52:00.0 +0200
@@ -1,0 +2,10 @@
+Tue May 27 08:09:59 UTC 2014 - dmuhameda...@suse.com
+
+- raft: account for slow servers in elections
+- raft: improve ticket update on status message
+- raft: increment term if election ends in tie
+- booth operation testing facility
+- ticket: update status/startup ticket processing
+- upstream version: 63c908
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.EU9WUf/_old 2014-05-27 11:52:01.0 +0200
+++ /var/tmp/diff_new_pack.EU9WUf/_new 2014-05-27 11:52:01.0 +0200
@@ -30,13 +30,12 @@
%define pkg_group Productivity/Clustering/HA
%endif
-%global booth_share%{_prefix}/share/booth
-%global test_path %{booth_share}/tests
+%global test_path %{_datadir}/booth/tests
Name: booth
-Summary:The Booth Cluster Ticket Manager
+Summary:Ticket Manager for Multi-site Clusters
License:GPL-2.0+
-Group: Productivity/Clustering/HA
+Group: %{pkg_group}
Version:0.2.0
Release:0
Source: booth.tar.bz2
@@ -88,7 +87,9 @@
#install test-parts
mkdir -p %{buildroot}/%{test_path}
-cp -a unit-tests/ script/unit-test.py README-testing test conf
%{buildroot}/%{test_path}/
+cp -a unit-tests/ script/unit-test.py test conf %{buildroot}/%{test_path}/
+chmod +x %{buildroot}/%{test_path}/test/live_test.sh
+chmod +x %{buildroot}/%{test_path}/test/booth_path
mkdir -p %{buildroot}/%{test_path}/src/
ln -s %{_sbindir}/boothd %{buildroot}/%{test_path}/src/
@@ -113,7 +114,6 @@
%defattr(-,root,root)
%{_sbindir}/booth
%{_sbindir}/boothd
-%exclude %{_sbindir}/rcbooth-arbitrator
%{_mandir}/man8/booth.8.gz
%{_mandir}/man8/boothd.8.gz
%dir /usr/lib/ocf
@@ -145,6 +145,6 @@
%defattr(-,root,root)
%doc README-testing
-%{booth_share}/tests
+%{test_path}
%changelog
++ booth.tar.bz2 ++
1627 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2014-05-20 14:21:57
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-05-13
20:43:11.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-05-20
14:21:58.0 +0200
@@ -1,0 +2,13 @@
+Mon May 19 11:12:32 UTC 2014 - dmuhameda...@suse.com
+
+- ticket: delay ticket processing a bit at startup
+- raft: improve reacquire on startup
+- ticket: run new election on ticket reacquire
+- ticket: always reacquire tickets granted here (bnc#878359)
+- config: reacquire ticket granted here always (bnc#83)
+- improve logging
+- transport: prefer exact address matches (bnc#877669)
+- doc: describe server operation in the README
+- upstream version: 1bcef0c
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.E7NyqF/_old 2014-05-20 14:21:59.0 +0200
+++ /var/tmp/diff_new_pack.E7NyqF/_new 2014-05-20 14:21:59.0 +0200
@@ -127,7 +127,7 @@
/usr/lib/systemd/system/booth@.service
%dir %{_datadir}/booth
-%{_datadir}/booth/service-still-runnable
+%{_datadir}/booth/service-runnable
%doc README COPYING
++ booth.tar.bz2 ++
1835 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2014-05-13 20:43:10
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-05-06
17:37:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-05-13
20:43:11.0 +0200
@@ -1,0 +2,17 @@
+Mon May 12 17:30:47 UTC 2014 - dmuhameda...@suse.com
+
+- build: add the service-still-runnable script
+- raft: set ticket wakeup after MY_INDEX (bnc#877356)
+- ticket: allow enforcing immediate grant (bnc#876191)
+- raft: test for misled lost ticket condition
+- raft: include reason for RPC
+- raft: wait a short delay before starting new elections
+- raft: reduce the election timeout to the ticket timeout
+- doc: add booth description to README
+- raft: delay ticket commit to the CIB on manual grants (bnc#876321)
+- raft: don't update the ticket expiry before leader got elected
+- raft: fix external program handling
+- raft: send heartbeat only on restart (bnc#876516)
+- upstream version: c18e68
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.UCP9qs/_old 2014-05-13 20:43:12.0 +0200
+++ /var/tmp/diff_new_pack.UCP9qs/_new 2014-05-13 20:43:12.0 +0200
@@ -126,6 +126,9 @@
/usr/lib/systemd/system/booth@.service
+%dir %{_datadir}/booth
+%{_datadir}/booth/service-still-runnable
+
%doc README COPYING
%package test
@@ -142,6 +145,6 @@
%defattr(-,root,root)
%doc README-testing
-%{booth_share}
+%{booth_share}/tests
%changelog
++ booth.tar.bz2 ++
2043 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit booth for openSUSE:Factory
Hello community, here is the log from the commit of package booth for openSUSE:Factory checked in at 2014-05-06 17:37:46 Comparing /work/SRC/openSUSE:Factory/booth (Old) and /work/SRC/openSUSE:Factory/.booth.new (New) Package is "booth" Changes: --- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-04-17 14:07:50.0 +0200 +++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-05-06 17:37:47.0 +0200 @@ -1,0 +2,47 @@ +Mon May 5 11:30:48 UTC 2014 - dmuhameda...@suse.com + +- doc: hawk uses booth, not crm_ticket +- upstream version: 7f10ce + +--- +Mon May 5 11:01:30 UTC 2014 - dmuhameda...@suse.com + +- raft: accept valid heartbeats in the candidate state +- raft: elections not allowed if the term's still valid (bnc#876300) +- raft: on vote request reply to sender only +- upstream version: 8be1aa + +--- +Fri May 2 17:25:23 UTC 2014 - dmuhameda...@suse.com + +- status: test TCP socket bind instead of UDP (bnc#874139) +- doc: update the man page and add section on booth ticket management +- raft: always run election before acquiring tickets +- raft: reset expired tickets on load +- ticket: query status on startup (bnc#873205) +- config: use only address for the site id (bnc#875237) +- raft: update election logic (bnc#872103) +- ticket: adjust acquire-after use to the manpage +- doc: clarify the acquire-after use (bnc#874148) +- transport: use local address for address matching (bnc#875148) +- ticket: increment lease time only when majority held +- raft: reduce the default timeout to 5 seconds +- ticket: allow revoke only on leaders +- ticket: write ticket to CIB on revoke +- raft: no vote on revoked tickets (bnc#872918) +- raft: increment the term on new election when ticket lost (bnc#873643) +- raft: don't broadcast req_vote twice on ticket grant +- raft: expire tickets on no heartbeat acks (bnc#873483) +- ticket: start election if the ticket was granted to us (bnc#873400) +- transport: reuse port/address on bind (bnc#873382) +- ticket: write ticket on majority heartbeat acks (bnc#873175) +- upstream version: 36d94a + +--- +Mon Apr 14 11:50:44 UTC 2014 - dmuhameda...@suse.com + +- transport: reuse port/address on bind (bnc#873382) +- ticket: write ticket on majority heartbeat acks (bnc#873175) +- upstream version: 3af8b0 + +--- Other differences: -- ++ booth.tar.bz2 ++ 2084 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2014-04-17 14:07:49
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-03-04
13:20:36.0 +0100
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-04-17
14:07:50.0 +0200
@@ -1,0 +2,35 @@
+Mon Apr 7 15:04:43 UTC 2014 - dmuhameda...@suse.com
+
+- init script is not needed in this package (bnc#872063)
+- upstream version: 60de8d
+
+---
+Wed Apr 2 12:18:43 UTC 2014 - dmuhameda...@suse.com
+
+- fix building manpages
+
+---
+Wed Apr 2 10:11:34 UTC 2014 - dmuhameda...@suse.com
+
+- fix format related warnings
+
+---
+Mon Mar 31 17:13:12 CET 2014 - philipp.ma...@linbit.com
+
+- Small fine-tuning changes
+
+---
+Thu Mar 27 14:45:31 CET 2014 - philipp.ma...@linbit.com
+
+- Rewrite, using Raft instead of Paxos.
+- Version 0.2.0
+
+---
+Wed Mar 5 10:31:42 CET 2014 - philipp.ma...@linbit.com
+
+- Provided a script to check resource health
+- Replaced "resource_monitor" functionality; now an external
+ script is called before the ticket is acquired/renewed.
+- Version 0.1.7
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.1bvFl6/_old 2014-04-17 14:07:51.0 +0200
+++ /var/tmp/diff_new_pack.1bvFl6/_new 2014-04-17 14:07:51.0 +0200
@@ -24,7 +24,6 @@
%define with_extra_warnings0
%define with_debugging 0
%define without_fatal_warnings 1
-%define with_resource_monitor 1
%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
%define pkg_group System Environment/Daemons
%else
@@ -38,23 +37,21 @@
Summary:The Booth Cluster Ticket Manager
License:GPL-2.0+
Group: Productivity/Clustering/HA
-Version:0.1.6
+Version:0.2.0
Release:0
Source: booth.tar.bz2
Source1:%name-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# 1.1.6-2 on SLES has latest ticket support
Requires: pacemaker-ticket-support >= 2.0
+BuildRequires: asciidoc
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: glib2-devel
BuildRequires: libglue-devel
+BuildRequires: libpacemaker-devel
BuildRequires: libxml2-devel
BuildRequires: pkgconfig
-%if %{with_resource_monitor}
-BuildRequires: libpacemaker-devel
-#pacemaker-libs-devel
-%endif
%description
Booth manages the ticket which authorizes one of the cluster sites
@@ -73,16 +70,12 @@
%build
./autogen.sh
%configure \
-%if %{with_resource_monitor}
- --enable-resource-monitor \
-%endif
--with-initddir=%{_initrddir}
make
%install
make DESTDIR=$RPM_BUILD_ROOT install docdir=%{_defaultdocdir}/%{name}
-ln -s ../../etc/init.d/booth-arbitrator
%{buildroot}/usr/sbin/rcbooth-arbitrator
mkdir -p %{buildroot}/%{_mandir}/man8/
gzip < docs/boothd.8 > %{buildroot}/%{_mandir}/man8/booth.8.gz
@@ -120,17 +113,14 @@
%defattr(-,root,root)
%{_sbindir}/booth
%{_sbindir}/boothd
-%{_sbindir}/rcbooth-arbitrator
-%if %{with_resource_monitor}
-%{_sbindir}/booth_resource_monitord
-%endif
+%exclude %{_sbindir}/rcbooth-arbitrator
%{_mandir}/man8/booth.8.gz
%{_mandir}/man8/boothd.8.gz
%dir /usr/lib/ocf
%dir /usr/lib/ocf/resource.d
%dir /usr/lib/ocf/resource.d/pacemaker
%dir %{_sysconfdir}/booth
-%{_initddir}/booth-arbitrator
+%exclude %{_initddir}/booth-arbitrator
/usr/lib/ocf/resource.d/pacemaker/booth-site
%config %{_sysconfdir}/booth/booth.conf.example
++ booth.tar.bz2 ++
16132 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2014-03-04 13:20:35
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-02-18
14:43:53.0 +0100
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-03-04
13:20:36.0 +0100
@@ -1,0 +2,11 @@
+Mon Feb 24 13:32:21 CET 2014 - philipp.ma...@linbit.com
+
+- Systemd integration
+- Atomic ticket writes (grant/revoke with attributes)
+ Automatic fallback for older 'crm_ticket' binaries
+- Autoconf/Configure check for moved log_cib_diff() function
+ Make package build again with newer Pacemaker libraries.
+- Small fixes, cleanups, and enhancements for the unit tests.
+- Version 0.1.6
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.R9ao1q/_old 2014-03-04 13:20:36.0 +0100
+++ /var/tmp/diff_new_pack.R9ao1q/_new 2014-03-04 13:20:36.0 +0100
@@ -38,7 +38,7 @@
Summary:The Booth Cluster Ticket Manager
License:GPL-2.0+
Group: Productivity/Clustering/HA
-Version:0.1.5
+Version:0.1.6
Release:0
Source: booth.tar.bz2
Source1:%name-rpmlintrc
@@ -88,6 +88,10 @@
gzip < docs/boothd.8 > %{buildroot}/%{_mandir}/man8/booth.8.gz
ln %{buildroot}/%{_mandir}/man8/booth.8.gz
%{buildroot}/%{_mandir}/man8/boothd.8.gz
+# systemd
+mkdir -p %{buildroot}/usr/lib/systemd/system/
+cp -a conf/booth@.service %{buildroot}/usr/lib/systemd/system/booth@.service
+
#install test-parts
mkdir -p %{buildroot}/%{test_path}
@@ -129,6 +133,9 @@
%{_initddir}/booth-arbitrator
/usr/lib/ocf/resource.d/pacemaker/booth-site
%config %{_sysconfdir}/booth/booth.conf.example
+
+/usr/lib/systemd/system/booth@.service
+
%doc README COPYING
%package test
++ _service ++
--- /var/tmp/diff_new_pack.R9ao1q/_old 2014-03-04 13:20:36.0 +0100
+++ /var/tmp/diff_new_pack.R9ao1q/_new 2014-03-04 13:20:36.0 +0100
@@ -1,6 +1,6 @@
-git://github.com/jjzhang/booth.git
+git://github.com/ClusterLabs/booth.git
git
.git
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/conf/booth@.service
new/booth/conf/booth@.service
--- old/booth/conf/booth@.service 1970-01-01 01:00:00.0 +0100
+++ new/booth/conf/booth@.service 2014-02-24 13:41:07.0 +0100
@@ -0,0 +1,17 @@
+# This file is part of Booth.
+
+[Unit]
+Description=Booth - Ticket Manager for Pacemaker Clusters
+Documentation=man:boothd(8)
+After=network-online.target
+ConditionFileExists=/etc/booth/%i.conf
+
+[Install]
+Alias=boothd
+WantedBy=multi-user.target
+
+[Service]
+Type=simple
+Conflicts=pacemaker.service
+ExecStart=/usr/sbin/boothd daemon -S -c %i
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/configure new/booth/configure
--- old/booth/configure 2014-02-17 12:46:01.0 +0100
+++ new/booth/configure 2014-02-24 13:15:11.0 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for booth 0.1.4.
+# Generated by GNU Autoconf 2.69 for booth 0.1.5.
#
# Report bugs to .
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='booth'
PACKAGE_TARNAME='booth'
-PACKAGE_VERSION='0.1.4'
-PACKAGE_STRING='booth 0.1.4'
+PACKAGE_VERSION='0.1.5'
+PACKAGE_STRING='booth 0.1.5'
PACKAGE_BUGREPORT='pacema...@oss.clusterlabs.org'
PACKAGE_URL=''
@@ -626,6 +626,8 @@
am__EXEEXT_TRUE
LTLIBOBJS
BOOTHSYSCONFDIR
+HAVE_XML_LOG_PATCHSET
+HAVE_LOG_CIB_DIFF
LINT_FLAGS
BUILD_HTML_DOCS_FALSE
BUILD_HTML_DOCS_TRUE
@@ -1316,7 +1318,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures booth 0.1.4 to adapt to many kinds of systems.
+\`configure' configures booth 0.1.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1386,7 +1388,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of booth 0.1.4:";;
+ short | recursive ) echo "Configuration of booth 0.1.5:";;
esac
cat <<\_ACEOF
@@ -1495,7 +1497,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-booth configure 0.1.4
+booth configure 0.1.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation,
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2014-02-18 14:43:51
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-02-01
08:43:13.0 +0100
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-02-18
14:43:53.0 +0100
@@ -1,0 +2,21 @@
+Mon Feb 17 13:12:42 CET 2014 - philipp.ma...@linbit.com
+
+- Enhancements to the unit-tests - more data when they fail.
+- A few other fixes
+- Version 0.1.5
+
+---
+Wed Feb 12 13:31:21 CET 2014 - philipp.ma...@linbit.com
+
+- Tim Serong reported problems, I'd guess because of compiler
+ optimizations. Converted a macro to a (less clever) function.
+- Some other fixes for catchup and ticket re-acquiration.
+
+---
+Mon Feb 10 15:25:00 CET 2014 - philipp.ma...@linbit.com
+
+- New sub-package that includes all the test scripts and data.
+ Doesn't work yet; but available to make testing (the packaging
+ problem) easier.
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.Pl0bTQ/_old 2014-02-18 14:43:54.0 +0100
+++ /var/tmp/diff_new_pack.Pl0bTQ/_new 2014-02-18 14:43:54.0 +0100
@@ -31,11 +31,14 @@
%define pkg_group Productivity/Clustering/HA
%endif
+%global booth_share%{_prefix}/share/booth
+%global test_path %{booth_share}/tests
+
Name: booth
Summary:The Booth Cluster Ticket Manager
License:GPL-2.0+
Group: Productivity/Clustering/HA
-Version:0.1.3
+Version:0.1.5
Release:0
Source: booth.tar.bz2
Source1:%name-rpmlintrc
@@ -85,6 +88,15 @@
gzip < docs/boothd.8 > %{buildroot}/%{_mandir}/man8/booth.8.gz
ln %{buildroot}/%{_mandir}/man8/booth.8.gz
%{buildroot}/%{_mandir}/man8/boothd.8.gz
+#install test-parts
+
+mkdir -p %{buildroot}/%{test_path}
+cp -a unit-tests/ script/unit-test.py README-testing test conf
%{buildroot}/%{test_path}/
+
+mkdir -p %{buildroot}/%{test_path}/src/
+ln -s %{_sbindir}/boothd %{buildroot}/%{test_path}/src/
+rm -f %{buildroot}/%{test_path}/test/*.pyc
+
%check
%if 0%{?run_build_tests}
echo "%%run_build_tests set to %run_build_tests; including tests"
@@ -119,4 +131,20 @@
%config %{_sysconfdir}/booth/booth.conf.example
%doc README COPYING
+%package test
+Summary:Test scripts for Booth
+Group: Productivity/Clustering/HA
+Requires: booth
+Requires: python
+
+%description test
+This package contains automated tests for Booth,
+the Cluster Ticket Manager for Pacemaker.
+
+%files test
+%defattr(-,root,root)
+
+%doc README-testing
+%{booth_share}
+
%changelog
++ booth.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth/README-testing new/booth/README-testing
--- old/booth/README-testing2014-01-24 16:15:52.0 +0100
+++ new/booth/README-testing2014-02-17 13:11:17.0 +0100
@@ -1,11 +1,14 @@
+There's a booth-test RPM available that contains two types of tests.
+
+It installs the necessary files into `/usr/share/booth/tests`.
=== Simple tests (commandline, config file)
-Run
+Run (as non-root)
-# make check-TESTS
+# python test/runtests.py
to run the tests written in python.
@@ -19,7 +22,12 @@
# python script/unit-test.py src/boothd unit-tests/
-This must (currently?) be run as a non-root user.
+Or, if using the 'booth-test' RPM,
+
+# python unit-test.py src/boothd unit-tests/
+
+This must (currently?) be run as a non-root user; another optional argument is
+the test to start from, eg. '003'.
Basically, boothd is started with the config file `unit-tests/booth.conf`, and
@@ -72,4 +80,25 @@
* The "fake" `crm_ticket` script gets the current test via `UNIT_TEST`; test
scripts can pass additional information via `UNIT_TEST_AUX`.
+
+ Tips and Hints
+
+There's another special header: `gdb__N__`. These lines are sent to GDB after
+injecting a message, but before waiting for an outgoing line. Values that
+contain `§` are sent as multiple lines to GDB.
+
+This means that a stanza like
+
+
+gdb0:
+watch booth_conf->ticket[0].owner § commands § bt § c § end
+
+
+will cause a watchpoint to be set, and when it is triggered a backtrace (`bt`)
+is written to the log file.
+
+This makes it easy to ask for additional data or check for a call-chain when
+hitting bugs that ca
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2014-02-01 08:43:12
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-01-13
12:00:22.0 +0100
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-02-01
08:43:13.0 +0100
@@ -1,0 +2,15 @@
+Fri Jan 24 16:00:00 CET 2014 - philipp.ma...@linbit.com
+
+- Version 0.1.3
+- New (extended) version of man pages
+- First draft of unit-tests
+- Run as non-root user
+- Transmission retry counter configureable
+- Lots of fixes for the state engine
+- Improve timeout handling mechanism to make booth more robust
+ (fate#316131)
+- reconfiguration of boothd while running (fate#316126)
+- Multi-tenancy for booth (fate#316123)
+- booth should support IPv6 in full (fate#316122)
+
+---
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.V3Y8qs/_old 2014-02-01 08:43:14.0 +0100
+++ /var/tmp/diff_new_pack.V3Y8qs/_new 2014-02-01 08:43:14.0 +0100
@@ -35,7 +35,7 @@
Summary:The Booth Cluster Ticket Manager
License:GPL-2.0+
Group: Productivity/Clustering/HA
-Version:0.1.2
+Version:0.1.3
Release:0
Source: booth.tar.bz2
Source1:%name-rpmlintrc
@@ -45,7 +45,6 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: glib2-devel
-BuildRequires: help2man
BuildRequires: libglue-devel
BuildRequires: libxml2-devel
BuildRequires: pkgconfig
@@ -82,6 +81,10 @@
make DESTDIR=$RPM_BUILD_ROOT install docdir=%{_defaultdocdir}/%{name}
ln -s ../../etc/init.d/booth-arbitrator
%{buildroot}/usr/sbin/rcbooth-arbitrator
+mkdir -p %{buildroot}/%{_mandir}/man8/
+gzip < docs/boothd.8 > %{buildroot}/%{_mandir}/man8/booth.8.gz
+ln %{buildroot}/%{_mandir}/man8/booth.8.gz
%{buildroot}/%{_mandir}/man8/boothd.8.gz
+
%check
%if 0%{?run_build_tests}
echo "%%run_build_tests set to %run_build_tests; including tests"
++ booth.tar.bz2 ++
3161 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit booth for openSUSE:Factory
Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2014-01-13 12:00:21
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
Package is "booth"
Changes:
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2013-09-26
14:43:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-01-13
12:00:22.0 +0100
@@ -1,0 +2,17 @@
+Fri Jan 10 13:53:48 CET 2014 - philipp.ma...@linbit.com
+
+- Nearly full rewrite, version number 0.1.2.
+ github.com:ClusterLabs/booth.git 7fce594
+ - Use UDP for initial catchup, to avoid blocking on simultaneous restarts
+ - Automatic ticket renewal after first half of the expire interval
+ - Fixed building for OSC (libs in LDADD instead of LDFLAGS)
+ - Many cleanups.
+ - Daemon restart won't lose information, tickets loaded from CIB
+ - Multi-tenancy via multiple config files (FATE 316123)
+Init script starts all instances.
+ - Cleaned up config file parsing, is now more user-friendly
+ - Type (site/arbitrator) deduced from configuration and local IP addresses
+ - Should (might) work with IPv6, too.
+- booth-resource-monitor-build-issue.patch
+
+---
Old:
booth-resource-monitor-build-issue.patch
Other differences:
--
++ booth.spec ++
--- /var/tmp/diff_new_pack.W64p0P/_old 2014-01-13 12:00:23.0 +0100
+++ /var/tmp/diff_new_pack.W64p0P/_new 2014-01-13 12:00:23.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package booth
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -15,9 +15,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-Url:https://github.com/jjzhang/booth
+Url:https://github.com/ClusterLabs/booth
+
%if 0%{?suse_version}
%define _libexecdir %{_libdir}
%endif
@@ -33,19 +33,22 @@
Name: booth
Summary:The Booth Cluster Ticket Manager
-Version:0.1
-Release:0
License:GPL-2.0+
Group: Productivity/Clustering/HA
+Version:0.1.2
+Release:0
Source: booth.tar.bz2
Source1:%name-rpmlintrc
-Patch1:booth-resource-monitor-build-issue.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-AutoReqProv:on
# 1.1.6-2 on SLES has latest ticket support
Requires: pacemaker-ticket-support >= 2.0
-BuildRequires: autoconf automake help2man pkgconfig
-BuildRequires: glib2-devel libglue-devel libxml2-devel
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: glib2-devel
+BuildRequires: help2man
+BuildRequires: libglue-devel
+BuildRequires: libxml2-devel
+BuildRequires: pkgconfig
%if %{with_resource_monitor}
BuildRequires: libpacemaker-devel
#pacemaker-libs-devel
@@ -65,7 +68,6 @@
%prep
%setup -n booth
-%patch1 -p1
%build
./autogen.sh
%configure \
++ booth.tar.bz2 ++
18910 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
