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

Accepting request 337426 from network:ha-clustering:Factory

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/337426
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pacemaker?expand=0&rev=95
This commit is contained in:
Stephan Kulow 2015-10-17 14:38:37 +00:00 committed by Git OBS Bridge
commit 1be95c70d5
8 changed files with 126 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -11,7 +11,7 @@
<param name="version">1.1.13</param> <param name="version">1.1.13</param>
--> -->
<param name="versionformat">1.1.13+git%cd.%h</param> <param name="versionformat">1.1.13+git%cd.%h</param>
<param name="revision">20c2178f076ff32fdf9ba9a467c193b8dac2f9e5</param> <param name="revision">7906df92a713052db1edae851579ea229d8a5393</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">

19
bug-946332_pacemaker-resource-agent-remote-message.patch
View File

@ -1,19 +0,0 @@
commit 2e2fb279198bdcbf3a66ba6bf0d84cd491e99f41
Author: Gao,Yan <ygao@suse.com>
Date: Wed Sep 16 16:24:03 2015 +0200
Fix: remote: Revise a misleading message in the ocf:pacemaker:remote resource agent
diff --git a/extra/resources/remote b/extra/resources/remote
index 91cd07f..447267e 100644
--- a/extra/resources/remote
+++ b/extra/resources/remote
@@ -98,7 +98,7 @@ END
}
remote_unsupported() {
- ocf_log info "This pacemaker version does not support the ocf:pacemaker:remote agent"
+ ocf_log info "The ocf:pacemaker:remote agent should not be directly invoked except for meta-data action"
return $OCF_ERR_GENERIC
}

19
bug-946332_pacemaker-resource-agent-remote-usage.patch
View File

@ -1,19 +0,0 @@
commit 7e36e37a855e0723a0ea28e5905c2b3f2b76d28a
Author: Gao,Yan <ygao@suse.com>
Date: Wed Sep 16 16:20:00 2015 +0200
Fix: remote: Correctly display the usage of the ocf:pacemaker:remote resource agent
diff --git a/extra/resources/remote b/extra/resources/remote
index c481863..91cd07f 100644
--- a/extra/resources/remote
+++ b/extra/resources/remote
@@ -116,7 +116,7 @@ validate-all) remote_unsupported;;
usage|help) remote_usage
exit $OCF_SUCCESS
;;
-*) dummy_usage
+*) remote_usage
exit $OCF_ERR_UNIMPLEMENTED
;;
esac

26
bug-949441_pacemaker-fencing-provider-internal.patch Normal file
View File

@ -0,0 +1,26 @@
commit 61835593b43a5e0d29287f24fa5500f950b2bf6b
Author: Gao,Yan <ygao@suse.com>
Date: Mon Oct 5 17:44:13 2015 +0200
Fix: fencing: Return a provider for the internal fencing agent "#watchdog" instead of logging an error
diff --git a/lib/fencing/st_client.c b/lib/fencing/st_client.c
index b8f3967..b9fef3e 100644
--- a/lib/fencing/st_client.c
+++ b/lib/fencing/st_client.c
@@ -1499,8 +1499,13 @@ get_stonith_provider(const char *agent, const char *provider)
#endif
}
- crm_err("No such device: %s", agent);
- return NULL;
+ if (safe_str_eq(provider, "internal")) {
+ return provider;
+
+ } else {
+ crm_err("No such device: %s", agent);
+ return NULL;
+ }
}
static gint

3
pacemaker-1.1.13+git20150917.20c2178.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4fa1e980e3e0fbdf1f3d5fa33dadb4f81b1ad1c5ed5f269b05cdeec682e7cfdf
size 3754766

3
pacemaker-1.1.13+git20151008.7906df9.tar.bz2 Normal file
View File

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

54
pacemaker.changes
View File

@ -1,3 +1,55 @@
-------------------------------------------------------------------
Thu Oct 8 10:31:45 UTC 2015 - ygao@suse.com
- fencing: Return a provider for the internal fencing agent "#watchdog" instead of logging an error (bsc#949441)
* bug-949441_pacemaker-fencing-provider-internal.patch
- spec: Move the normal resource agents into pacemaker-cli package (bsc#947197)
- spec: Move logrotate configuration file into pacemaker-cli package (bsc#947197)
- spec: Move attrd_updater, crm_attribute and crm_master into pacemaker-cli package (bsc#947197)
- spec: Move xml schema files and PCMK-MIB.txt into pacemaker-cli package (bsc#947197)
-------------------------------------------------------------------
Thu Oct 8 10:29:54 UTC 2015 - ygao@suse.com
- crm_resource: Correctly observe --force when deleting and updating attributes (bsc#948197)
- crm_resource: Correctly delete existing meta attributes regardless of their position in the heirarchy (bsc#948197)
- fencing,libfencing: use level tag consistently in internal XML
- crm_resource: Correctly update existing meta attributes regardless of their position in the heirarchy (bsc#948197)
- crmd: properly detect CIB update failures for remote nodes
- cibadmin: Prevent potential use-of-NULL in print_xml_output() (bsc#947180)
- Fencing: The device list is expected to be comma separated
- Tools: Do not send command lines to syslog
- Tools: Repair the logging of 'interesting' command-lines
- PE: resolve memory leak
- libfencing: make topology level removal compatible with latest stonithd API
- fencing: parse from correct XML location when registering/unregistering topology
- tools: improve error handling when modifying configuration
- crmd,libcrmcommon,libservices,tools: potential memory leaks (bsc#948197)
- crmd,fencing: avoid potential null dereference in string searches
- typo: OPSTIONS -> OPTIONS in crm_mon.sysconfig
- cib: Check if the configuration changes with cib_config_changed() only for v1 diffs (bsc#946224)
- liblrmd: don't print error if remote key environment variable unset
- libcib: properly handle temporary file
- libcrmcommon: better validation of environment variable value
- crmd: avoid potential null dereference
- libcib: potential user input overflow
- controld: replace bashism
- PE: drop probe_complete actions
- PE: Allow resources to start and stop as soon as their state is known on all nodes
- Fencing: Correctly construct simple topologies with stonith_admin
- Fencing: Correctly remove topologies and detect invalid entries
- remote: Revise a misleading message in the ocf:pacemaker:remote resource agent (bsc#946332)
* Drop bug-946332_pacemaker-resource-agent-remote-message.patch which has been merged upstream
- remote: Correctly display the usage of the ocf:pacemaker:remote resource agent (bsc#946332)
* Drop bug-946332_pacemaker-resource-agent-remote-usage.patch which has been merged upstream
- libcib: find_nvpair_attr_delegate: check buffer overflow
- libcib: find_nvpair_attr_delegate: check alloc failure
- Upstream version cs: 7906df92a713052db1edae851579ea229d8a5393
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 18 08:22:19 UTC 2015 - ygao@suse.com Fri Sep 18 08:22:19 UTC 2015 - ygao@suse.com
@ -34,7 +86,7 @@ Wed Sep 9 13:24:17 UTC 2015 - ygao@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 28 11:49:26 UTC 2015 - ygao@suse.com Fri Aug 28 11:49:26 UTC 2015 - ygao@suse.com
- services: Reduce severity of noisy log messages - services: Reduce severity of noisy log messages (bsc#943319)
- xml: Mark xml nodes as dirty if any children move (bsc#942382) - xml: Mark xml nodes as dirty if any children move (bsc#942382)
- pengine: The failed action of the resource that occurred in shutdown is not displayed. - pengine: The failed action of the resource that occurred in shutdown is not displayed.
- tools: memory leak in crm_resource - tools: memory leak in crm_resource

80
pacemaker.spec
View File

@ -21,8 +21,9 @@
%global pcmk_docdir %{_docdir}/%{name} %global pcmk_docdir %{_docdir}/%{name}
%global specversion 1 %global specversion 1
%global upstream_version HEAD %global commit HEAD
%global upstream_prefix ClusterLabs-pacemaker %global shortcommit %(c=%{commit}; echo ${c:0:7})
%global github_owner ClusterLabs
# Turn off the auto compilation of python files not in the site-packages directory # Turn off the auto compilation of python files not in the site-packages directory
# Needed so that the -devel package is multilib compliant # Needed so that the -devel package is multilib compliant
@ -68,7 +69,7 @@
%endif %endif
%if %{with pre_release} %if %{with pre_release}
%global pcmk_release 0.%{specversion}.%{upstream_version}.git %global pcmk_release 0.%{specversion}.%{shortcommit}.git
%else %else
%global pcmk_release %{specversion} %global pcmk_release %{specversion}
%endif %endif
@ -99,13 +100,12 @@ Name: pacemaker
Summary: Scalable High-Availability cluster resource manager Summary: Scalable High-Availability cluster resource manager
License: GPL-2.0+ and LGPL-2.1+ License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
Version: 1.1.13+git20150917.20c2178 Version: 1.1.13+git20151008.7906df9
Release: 0 Release: 0
#Release: %{pcmk_release}%{?dist} #Release: %{pcmk_release}%{?dist}
Url: http://www.clusterlabs.org Url: http://www.clusterlabs.org
# export VER={upstream_version} #Source0: https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
# wget --no-check-certificate -O ClusterLabs-pacemaker-${VER}.tar.gz https://github.com/ClusterLabs/pacemaker/tarball/${VER}
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
Source100: pacemaker.rpmlintrc Source100: pacemaker.rpmlintrc
Patch1: bug-806256_pacemaker-log-level-notice.patch Patch1: bug-806256_pacemaker-log-level-notice.patch
@ -116,8 +116,7 @@ Patch5: pacemaker-nagios-plugin-dir.patch
Patch6: bug-812269_pacemaker-fencing-device-register-messages.patch Patch6: bug-812269_pacemaker-fencing-device-register-messages.patch
Patch7: pacemaker-Wno-format-signedness.patch Patch7: pacemaker-Wno-format-signedness.patch
Patch8: bug-943295_pacemaker-lrmd-log-notice.patch Patch8: bug-943295_pacemaker-lrmd-log-notice.patch
Patch9: bug-946332_pacemaker-resource-agent-remote-usage.patch Patch9: bug-949441_pacemaker-fencing-provider-internal.patch
Patch10: bug-946332_pacemaker-resource-agent-remote-message.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: pacemaker-ticket-support = 2.0 Provides: pacemaker-ticket-support = 2.0
Conflicts: heartbeat < 3.0 Conflicts: heartbeat < 3.0
@ -141,14 +140,14 @@ Suggests: graphviz
%endif %endif
%if 0%{?rhel} > 0 %if 0%{?rhel} > 0
ExclusiveArch: i686 x86_64 ExclusiveArch: i386 i686 x86_64
%endif %endif
# Required for core functionality # Required for core functionality
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: glib2-devel BuildRequires: pkgconfig(glib-2.0)
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: libbz2-devel BuildRequires: libbz2-devel
@ -176,7 +175,7 @@ Requires: libqb > 0.11.0
# Enables optional functionality # Enables optional functionality
BuildRequires: bison BuildRequires: bison
#BuildRequires: byacc #BuildRequires: byacc
BuildRequires: dbus-1-devel BuildRequires: pkgconfig(dbus-1)
%if 0%{?suse_version} > 1100 %if 0%{?suse_version} > 1100
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
@ -390,7 +389,7 @@ manager for Corosync, CMAN and/or Linux-HA.
%endif %endif
%prep %prep
#%setup -q -n %{name}%{upstream_prefix}-%{upstream_version} #%setup -q -n %{name}-%{commit}
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
@ -401,7 +400,6 @@ manager for Corosync, CMAN and/or Linux-HA.
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1
# Force the local time # Force the local time
# #
@ -480,7 +478,7 @@ find %{buildroot} -name '*.xsl' -type f -print0 | xargs -0 chmod a-x
find %{buildroot} -name '*.rng' -type f -print0 | xargs -0 chmod a-x find %{buildroot} -name '*.rng' -type f -print0 | xargs -0 chmod a-x
find %{buildroot} -name '*.dtd' -type f -print0 | xargs -0 chmod a-x find %{buildroot} -name '*.dtd' -type f -print0 | xargs -0 chmod a-x
# Dont package static libs # Don't package static libs
find %{buildroot} -name '*.a' -type f -print0 | xargs -0 rm -f find %{buildroot} -name '*.a' -type f -print0 | xargs -0 rm -f
find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f
@ -628,10 +626,7 @@ fi
########################################################### ###########################################################
%defattr(-,root,root) %defattr(-,root,root)
%exclude %{_datadir}/pacemaker/tests
#%config(noreplace) %{_sysconfdir}/sysconfig/pacemaker #%config(noreplace) %{_sysconfdir}/sysconfig/pacemaker
%config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker
%{_sbindir}/pacemakerd %{_sbindir}/pacemakerd
%if %{defined _unitdir} %if %{defined _unitdir}
@ -641,28 +636,20 @@ fi
%{_initrddir}/pacemaker %{_initrddir}/pacemaker
%endif %endif
%exclude %{_datadir}/pacemaker/report.common
%exclude %{_datadir}/pacemaker/report.collector
%{_datadir}/pacemaker
%{_datadir}/snmp/mibs/PCMK-MIB.txt
%exclude %{_libexecdir}/pacemaker/lrmd_test %exclude %{_libexecdir}/pacemaker/lrmd_test
%exclude %{_sbindir}/pacemaker_remoted %exclude %{_sbindir}/pacemaker_remoted
%dir %{_libexecdir}/pacemaker %dir %{_libexecdir}/pacemaker
%{_libexecdir}/pacemaker/* %{_libexecdir}/pacemaker/*
%{_sbindir}/crm_attribute
%{_sbindir}/crm_master
%{_sbindir}/crm_node %{_sbindir}/crm_node
%{_sbindir}/attrd_updater
%{_sbindir}/fence_legacy %{_sbindir}/fence_legacy
%{_sbindir}/fence_pcmk %{_sbindir}/fence_pcmk
%{_sbindir}/stonith_admin %{_sbindir}/stonith_admin
%doc %{_mandir}/man7/* %doc %{_mandir}/man7/ocf_pacemaker_controld.*
%doc %{_mandir}/man8/attrd_updater.* %doc %{_mandir}/man7/ocf_pacemaker_o2cb.*
%doc %{_mandir}/man8/crm_attribute.* %doc %{_mandir}/man7/ocf_pacemaker_remote.*
%doc %{_mandir}/man8/crm_node.* %doc %{_mandir}/man8/crm_node.*
%doc %{_mandir}/man8/crm_master.*
%doc %{_mandir}/man8/fence_pcmk.* %doc %{_mandir}/man8/fence_pcmk.*
%doc %{_mandir}/man8/fence_legacy.* %doc %{_mandir}/man8/fence_legacy.*
%doc %{_mandir}/man8/pacemakerd.* %doc %{_mandir}/man8/pacemakerd.*
@ -677,14 +664,16 @@ fi
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cores %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cores
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/pengine %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/pengine
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/blackbox %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/blackbox
%dir /usr/lib/ocf /usr/lib/ocf/resource.d/pacemaker/controld
%dir /usr/lib/ocf/resource.d /usr/lib/ocf/resource.d/pacemaker/o2cb
/usr/lib/ocf/resource.d/pacemaker /usr/lib/ocf/resource.d/pacemaker/remote
/usr/lib/ocf/resource.d/.isolation /usr/lib/ocf/resource.d/.isolation
%if "%{?cs_version}" != "UNKNOWN"
%if 0%{?cs_version} < 2 %if 0%{?cs_version} < 2
%{_libexecdir}/lcrso/pacemaker.lcrso %{_libexecdir}/lcrso/pacemaker.lcrso
%endif %endif
%endif
%if %{with upstart_job} %if %{with upstart_job}
%config(noreplace) %{_sysconfdir}/init/pacemaker.conf %config(noreplace) %{_sysconfdir}/init/pacemaker.conf
@ -694,6 +683,9 @@ fi
%files cli %files cli
%defattr(-,root,root) %defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker
#%config(noreplace) %{_sysconfdir}/sysconfig/crm_mon
%if %{defined _unitdir} %if %{defined _unitdir}
%{_unitdir}/crm_mon.service %{_unitdir}/crm_mon.service
%{_sbindir}/rccrm_mon %{_sbindir}/rccrm_mon
@ -703,10 +695,13 @@ fi
%config(noreplace) %{_sysconfdir}/init/crm_mon.conf %config(noreplace) %{_sysconfdir}/init/crm_mon.conf
%endif %endif
%{_sbindir}/attrd_updater
%{_sbindir}/cibadmin %{_sbindir}/cibadmin
%{_sbindir}/crm_attribute
%{_sbindir}/crm_diff %{_sbindir}/crm_diff
%{_sbindir}/crm_error %{_sbindir}/crm_error
%{_sbindir}/crm_failcount %{_sbindir}/crm_failcount
%{_sbindir}/crm_master
%{_sbindir}/crm_mon %{_sbindir}/crm_mon
%{_sbindir}/crm_resource %{_sbindir}/crm_resource
%{_sbindir}/crm_standby %{_sbindir}/crm_standby
@ -717,14 +712,26 @@ fi
%{_sbindir}/crm_simulate %{_sbindir}/crm_simulate
%{_sbindir}/crm_report %{_sbindir}/crm_report
%{_sbindir}/crm_ticket %{_sbindir}/crm_ticket
%{_datadir}/pacemaker/report.common %exclude %{_datadir}/pacemaker/tests
%{_datadir}/pacemaker/report.collector %{_datadir}/pacemaker
%{_datadir}/snmp/mibs/PCMK-MIB.txt
%exclude /usr/lib/ocf/resource.d/pacemaker/controld
%exclude /usr/lib/ocf/resource.d/pacemaker/o2cb
%exclude /usr/lib/ocf/resource.d/pacemaker/remote
%dir /usr/lib/ocf
%dir /usr/lib/ocf/resource.d
/usr/lib/ocf/resource.d/pacemaker
%config(noreplace) /var/adm/fillup-templates/sysconfig.pacemaker
%config(noreplace) /var/adm/fillup-templates/sysconfig.crm_mon %config(noreplace) /var/adm/fillup-templates/sysconfig.crm_mon
%doc %{_mandir}/man7/*
%exclude %{_mandir}/man7/ocf_pacemaker_controld.*
%exclude %{_mandir}/man7/ocf_pacemaker_o2cb.*
%exclude %{_mandir}/man7/ocf_pacemaker_remote.*
%doc %{_mandir}/man8/* %doc %{_mandir}/man8/*
%exclude %{_mandir}/man8/attrd_updater.*
%exclude %{_mandir}/man8/crm_attribute.*
%exclude %{_mandir}/man8/crm_node.* %exclude %{_mandir}/man8/crm_node.*
%exclude %{_mandir}/man8/crm_master.*
%exclude %{_mandir}/man8/fence_pcmk.* %exclude %{_mandir}/man8/fence_pcmk.*
%exclude %{_mandir}/man8/fence_legacy.* %exclude %{_mandir}/man8/fence_legacy.*
%exclude %{_mandir}/man8/pacemakerd.* %exclude %{_mandir}/man8/pacemakerd.*
@ -747,7 +754,6 @@ fi
%{_libdir}/libpengine.so.* %{_libdir}/libpengine.so.*
%{_libdir}/libstonithd.so.* %{_libdir}/libstonithd.so.*
%{_libdir}/libtransitioner.so.* %{_libdir}/libtransitioner.so.*
%config(noreplace) /var/adm/fillup-templates/sysconfig.pacemaker
%doc COPYING.LIB %doc COPYING.LIB
%doc AUTHORS %doc AUTHORS
%{_libdir}/libcrmcluster.so.* %{_libdir}/libcrmcluster.so.*