pool/pacemaker
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 603197 from network:ha-clustering:Factory

Browse Source 
- Update to version 1.1.18+20180430.b12c320f5:
  * XML: upgrade-2.10.xsl: fix "mark space" issue (bsc#1091661) (forwarded request 603196 from yan_gao)

OBS-URL: https://build.opensuse.org/request/show/603197
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pacemaker?expand=0&rev=120
This commit is contained in:
Dominique Leuenberger 2018-05-06 12:57:39 +00:00 committed by Git OBS Bridge
commit 7dcf0b7fc7
7 changed files with 78 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_servicedata
View File

@ -1,6 +1,6 @@
<servicedata> <servicedata>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/pacemaker.git</param> <param name="url">git://github.com/ClusterLabs/pacemaker.git</param>
<param name="changesrevision">633845120c493da6853b4f61138582ba820a7a0e</param> <param name="changesrevision">224e03bb1a842db796283054eb27eee6f00f1a7c</param>
</service> </service>
</servicedata> </servicedata>

12
bug-977201_pacemaker-controld-self-fencing.patch
View File

@ -4,16 +4,16 @@ Date: Mon Jun 13 17:26:27 2016 +0200
Fix: controld: Prevent unwanted self-fencing if "stateful_merge_wait" state of dlm is not available Fix: controld: Prevent unwanted self-fencing if "stateful_merge_wait" state of dlm is not available
diff --git a/extra/resources/controld b/extra/resources/controld Index: pacemaker-1.1.18+20180427.a34ccd926/extra/resources/controld
index ddb514a..37d5c62 100644 ===================================================================
--- a/extra/resources/controld --- pacemaker-1.1.18+20180427.a34ccd926.orig/extra/resources/controld
+++ b/extra/resources/controld +++ pacemaker-1.1.18+20180427.a34ccd926/extra/resources/controld
@@ -232,10 +232,6 @@ controld_monitor() { @@ -227,10 +227,6 @@ controld_monitor() {
if [ -n "$smw" ] && [ $smw -eq 1 ]; then if [ -n "$smw" ] && [ $smw -eq 1 ]; then
ocf_log err "DLM status is: stateful_merge_wait" ocf_log err "DLM status is: stateful_merge_wait"
rc=$OCF_ERR_GENERIC rc=$OCF_ERR_GENERIC
- elif [ -z "$smw" ] && dlm_tool ls | grep -q "wait fencing" && \ - elif [ -z "$smw" ] && dlm_tool ls | grep -q "wait fencing" && \
- ! stonith_admin -H '*' -V | grep -q "wishes to"; then - ! stonith_admin -H '*' -V | grep -q "wishes to"; then
- ocf_log err "DLM status is: wait fencing" - ocf_log err "DLM status is: wait fencing"
- rc=$OCF_ERR_GENERIC - rc=$OCF_ERR_GENERIC
else else

13
fate-323526_pacemaker-tests-shebang-python3.patch
View File

@ -1,13 +0,0 @@
Index: pacemaker-1.1.18+20180129.c801ab11e/cts/CIB.py
===================================================================
--- pacemaker-1.1.18+20180129.c801ab11e.orig/cts/CIB.py
+++ pacemaker-1.1.18+20180129.c801ab11e/cts/CIB.py
@@ -403,7 +403,7 @@ Description=Dummy resource that takes a
[Service]
Type=notify
-ExecStart=/usr/bin/python -c 'import time, systemd.daemon; time.sleep(10); systemd.daemon.notify("READY=1"); time.sleep(86400)'
+ExecStart=/usr/bin/python3 -c 'import time, systemd.daemon; time.sleep(10); systemd.daemon.notify("READY=1"); time.sleep(86400)'
ExecStop=/bin/sh -c 'sleep 10; [ -n "\$MAINPID" ] && kill -s KILL \$MAINPID'
"""

3
pacemaker-1.1.18+20180406.633845120.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7a8dcf20edf5c7d01201771b805e2a2cec5c8fa65558a261ee3b9bb2330b2eb1
size 3260056

3
pacemaker-1.1.18+20180430.b12c320f5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:527dc034a5ab7c2a20c17aa10b3679debcd7d11eeabf2a736591e589fbb3f650
size 3279084

51
pacemaker.changes
View File

@ -1,3 +1,52 @@
-------------------------------------------------------------------
Wed May 2 12:48:53 UTC 2018 - ygao@suse.com
- Update to version 1.1.18+20180430.b12c320f5:
* XML: upgrade-2.10.xsl: fix "mark space" issue (bsc#1091661)
-------------------------------------------------------------------
Sat Apr 28 21:07:31 UTC 2018 - ygao@suse.com
- Update to version 1.1.18+20180427.a34ccd926:
- crmd: avoid double free after ACL rejection of resource delete
- lib: Changed to lowercase comparison.
- all: correct misspellings
- controld: remove deprecated configdir parameter
- controld: deprecate and ignore configdir parameter
- controld: consistently indent with spaces instead of tabs
- libcrmcommon: don't record pending notify actions as completed
- crmd: improve messages when a node is unexpectedly lost
- cib: improve shutdown messages
- cts-regression: allow specifying to run multiple tests again (bsc#1091360)
-------------------------------------------------------------------
Wed Apr 18 15:36:43 UTC 2018 - ygao@suse.com
- Update to version 1.1.18+20180417.24df451b5:
- alerts: Delete redundant code.
- liblrmd: cast time_t to long long when printing
- cts: separate dummy systemd service into separate files
* Drop obsolete fate-323526_pacemaker-tests-shebang-python3.patch
- crm_diff: rhbz#1561617 - Ignore attribute placement when comparing in 'cib' mode
- spec: remove reference to long-gone file
- spec: mark -cts & -doc packages as noarch
- spec: fix malformed conditional macros for systemd-less cases
- alerts: Change timestamp of Alert of snmp.
-------------------------------------------------------------------
Thu Apr 12 08:30:58 UTC 2018 - ygao@suse.com
- Update to version 1.1.18+20180411.2f77f4922:
- libcrmcommon: free signal triggers when cleaning up mainloop
- libcrmcommon: fix memory leak in schema workaround
- fencing: avoid memory leaks when freeing remote operation
- fencing: free dynamic memory at stonithd shutdown
- crmd: delete resource from lrmd when appropriate
- Test: rhbz#1565187 - Ensure failures that cause fencing are not removed until after fencing completes
- rhbz#1565187 - Ensure failures that cause fencing are not removed until after fencing completes
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 9 09:19:28 UTC 2018 - ygao@suse.com Mon Apr 9 09:19:28 UTC 2018 - ygao@suse.com
@ -33,7 +82,7 @@ Fri Apr 6 14:49:31 UTC 2018 - ygao@suse.com
- Update to version 1.1.18+20180406.18fe1cc2b: - Update to version 1.1.18+20180406.18fe1cc2b:
- XML: upgrade-2.10.xsl: add transform for automatic upgrades to latest schema - XML: upgrade-2.10.xsl: add transform for automatic upgrades to latest schema
- Log: establish correct character string literals also with qb_logt sink - Log: establish correct character string literals also with qb_logt sink
- pengine: fix swapped warning message arguments leading to segfault - pengine: fix swapped warning message arguments leading to segfault (bsc#1090538)
- cts-pengine: add regression test for notifications for unrunnable actions - cts-pengine: add regression test for notifications for unrunnable actions
- cts-pengine: update regression tests for notification changes - cts-pengine: update regression tests for notification changes
- rhbz#1545449 - Do not perform notifications for events we know wont be executed - rhbz#1545449 - Do not perform notifications for events we know wont be executed

29
pacemaker.spec
View File

@ -71,7 +71,7 @@
%endif %endif
Name: pacemaker Name: pacemaker
Version: 1.1.18+20180406.633845120 Version: 1.1.18+20180430.b12c320f5
Release: 0 Release: 0
Summary: Scalable High-Availability cluster resource manager Summary: Scalable High-Availability cluster resource manager
# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
@ -91,8 +91,7 @@ Patch5: pacemaker-Wno-format-signedness.patch
Patch6: bug-943295_pacemaker-lrmd-log-notice.patch Patch6: bug-943295_pacemaker-lrmd-log-notice.patch
Patch7: bug-977201_pacemaker-controld-self-fencing.patch Patch7: bug-977201_pacemaker-controld-self-fencing.patch
Patch8: bug-995365_pacemaker-cts-restart-systemd-journald.patch Patch8: bug-995365_pacemaker-cts-restart-systemd-journald.patch
Patch9: fate-323526_pacemaker-tests-shebang-python3.patch Patch9: pacemaker-cts-StartCmd.patch
Patch10: pacemaker-cts-StartCmd.patch
# Required for core functionality # Required for core functionality
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -114,7 +113,7 @@ BuildRequires: openssh
BuildRequires: procps BuildRequires: procps
%endif %endif
BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(corosync) BuildRequires: pkgconfig(corosync) >= 2.0.0
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(glib-2.0) >= 2.16 BuildRequires: pkgconfig(glib-2.0) >= 2.16
BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(gnutls)
@ -247,7 +246,7 @@ Requires: libpacemaker3 = %{version}-%{release}
Requires: libtool-ltdl-devel Requires: libtool-ltdl-devel
Requires: pkgconfig Requires: pkgconfig
Requires: pkgconfig(bzip2) Requires: pkgconfig(bzip2)
Requires: pkgconfig(corosync) Requires: pkgconfig(corosync) >= 2.0.0
Requires: pkgconfig(glib-2.0) Requires: pkgconfig(glib-2.0)
Requires: pkgconfig(libqb) Requires: pkgconfig(libqb)
Requires: pkgconfig(libxml-2.0) Requires: pkgconfig(libxml-2.0)
@ -275,6 +274,7 @@ Summary: Test framework for cluster-related technologies
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
Requires: libpacemaker3 = %{version}-%{release} Requires: libpacemaker3 = %{version}-%{release}
Requires: python3 Requires: python3
BuildArch: noarch
#Requires: python3-systemd #Requires: python3-systemd
Recommends: python3-systemd Recommends: python3-systemd
@ -285,6 +285,7 @@ Test framework for cluster-related technologies like Pacemaker
%package doc %package doc
Summary: Documentation for Pacemaker Summary: Documentation for Pacemaker
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
BuildArch: noarch
%description doc %description doc
Documentation for Pacemaker. Documentation for Pacemaker.
@ -304,11 +305,10 @@ manager.
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1
%build %build
export systemdunitdir=%{?_unitdir}%{?!_unitdir:no} export systemdunitdir=%{?_unitdir}%{!?_unitdir:no}
%if %{with hardening} %if %{with hardening}
# prefer distro-provided hardening flags in case they are defined # prefer distro-provided hardening flags in case they are defined
@ -353,7 +353,7 @@ make %{?_smp_mflags} all
%make_install %make_install
install -d -m755 %{buildroot}%{_fillupdir} install -d -m755 %{buildroot}%{_fillupdir}
install -m 644 mcp/pacemaker.sysconfig %{buildroot}%{_fillupdir}/sysconfig.pacemaker install -m 644 daemons/pacemakerd/pacemaker.sysconfig %{buildroot}%{_fillupdir}/sysconfig.pacemaker
install -m 644 tools/crm_mon.sysconfig %{buildroot}%{_fillupdir}/sysconfig.crm_mon install -m 644 tools/crm_mon.sysconfig %{buildroot}%{_fillupdir}/sysconfig.crm_mon
# These are not actually scripts # These are not actually scripts
@ -363,9 +363,6 @@ find %{buildroot} -name '*.xml' -type f -print0 | xargs -0 chmod a-x
find %{buildroot} -type f -name "*.a" -delete -print find %{buildroot} -type f -name "*.a" -delete -print
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
# Do not package these either
rm -f %{buildroot}/%{_libdir}/service_crm.so
# Don't ship init scripts for systemd based platforms # Don't ship init scripts for systemd based platforms
rm -f %{buildroot}/%{_initddir}/pacemaker rm -f %{buildroot}/%{_initddir}/pacemaker
rm -f %{buildroot}/%{_initddir}/pacemaker_remote rm -f %{buildroot}/%{_initddir}/pacemaker_remote
@ -439,6 +436,15 @@ fi
%postun cli %postun cli
%service_del_postun crm_mon.service %service_del_postun crm_mon.service
%post cts
%service_add_post pacemaker-cts-dummyd@.service
%preun cts
%service_del_preun pacemaker-cts-dummyd@.service
%postun cts
%service_del_postun pacemaker-cts-dummyd@.service
%pre -n libpacemaker3 %pre -n libpacemaker3
getent group %{gname} >/dev/null || groupadd -r %{gname} -g 189 getent group %{gname} >/dev/null || groupadd -r %{gname} -g 189
getent passwd %{uname} >/dev/null || useradd -r -g %{gname} -u 189 -s /sbin/nologin -c "cluster user" %{uname} getent passwd %{uname} >/dev/null || useradd -r -g %{gname} -u 189 -s /sbin/nologin -c "cluster user" %{uname}
@ -623,6 +629,7 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%{python3_sitelib}/cts %{python3_sitelib}/cts
%{_datadir}/pacemaker/tests %{_datadir}/pacemaker/tests
%{_unitdir}/pacemaker-cts-dummyd@.service
#%license licenses/GPLv2 #%license licenses/GPLv2
%doc COPYING ChangeLog %doc COPYING ChangeLog