[pacemaker/f13/master] Latest 1.1 release from upstream
Andrew Beekhof
beekhof at fedoraproject.org
Thu Sep 23 06:38:02 UTC 2010
commit 779495a4aa12beb83c7134fe9f532b06cbb5f973
Author: Andrew Beekhof <andrew at beekhof.net>
Date: Thu Sep 23 08:37:37 2010 +0200
Latest 1.1 release from upstream
pacemaker.spec | 139 ++++++++++++++++++++++++++++++++++++++++++++++----------
sources | 2 +-
2 files changed, 115 insertions(+), 26 deletions(-)
---
diff --git a/pacemaker.spec b/pacemaker.spec
index 7022a7e..2089e9e 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -3,6 +3,7 @@
%global pcmk_docdir %{_docdir}/%{name}
# Supported cluster stacks, must support at least one
+%bcond_with cman
%bcond_without ais
%bcond_without heartbeat
@@ -16,8 +17,8 @@
# We generate some docs using Publican, but its not available everywhere
%bcond_without publican
-%global specversion 2
-%global upstream_version Pacemaker-1.1.2
+%global specversion 1
+%global upstream_version 3f04d59d464c
%global upstream_prefix Pacemaker-1-1-
# Keep around for when/if required
@@ -27,26 +28,20 @@
# Compatibility macros for distros that don't provide Python macros by default.
# Do this instead of trying to conditionally include
-# %{_rpmconfigdir}/macros.python which doesn't always exist
+# {_rpmconfigdir}/macros.python which doesn't always exist
%{!?py_ver: %{expand: %%global py_ver %%(echo `python -c "import sys; print sys.version[:3]"`)}}
%{!?py_prefix: %{expand: %%global py_prefix %%(echo `python -c "import sys; print sys.prefix"`)}}
-%{!?py_libdir: %{expand: %%global py_libdir %%{expand:%%%%{py_prefix}/lib/python%%%%{py_ver}}}}
+%{!?py_libdir: %{expand: %%global py_libdir %%{expand:%%%%{py_prefix}/%%%%{_lib}/python%%%%{py_ver}}}}
%{!?py_sitedir: %{expand: %%global py_sitedir %%{expand:%%%%{py_libdir}/site-packages}}}
-# When downloading directly from Mercurial, it will automatically add a prefix
-# Invoking 'hg archive' wont but you can add one with:
-# hg archive -t tgz -p "$upstream_prefix-$upstream_version" -r $upstream_version $upstream_version.tar.gz
-
Name: pacemaker
Summary: Scalable High-Availability cluster resource manager
-Version: 1.1.2
+Version: 1.1.3
Release: %{pcmk_release}
License: GPLv2+ and LGPLv2+
Url: http://www.clusterlabs.org
Group: System Environment/Daemons
Source0: http://hg.clusterlabs.org/pacemaker/1.1/archive/%{upstream_version}.tar.bz2
-Patch1: bug-lf-2401.patch
-Patch2: doc-validation.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
AutoReqProv: on
Requires(pre): cluster-glue
@@ -74,13 +69,19 @@ Requires: net-snmp >= 5.4
BuildRequires: corosynclib-devel
%endif
+%if %{with cman}
+BuildRequires: clusterlib-devel
+%endif
+
%if %{with heartbeat}
BuildRequires: heartbeat-devel heartbeat-libs
%endif
%if %{with publican}
+%ifarch i386 x86_64
BuildRequires: publican
%endif
+%endif
%description
Pacemaker is an advanced, scalable High-Availability cluster resource
@@ -165,20 +166,20 @@ resource health.
%prep
%setup -q -n %{upstream_prefix}%{upstream_version}
-%patch1 -p1
-%patch2 -p0
%build
./autogen.sh
%{configure} \
%{?_without_heartbeat} \
%{?_without_ais} \
+ %{?_with_cman} \
%{?_without_esmtp} \
%{?_without_snmp} \
- --disable-ansi \
--docdir=%{pcmk_docdir} \
--localstatedir=%{_var} \
- --enable-fatal-warnings=no
+ --with-initdir=%{_initddir} \
+ --enable-fatal-warnings=no \
+ --disable-ansi
make %{_smp_mflags}
@@ -186,6 +187,9 @@ make %{_smp_mflags}
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
+install -m 644 mcp/pacemaker.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/pacemaker
+
# Scripts that need should be executable
chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/CTSlab.py
chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/extracttests.py
@@ -201,8 +205,8 @@ find %{buildroot} -name '*.a' -type f -print0 | xargs -0 rm -f
find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f
# Don't package these either
-rm -f %{buildroot}/%{_libdir}/heartbeat/hb2openais-helper.py
-rm -f %{buildroot}/%{_libdir}/heartbeat/crm_primitive.py
+rm -f %{buildroot}/%{_libdir}/heartbeat/hb2openais-helper.*
+rm -f %{buildroot}/%{_libdir}/heartbeat/crm_primitive.*
rm -f %{buildroot}/%{_libdir}/service_crm.so
rm -f %{buildroot}/usr/lib/ocf/resource.d/pacemaker/pingd
@@ -219,6 +223,10 @@ rm -rf %{buildroot}
%exclude %{_datadir}/pacemaker/tests
+%config(noreplace) %{_sysconfdir}/sysconfig/pacemaker
+%{_initddir}/pacemaker
+%{_sbindir}/pacemakerd
+
%{_datadir}/pacemaker
%{_datadir}/snmp/mibs/PCMK-MIB.txt
%{_libdir}/heartbeat/*
@@ -244,7 +252,6 @@ rm -rf %{buildroot}
%{_sbindir}/fence_legacy
%{_sbindir}/stonith_admin
%{py_sitedir}/crm
-#%{_mandir}/man8/*.8*
%{_mandir}
%if %{with heartbeat}
@@ -303,13 +310,94 @@ rm -rf %{buildroot}
%doc AUTHORS
%changelog
+* Thu Sep 21 2010 Andrew Beekhof <andrew at beekhof.net> - 1.1.3-1
+- publican is only available as a dependancy on i386/x86_64 machines
+- Upstream release of 1.1.3
+ + High: Resolve coverity RESOURCE_LEAK defects
+ + High: ais: Bug lf2401 - Improved processing when the peer crmd processes join/leave
+ + High: ais: fix list of active processes sent to clients (bnc#603685)
+ + High: ais: Move the code for finding uid before the fork so that the child does no logging
+ + High: ais: Resolve coverity CONSTANT_EXPRESSION_RESULT defects
+ + High: cib: Also free query result for xpath operations that return more than one hit
+ + High: cib: Attempt to resolve memory corruption when forking a child to write the cib to disk
+ + High: cib: Correctly free memory when writing out the cib to disk
+ + High: cib: Fix the application of unversioned diffs
+ + High: cib: Remove old developmental error logging
+ + High: cib: Restructure the 'valid peer' check for deciding which instructions to ignore
+ + High: Core: Bug lf#2401 - Backed out changeset 6e6980376f01
+ + High: Core: Correctly unpack HA_Messages containing multiple entries with the same name
+ + High: Core: crm_count_member() should only track nodes that have the full stack up
+ + High: Core: New developmental logging system inspired by the kernel and a PoC from Lars Ellenberg
+ + High: crmd: All nodes should see status updates, not just he DC
+ + High: crmd: Allow non-DC nodes to clear failcounts too
+ + High: crmd: Base DC election on process relative uptime
+ + High: crmd: Bug lf#2439 - cancel_op() can also return HA_RSCBUSY
+ + High: crmd: Bug lf#2439 - Handle asynchronous notification of resource deletion events
+ + High: crmd: Fix assertion failure when performing async resource failures
+ + High: crmd: Fix handling of async resource deletion results
+ + High: crmd: Include the action for crm graph operations
+ + High: crmd: Make sure the membership cache is accurate after a sucessful fencing operation
+ + High: crmd: Make sure we always poke the FSA after a transition to clear any TE_HALT actions
+ + High: crmd: Offer crm-level membership once the peer starts the crmd process
+ + High: crmd: Only need to request quorum update for plugin based clusters
+ + High: crmd: Prevent everyone from loosing DC elections by correctly initializing all relevant variables
+ + High: crmd: Prevent segmentation fault
+ + High: crmd: several fixes for async resource delete
+ + High: crmd: Use the correct define/size for lrm resource IDs
+ + High: crmd: Bug lf#2458 - Ensure stop actions always have the relevant resource attributes
+ + High: crmd: Ensure we activate the DC timer if we detect an alternate DC
+ + High: mcp: Add missing headers when built without heartbeat support
+ + High: mcp: New master control process for (re)spawning pacemaker daemons
+ + High: mcp: Correctly initialize the string containing the list of active daemons
+ + High: mcp: Fix the expansion of the pid file in the init script
+ + High: mcp: Tell chkconfig we need to shut down early on
+ + High: mcp: Support starting plugin-based Pacemaker clusters with the MCP as well
+ + High: PE: Bug lf#2476 - Repair on-fail=block for groups and primitive resources
+ + High: PE: Do not demote resources because something that requires it can't run
+ + High: PE: Rewrite the ordering constraint logic to be simplicity, clarity and maintainability
+ + High: PE: Wait until stonith is available, don't fall back to shutdown for nodes requesting termination
+ + High: PE: Prevent segfault by ensuring the arguments to do_calculations() are initialized
+ + High: PE: Avoid creating invalid ordering constraints for probes that are not needed
+ + High: PE: Bug lf#1959 - Fail unmanaged resources should not prevent other services from shutting down
+ + High: PE: Bug lf#2422 - Ordering dependencies on partially active groups not observed properly
+ + High: PE: Bug lf#2424 - Use notify oepration definition if it exists in the configuration
+ + High: PE: Bug lf#2433 - No services should be stopped until probes finish
+ + High: PE: Bug lf#2453 - Enforce clone ordering in the absense of colocation constraints
+ + High: PE: Correctly detect when there is a real failcount that expired and needs to be cleared
+ + High: PE: Correctly handle pseudo action creation
+ + High: PE: Correctly order clone startup after group/clone start
+ + High: PE: Fix colocation for interleaved clones
+ + High: PE: Fix colocation with partially active groups
+ + High: PE: Fix potential use-after-free defect from coverity
+ + High: PE: Fix previous merge
+ + High: PE: Fix use-after-free in order_actions() reported by valgrind
+ + High: PE: Prevent endless loop when looking for operation definitions in the configuration
+ + High: Shell: Complete the transition to using crm_attribute instead of crm_failcount and crm_standby
+ + High: stonith: Advertise stonith-ng options in the metadata
+ + High: stonith: Correctly parse pcmk_host_list parameters that appear on a single line
+ + High: stonith: Map poweron/poweroff back to on/off expected by the stonith tool from cluster-glue
+ + High: stonith: pass the configuration to the stonith program via environment variables (bnc#620781)
+ + High: stonith: Bug lf#2461 - Prevent segfault by not looking up operations if the hashtable hasn't been initialized yet
+ + High: Stonith: Bug lf#2473 - Ensure stonith operations complete within the timeout and are terminated if they run too long
+ + High: stonith: Bug lf#2473 - Gracefully handle remote operations that arrive late (after we've done notifications)
+ + High: stonith: Bug lf#2473 - Add the timeout at the top level where the daemon is looking for it
+ + High: stonith: Bug lf#2473 - Ensure timeouts are included for fencing operations
+ + High: Stonith: Use the timeout specified by the user
+ + High: Tools: Bug lf#2456 - Fix assertion failure in crm_resource
+ + High: tools: crm_report - corosync.conf wont necessarily contain the text 'pacemaker' anymore
+ + High: tools: crm_simulate - Resolve coverity USE_AFTER_FREE defect
+ + High: Tools: Drop the 'pingd' daemon and resource agent in favor of ocf:pacemaker:ping
+ + High: Tools: Fix recently introduced use-of-NULL
+ + High: Tools: Fix use-after-free defect from coverity
* Fri Jun 11 2010 Andrew Beekhof <andrew at beekhof.net> - 1.1.2-2
- Resolves rhbz#602239 - Added patch to documentation so that it passes validation
- High: Core: Bug lf#2401 - Backed out changeset 6e6980376f01
* Thu May 12 2010 Andrew Beekhof <andrew at beekhof.net> - 1.1.2-1
-- Update the tarball from upstream to version 1.1.2
+- Update the tarball from the upstream 1.1.2 release
+ + High: ais: Bug rhbz#525552 - Move non-threadsafe calls to setenv() to after the fork()
+ + High: ais: Do not count votes from offline nodes and calculate current votes before sending quorum data
+ High: ais: Ensure the list of active processes sent to clients is always up-to-date
+ High: ais: Fix previous commit, actually return a result in get_process_list()
+ High: ais: Fix two more uses of getpwnam() in non-thread-safe locations
@@ -321,7 +409,8 @@ rm -rf %{buildroot}
+ High: Core: Fix memory leak in replace_xml_child() reported by valgrind
+ High: Core: fix memory leaks exposed by valgrind
+ High: crmd: Bug 2401 - Improved detection of partially active peers
- + High: crmd: Bug lf#2379 - Ensure the cluster terminates when the PE isn't available
+ + High: crmd: Bug bnc#578644 - Improve handling of cancelled operations caused by resource cleanup
+ + High: crmd: Bug lf#2379 - Ensure the cluster terminates when the PE is not available
+ High: crmd: Bug lf#2414 - Prevent use-after-free of the PE connection after it dies
+ High: crmd: Bug lf#2414 - Prevent use-after-free of the stonith-ng connection
+ High: crmd: Do not allow the target_rc to be misused by resource agents
@@ -335,7 +424,7 @@ rm -rf %{buildroot}
+ High: PE: Bug lf#2384 - Fix intra-set colocation and ordering
+ High: PE: Bug lf#2403 - Enforce mandatory promotion (colocation) constraints
+ High: PE: Bug lf#2412 - Correctly locate clone instances by their prefix
- + High: PE: Don't be so quick to pull the trigger on nodes that are coming up
+ + High: PE: Do not be so quick to pull the trigger on nodes that are coming up
+ High: PE: Fix memory leaks exposed by valgrind
+ High: PE: Fix memory leaks reported by valgrind
+ High: PE: Rewrite native_merge_weights() to avoid Fix use-after-free
@@ -382,7 +471,7 @@ rm -rf %{buildroot}
* Thu Oct 29 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-4
- Include the fixes from CoroSync integration testing
-- Move the resource templates - they're not documentation
+- Move the resource templates - they are not documentation
- Ensure documentation is placed in a standard location
- Exclude documentation that is included elsewhere in the package
@@ -400,9 +489,9 @@ rm -rf %{buildroot}
+ High: Core: Bug lf#2169 - Allow dtd/schema validation to be disabled
+ High: PE: Bug lf#2106 - Not all anonymous clone children are restarted after configuration change
+ High: PE: Bug lf#2170 - stop-all-resources option had no effect
- + High: PE: Bug lf#2171 - Prevent groups from starting if they depend on a complex resource which can't
+ + High: PE: Bug lf#2171 - Prevent groups from starting if they depend on a complex resource which cannot
+ High: PE: Disable resource management if stonith-enabled=true and no stonith resources are defined
- + High: PE: Don't include master score if it would prevent allocation
+ + High: PE: Do not include master score if it would prevent allocation
+ High: ais: Avoid excessive load by checking for dead children every 1s (instead of 100ms)
+ High: ais: Bug rh#525589 - Prevent shutdown deadlocks when running on CoroSync
+ High: ais: Gracefully handle changes to the AIS nodeid
@@ -414,7 +503,7 @@ rm -rf %{buildroot}
+ Medium: PE: Bug lf#2178 - Indicate unmanaged clones
+ Medium: PE: Bug lf#2180 - Include node information for all failed ops
+ Medium: PE: Bug lf#2189 - Incorrect error message when unpacking simple ordering constraint
- + Medium: PE: Correctly log resources that would like to start but can't
+ + Medium: PE: Correctly log resources that would like to start but cannot
+ Medium: PE: Stop ptest from logging to syslog
+ Medium: ais: Include version details in plugin name
+ Medium: crmd: Requery the resource metadata after every start operation
diff --git a/sources b/sources
index 9823f4e..828ba6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d8c879cdbe6e98228f23a54e380cfa2 Pacemaker-1.1.2.tar.bz2
+0009f32bd192a66f0f3a664fa4556c81 3f04d59d464c.tar.bz2
More information about the scm-commits
mailing list