diff --git a/heartbeat-doc-1.0.tar.gz b/heartbeat-doc-1.0.tar.gz index 83a6e97..0699e65 100644 --- a/heartbeat-doc-1.0.tar.gz +++ b/heartbeat-doc-1.0.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f38628315b4d67f63b5ad17fdd9ec8e5ceca6a49256b5eb6027db2d6b56f454 -size 630905 +oid sha256:62df9af04a95863ae59a8ea998e20c4e7b61ebaa23f199bd4193c58001e7dc48 +size 642010 diff --git a/pacemaker-cts-startcmd.patch b/pacemaker-cts-startcmd.patch new file mode 100644 index 0000000..ecacb49 --- /dev/null +++ b/pacemaker-cts-startcmd.patch @@ -0,0 +1,14 @@ +diff -r 93114fbc53ea cts/CM_ais.py +--- a/cts/CM_ais.py Tue Mar 09 20:00:05 2010 +0100 ++++ b/cts/CM_ais.py Tue Mar 09 22:27:19 2010 +0100 +@@ -242,8 +242,8 @@ + + self.update({ + "Name" : "crm-flatiron", +- "StartCmd" : CTSvars.INITDIR+"/corosync start", +- "StopCmd" : CTSvars.INITDIR+"/corosync stop", ++ "StartCmd" : CTSvars.INITDIR+"/openais start", ++ "StopCmd" : CTSvars.INITDIR+"/openais stop", + + # The next pattern is too early + # "Pat:We_stopped" : "%s.*Service engine unloaded: Pacemaker Cluster Manager", diff --git a/pacemaker-pyexecdir.patch b/pacemaker-pyexecdir.patch new file mode 100644 index 0000000..a870c3b --- /dev/null +++ b/pacemaker-pyexecdir.patch @@ -0,0 +1,25 @@ +Index: pacemaker/cts/Makefile.am +=================================================================== +--- pacemaker.orig/cts/Makefile.am ++++ pacemaker/cts/Makefile.am +@@ -24,7 +24,7 @@ CLEANFILES = LSBDummy + EXTRA_DIST = $(cts_SCRIPTS) $(cts_DATA) + + ctsdir = $(datadir)/$(PACKAGE)/tests/cts +-ctslibdir = $(pythondir)/cts ++ctslibdir = $(pyexecdir)/cts + + ctslib_PYTHON = __init__.py \ + CTSvars.py \ +Index: pacemaker/shell/modules/Makefile.am +=================================================================== +--- pacemaker.orig/shell/modules/Makefile.am ++++ pacemaker/shell/modules/Makefile.am +@@ -41,6 +41,6 @@ modules = __init__.py \ + vars.py \ + xmlutil.py + +-shelllibdir = $(pythondir)/crm ++shelllibdir = $(pyexecdir)/crm + + shelllib_PYTHON = $(modules) diff --git a/pacemaker.changes b/pacemaker.changes index f575cc7..3db8b9b 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,17 +1,760 @@ ------------------------------------------------------------------- -Thu Jul 30 10:58:43 CEST 2009 - aj@suse.de +Mon Jun 14 14:25:25 UTC 2010 - lmb@novell.com -- Fix %exclude usage. +- Shell: templates: clvm,ocfs2: add the fs/vg resource to the base + group, add timeouts (bnc#605580) +- Shell: skip resource checks for property-like elements (lf#2420) +- Shell: on no id match the first of property-like elements (lf#2420) +- Shell: set proper ids for rsc/op_defaults (lf#2420) +- Shell: add exit codes for non-interactive use +- PE: No services should be stopped until probes finish (lf#2433) +- PE: Support clones in resource sets (bnc#586613, lf#2404, lf#2409) +- Tools: Allow ptest and crm_simulate to work with configs that lack a + status section +- Core: Reduce logging for failed xpath searches +- PE: Support colocation sets with negative scores (lf#2435) +- PE: Ensure deallocated resources are stopped +- PE: Ordering dependencies on partially active groups not observed + properly (lf#2422) +- PE: If there are no compatible peers when interleaving clones, ensure + the instance is stopped +- PE: Fix colocation for interleaved clones +- PE: Fix colocation with partially active groups +- PE: Don't overwrite existing meta attributes (like timeout) for notify + operations (lf#2424) +- PE: stop-all-resources shouldn't apply to stonith resources (lf#2426) +- Fencing: Reduce stonith-ng logging (lf#2431) +- ais: Improved processing when the peer crmd processes join/leave + (lf#2401) +- Tools: crm_resource - Report crmd connection errors +- Tools: Drop the 'pingd' daemon and resource agent in favor of + ocf:pacemaker:ping (WIP WIP WIP FIXME FIXME FIXME This is dangerous to + release as it stands now!) +- cib: Fix the application of unversioned diffs +- Several valgrind + coverity issues fixed. +- Upstream version cs: 8b9ec9ccc506 ------------------------------------------------------------------- -Sun Jul 12 14:33:00 CEST 2009 - coolo@novell.com +Tue Jun 8 02:43:35 UTC 2010 - tserong@novell.com -- fix build in disabling as-needed +- Install crm shell and cts in $(pyexecdir) instead of $(pythondir) + to ensure installation in /usr/lib64 on x86_64 + +------------------------------------------------------------------- +Tue May 18 06:30:42 UTC 2010 - tserong@novell.com + +- Fix crm membership check (bnc#603685, reverts changesets + 6e6980376f01 and 2e096a41a5f9) +- Upstream version cs: e8717a29601a (1.1.2.1) + +------------------------------------------------------------------- +Fri May 14 13:08:29 UTC 2010 - lmb@novell.com + +- ais: fix list of active processes sent to clients (bnc#603685) +- Upstream version cs: 2e096a41a5f9 + +------------------------------------------------------------------- +Wed May 12 13:57:23 UTC 2010 - lmb@novell.com + +- crmd: Prevent use-after-free of the stonith-ng connection (lf#2414) +- Core: Prevent use-after-free reported by valgrind when + doing xpath based deletions (lf#2414) +- PE: Fix memory leaks reported by valgrind +- Core: Fix memory leak in replace_xml_child() reported by valgrind +- PE: Remove developemnt logging which mistakenly logged at "ERROR" + level. +- Upstream version cs: b59c27dc114a (1.1.2) + +------------------------------------------------------------------- +Mon May 10 13:19:09 UTC 2010 - lmb@novell.com + +- crmd: Prevent use-after-free of the PE connection after it dies + (lf#2414) +- Shell: support for clone instances in constraints (lf#2169) +- Upstream version cs: 42a5aa3413f4 + +------------------------------------------------------------------- +Mon May 10 09:52:28 UTC 2010 - lmb@novell.com + +- Shell: new command default-timeouts to set default operation timeouts + (bnc#479052) +- crmd: ais: Use the threadsafe version of getpwnam +- PE: Enforce mandatory promotion (colocation) constraints (lf#2403) +- PE: Don't complain about missing agents during probes of a-symetric + clusters (lf#2410) +- Shell: don't error on missing resource agent with asymmetrical + clusters (lf#2410) +- ais: Ensure the list of active processes sent to clients is always + up-to-date +- PE: Allow constraints to apply to specific instances of clones + (lf#2169) +- PE: Allow ordering constraints to apply to specific instances of + clones +- PE: Clean up failcount after it expires (lf#2066) +- PE: Before starting utilization-using resources on a node, take off + the load which will no longer run there (bnc#594782) +- PE: Don't be so quick to pull the trigger on nodes that are coming up +- crmd: Use global fencing notifications to prevent secondary fencing + operations of the DC +- cib: Changes to group order are not detected or broadcast to peers + (lf#2352) +- Core: Only use the named schema if the validation passes +- Shell: don't verify empty configurations (bnc#602711) +- crmd: Send erase_status_tag() calls to the local CIB when the DC is + fenced, since there is no DC to accept them +- crmd: Include operation interval in logged action +- crmd: Arrange for only one node to clean up after a fenced DC node +- crmd: create the final directory too for resource agents (bnc#603190) +- Tools: crm_mon: refresh screen on terminal resize (bnc#589811) +- PE: Correctly locate clone instances by their prefix (lf#2412) +- ais: Make a better attempt at determining an accurate born-on value + from corosync +- tools: crm_mon - Enable 'connectivity' mode for 'ping' resources too +- Upstream version cs: e8624c181a3f + +------------------------------------------------------------------- +Tue Apr 27 08:54:11 UTC 2010 - lmb@novell.com + +- Fix small error so that regression test suite passes. + +------------------------------------------------------------------- +Tue Apr 27 03:07:40 UTC 2010 - ygao@novell.com + +- PE: Before starting utilization-using resources on a node, take off + the load which will no longer run there (bnc#594782) + +------------------------------------------------------------------- +Mon Apr 26 10:03:44 UTC 2010 - lmb@novell.com + +- PE: Don't create scaffolding for ordering sets with a single resources + (bnc#586613) +- PE: Ignore colocation weights from clone instances +- PE: Print allocation scores as +/-INFINITY when appropriate +- Upstream version cs: fa1c810f1d1d + +------------------------------------------------------------------- +Fri Apr 23 10:09:51 UTC 2010 - lmb@novell.com + +- Fix regression test for build environment. +- Upstream version cs: c11e18619efd + +------------------------------------------------------------------- +Wed Apr 21 13:25:26 UTC 2010 - lmb@novell.com + +- Fix several memory leaks exposed by valgrind. +- Improve regression tests. +- Low: Fencing: Delay system initialization until after we handle + possible metadata queries +- Tools: Do not print help on executing "crm_node -i" +- crm_simulate: Allow bringing new node online (bnc#591162) +- crmd: Improved detection of partially active peers (lf#2401) +- PE: Fix intra-set colocation and ordering (lf#2384) +- PE: Combine failcounts for all instances of an anonymous clone on a + host (lf#2383) +- crmd: Add missing fields to the metadata for use by the shell + (lf#2387) +- PE: Check for use-of-NULL in dump_node_scores() +- PE: Rewrite native_merge_weights() to avoid Fix use-after-free +- Upstream version cs: 2a90abe96048 + +------------------------------------------------------------------- +Mon Apr 12 11:09:09 UTC 2010 - lmb@novell.com + +- Automated test case improvements. +- Upstream version cs: 536bf0b9d3ba + +------------------------------------------------------------------- +Fri Apr 9 08:38:55 UTC 2010 - lmb@novell.com + +- Shell: always reload status if working with the cluster (bnc#590035) +- Shell: add new regression tests +- Shell: don't allow empty attributes for properties/*_defaults + (lf#2395) +- Shell: add another attribute not present in the crmd metadata +- Tools: crm_mon - Enable specification of community for SNMP traps +- PE: Ensure important options (notify, unique, etc) are always exposed + during resource operations (lf#2391) +- Tools: Support short form of crm_simulate --quorum (bnc#591168) +- ais: Convert endian for all of the integer fields in messages + (bnc#472014) +- Upstream version cs: 80e0bb600e6c + +------------------------------------------------------------------- +Wed Mar 31 19:18:35 UTC 2010 - lmb@novell.com + +- Shell: Default to using the status section from the live CIB + (bnc#592762) +- Upstream version cs: 739282ba9e2e + +------------------------------------------------------------------- +Wed Mar 31 13:03:43 UTC 2010 - lmb@novell.com + +- crmd: fix non-fatal assert in lrmd.c when resources are manually + failed (bnc#590924) +- Upstream version cs: f77530201221 + +------------------------------------------------------------------- +Tue Mar 30 13:12:24 UTC 2010 - lmb@novell.com + +- tools: crm_simulate - fix small xpath memory leak in inject_node_state +- Shell: templates: new sbd template +- Shell: templates: update apache documentation +- crmd: Do not ignore action timeouts based on FSA state (could cause + transitions that never terminate) +- Upstream version cs: 322ff3419bc8 + +------------------------------------------------------------------- +Mon Mar 29 14:55:27 UTC 2010 - lmb@novell.com + +- Shell: add two attributes not present in the crmd metadata, which + broke "configure verify" +- Upstream version cs: 24ee74882b42 + +------------------------------------------------------------------- +Mon Mar 29 13:58:05 UTC 2010 - lmb@novell.com + +- Shell: fix bad cib passed to crm_verify +- Upstream version cs: c02327f742a0 + +------------------------------------------------------------------- +Mon Mar 29 13:05:26 UTC 2010 - lmb@novell.com + +- Shell: verify only changed elements on commit (bnc#590033) +- Shell: observe op_defaults when verifying primitives (bnc#590033) +- Shell: update meta attributes list +- Shell: verify meta attributes and properties (bnc#589867) +- Shell: fix wrong exit code setting logic in resource cleanup +- Shell/PE: Show utilization/capacity information (bnc#589873) +- Shell: implement new cibstatus interface and commands (bnc#580492) +- crmd: Do not allow the target_rc to be misused by resource agents +- Shell: check python version at start (lf#2369) +- extra/showscores.sh: Correctly display stickiness if unset +- RA: SystemHealth: exit properly when the required software is not + installed (bnc#587940) +- ais: Look for the correct conf variable for turning on file logging +- crmd: Ensure the cluster terminates when the PE isn't available + (lf#2379) +- crmd: Ensure we dont get stuck in S_PENDING if we loose an election to + someone that never talks to us again +- Upstream version cs: 3fea355803af + +------------------------------------------------------------------- +Fri Mar 19 19:59:58 UTC 2010 - lmb@novell.com + +- crmd: Remove race condition that could lead to multiple instances of a + clone being active on a machine +- PE: Consolidate and unify logging of fencing causes +- hb2openais: add support for corosync as target +- Shell: templates: add cmirror to ocfs2 and clvm (bnc#587493) +- Shell: support for resource/node utilization +- Shell: switch to single cibadmin for commit +- Shell: enable comments (lf#2221) +- Upstream version cs: 83f654529b5c + +------------------------------------------------------------------- +Mon Mar 15 11:23:49 UTC 2010 - lmb@novell.com + +- Shell: don't touch resources within a group when managing + groups/clones +- Shell: repair node show (bnc#587883) +- Upstream version cs: 3002fabf85d4 + +------------------------------------------------------------------- +Wed Mar 10 15:16:33 UTC 2010 - lmb@novell.com + +- PE: Make sure migration ops use the correct meta options (bnc#586710) +- Upstream version cs: aaf4d36b8494 + +------------------------------------------------------------------- +Tue Mar 9 21:39:20 UTC 2010 - dmuhamedagic@novell.com + +- Shell: fix commit for new clones of new groups (bnc#585471) +- Shell: edit multiple meta_attributes sets in resource management (lf#2315) +- Shell: don't cache node and resource ids (lf#2368) +- Shell: new cibstatus import command (bnc#585471) +- Shell: check timeouts also against the default-action-timeout property + +------------------------------------------------------------------- +Tue Mar 9 14:29:40 UTC 2010 - lmb@novell.com + +- PE: Avoid needless restart of primitive depending on a clone (lf#2317, + bnc#586613) +- PE: Only log orphans when they are found to be active (lf#2364) +- PE: Ensure clones observe mandatory ordering constraints if the LHS is + unrunnable (lf#2361) +- Tools: Add utilization support for crm_attribute and crm_resource +- Upstream version vs: c23bbc5262b2 + +------------------------------------------------------------------- +Fri Mar 5 15:45:15 UTC 2010 - lmb@novell.com + +- ais: Do not count votes from offline nodes and calculate current + votes before sending quorum data. +- PE: Repair handling of unordered groups in RHS ordering constraints. +- Shell: update regression tests. +- CTS: Make it work for openais. +- Upstream version cs: a9f5a06a8f9e + +------------------------------------------------------------------- +Thu Mar 4 09:57:38 UTC 2010 - lmb@novell.com + +- Conflict with ocfs2-tools-o2cb prevented said package from being + installed at all due to dependencies (bnc#582697). + +------------------------------------------------------------------- +Wed Mar 3 19:46:15 UTC 2010 - lmb@novell.com + +- Shell: implement lifetime for rsc migrate and node standby (lf#2353) +- Shell: node attributes update in configure (bnc#582767) +- Tools/PE: Do not warn if the configuration is fully + forward-compatible. +- Upstream version cs: 745c756006da + +------------------------------------------------------------------- +Mon Mar 1 12:04:11 UTC 2010 - lmb@novell.com + +- Shell: update previous node lookup procedure to include the id where + necessary +- Shell: improve batch mode. +- Shell: add support for xml in cli. +- Shell: repare clone/ms cleanup (bnc#583288) +- Shell: load update should update existing elements. +- crmd: expected-quorum-votes not correctly updated after membership + change (lf#2359) +- PE: Fix master-master anti-colocation (lf#2358) +- Upstream version cs: 059e4095d2ca + +------------------------------------------------------------------- +Wed Feb 24 10:15:57 UTC 2010 - lmb@novell.com + +- Work around non-thread-safe setenv() calls that could cause a crash + (bnc#582598) +- Upstream version cs: ae0170640c3e + +------------------------------------------------------------------- +Tue Feb 23 15:35:05 UTC 2010 - lmb@novell.com + +- Shell: update supported CIB RE to include pacemaker 1.1 and 1.2 +- ais: Fix the child shutdown escalation logic +- Core: Give signal handlers higher priority +- PE: Correctly implement optional colocation between primitives and + clone resources +- crmd: Don't send operation updates for deleted resources (bnc#578644) +- Upstream version cs: 530add2a3721 + +------------------------------------------------------------------- +Mon Feb 22 14:00:00 UTC 2010 - lmb@novell.com + +- Shell: add tab completion for nodes (bnc#577003) +- Shell: fix wrong var reference +- Shell: improve configure commit (lf#2336) +- Shell: add tab completion for op/rsc_defaults (bnc#552541) +- Shell: add option to control sorting of cib elements (lf#2290) +- Shell: add tab completion for nodes (bnc#577003) +- RA: ping(d) - Fix metadata. +- xml schema: support differentiation between stable and experimental + feature sets. +- Upstream version cs: 0591630c8bd3 + +------------------------------------------------------------------- +Thu Feb 18 22:04:16 UTC 2010 - lmb@novell.com + +- Conflict with ocfs2-tools-o2cb; a system needs to be configured + either for Pacemaker or O2CB/Oracle RAC, but never both. + +------------------------------------------------------------------- +Thu Feb 18 14:27:00 UTC 2010 - lmb@novell.com + +- stonith-ng: Fix meta-data not always being retrieved properly. +- Tools: crm: fix CIB upgrade command (bnc#578637) +- PE: Improved graphs when probing partially up nodes +- crmd: Improve handling of cancelled operations caused by resource + cleanup (bnc#578644) +- PE: Significant performance bugs for larger clusters with many + nodes/resources/constraints removed. +- Upstream version cs: 4bc7a38e2b10 + +------------------------------------------------------------------- +Tue Feb 9 10:27:47 UTC 2010 - lmb@novell.com + +- Add dependencies on python and python-xml so the shell works + immediately (bnc#578006). + +------------------------------------------------------------------- +Mon Feb 8 15:07:35 UTC 2010 - lmb@novell.com + +- Incorporate code for hard resource limits (FATE#303384) in shell and + pacemaker policy engine. +- External stonith agents were not properly handled (bnc#577007). +- Upstream version cs: 46679a8feec7 + +------------------------------------------------------------------- +Fri Jan 22 10:36:45 UTC 2010 - lmb@novell.com + +- crmd: Ensure we have the latest status after a transition abort +- crm: optimize shell start-up time (lf#2303). +- crm: simplify template for ocfs2 +- crm: don't remove sets which contain id-ref attribute (lf#2304) +- crm: add update method to template apply (lf#2289) +- crm: make template new more robust, add documentation +- crm: fix check for invalid constraints +- crm: rename status to cibstatus (lf#2236) +- crm: save options if run from the command line (lf#2310) +- crm: add notify to the list of valid operations +- crm: fix node delete (lf#2305) +- crm_node: accept -f as the short form of --force +- crm_node: rovide a way to determin the nodeid of past cluster members + (lf#2307) +- Upstream version cs: 6a6aa02deea9 + +------------------------------------------------------------------- +Mon Jan 11 15:49:30 UTC 2010 - lmb@novell.com + +- PE: Don't log uninstalled resource agents as errors (lf#2251) +- fix refresh time for html interface of crm_mon +- Tools: crm: don't consider warnings as errors (lf#2274) +- Tools: crm: direct RA interface for ocf class resource agents + (lf#2270) +- cib: Check also whether an user's primary group is matched +- PE: Bug lf#2153 - non-clones shouldn't restart when clones stop/start + on other nodes +- PE: Bug lf#2153 - Update regression tests +- PE: Correctly anti-colocate with a group +- Tools: crm: define missing index in validate_template (lf#2287) +- Tools: crm: stay in crm if user specified level only (lf#2286) +- Tools: crm: fix exit code on single shot commands +- Tools: Bug lf#2286 - Allow the shell to accept template parameters on + the command line +- Tools: crm: allow entering level and input file (-f) +- Tools: crm: relax check for RA existence (lf#2270) +- Tools: crm: fix OCF_ROOT processing +- Tools: crm: catch EOFError exception in raw_input (lf#2289) +- Tools: crm: implement -F (--force) option +- Tools: crm: rename some misnamed functions +- PE: Prevent non-multistate resources from being promoted through + target-role +- Tools: crm: direct RA interface for stonith class resource agents + (lf#2270) +- fencing: stonithd: ignore case when comparing host names (lf#2292) +- Tools: crm: direct RA interface for lsb class resource agents + (lf#2270) +- PE: Bug lf#2153 - non-clones shouldn't restart when clones stop/start + on other nodes - improved +- TE: Fix batch-limit processing. +- Tools: crm: exclude locations when testing for pathological + constraints (lf#2300) +- PE: Only complain about target-role=master for non m/s resources +- Tools: crm: load help from crm_cli.txt +- pengine/crmd: move crm_log_init after version and metadata calls + (lf#2272) +- crmd: Ensure batch-limit is correctly enforced +- PE: Don't overwrite the value of batch-limit +- cts: Add the 'cmd' to the output of external commands +- pengine: crmd: Ensure help text includes correct binary name +- Tools: crm: don't fall apart if there's no help text file +- Tools: crm: cache help tables (lf#2303) +- Upstream version cs: 443ff5d69319 + +------------------------------------------------------------------- +Thu Dec 10 18:46:03 UTC 2009 - "lmb@novell.com" + +- PE: Correctly unpack ordering constraints for resource sets to avoid + graph loops +- Two new system health RAs. +- PE: Don't log uninstalled resource agents as errors (lf#2251) +- Upstream version cs: cd2aaf7e35cf + +------------------------------------------------------------------- +Tue Dec 8 08:44:07 UTC 2009 - "lmb@novell.com" + +- Tools: crm: fix parentheses parsing in resource sets +- Tools: crm: support for description attribute in resources/operations + (bnc#548690) +- Tools: hb2openais: add EVMS2 CSM processing (and other changes) + (bnc#548093) +- Tools: crm: don't add score which doesn't exist +- Tools: crm: copy score from/to resource_set +- Tools: crm: update tab completion for constraints (support resource + sets) +- Tools: crm: handle resource_set resource references in delete and + rename +- PE: Provide a default action for resource-set ordering +- Tools: crm: drop empty attributes elements +- xml: Add stopped as a supported role for operations +- Tools: hb2openais: don't allow empty rules, clones, or groups + (lf#2215) +- Tools: hb2openais: refuse to convert pure EVMS volumes +- Tools: hb2openais: add inf score to order constraints +- crm: Enhance "colocation" help to explain how it works. +- crm_mon: Mail subject needs space for \0 byte. +- fencing: stonithd: add metadata for stonithd instance attributes (and + support in the shell) +- Tools: crm: drop short description from the metadata if it equals long + description +- Tools: crm: relax checks for advertised monitor operations (lf#2222) +- Tools: crm: support for comments (lf#2221) +- Tools: crm: test operation name against a list of possible ops +- tools: Dont waste vertical space in crm_mon output +- xml: Treat node unames as text fields not IDs (bnc#552713) +- PE: rsc_order constraints always use score at the top level (lf#2206) +- xml: Create an always-true expression for empty rules when upgrading + from 0.6 (lf#2215) +- PE: Clone ordering should be able to prevent startup of dependant + clones (lf#2209) +- PE: Add regression test (lf#2209) +- PE: Correctly identify the state of anonymous clones when deciding + when to probe (lf#2216) +- PE: Operations that require fencing should wait for 'stonith_complete' + not 'all_stopped'. (lf#2225) +- PE: Prevent clone peers from stopping while another is instance is + (potentially) being fenced (lf#2225) +- crmd: C_TIMER_POPPED is now quite normal thanks to the recheck timer, + downgrade log message +- PE: Silently fix requires=fencing for stonith resources so that it can + be set in op_defaults +- xml: Preserve the old stonith-enabled=false symantics from 0.6 during + an upgrade (lf#2230) +- xml: Allow the auto-id base to be specified, because generate-id() + isn't always unique +- PE: Ensure groups process location constraints so that clone-node-max + works for cloned groups (lf#2213) +- Tools: crm: relax check for RA actions +- Upstream version cs: 9f61f272598a + +------------------------------------------------------------------- +Tue Nov 3 23:00:00 UTC 2009 - "lmb@novell.com" + +- PE: Provide better defaults for lt(e) and gt(e) comparisons + (bnc#515172) +- Upstream version cs: 405fe9a92d82 + +------------------------------------------------------------------- +Tue Sep 29 06:35:15 UTC 2009 - "lmb@novell.com" + +- Revert conflicts with ocfs2-tools-o2cb to ease automatic upgrades. The + two should still not be installed in parallel; please see release + notes! +- High: ais: Gracefully handle changes to the AIS nodeid +- Low: PE: Fix the metadata to advertise the correct type for + stonith-timeout +- High: cib: Repair the ability to connect to the cluster from + non-cluster machines +- Medium: Tools: Use -q as the short form for --quiet (for consistency) +- Medium (bnc#520707): Tools: crm: new templates ocfs2 and clvm +- Medium (LF 2185): Tools: crm: add resource promote/demote commands +- Low (LF 2175): Tools: crm: add help for node status +- High: xml: Mask the "symmetrical" attribute on rsc_colocation + constraints (bnc#540672) +- Upstream version cs: 05c8b63cbca7 + +------------------------------------------------------------------- +Thu Aug 27 15:58:01 UTC 2009 - "lmb@novell.com" + +- Upstream version cs: 595cca870aff +- Dev: Tools: crm: do not allow empty attribute names +- Low: Tools: crm: make check for operations id attribute stricter +- Dev: Tools: crm: implement binary op types properly (thanks to Alain + St-Denis) +- Dev: Tools: crm: allow id-refs to stand by themselves (update for fix + 37077ed56af5) +- High: crmd: Terminate if we are ever evicted from the membership +- High: crmd: Unset any existing DC value before querying for a new one +- High: PE: Bug bnc#515172 - Fix the boolean-op attribute of rules +- High: PE: Bug bnc#515172 - Correctly process location constraint rules + which contain multiple expressions +- High (bnc#507255): Tools: crm: implement date expressions +- Low: Tools: crm: let the user know that curses is needed for colors +- High: Tools: crm: new display type (uppercase keywords) +- Medium: Extra: Add tools, an RA and tests for the System Health + feature +- Medium: Tools: crm_resource - Prevent use-of-NULL by requiring a + resource name for the -A and -a options +- Medium: PE: Prevent use-of-NULL in find_first_action() +- High: PE: Only prevent migration if the clone dependancy is + stopping/starting on the target node +- Low: crmd: Include cib version of the updates which caused a + transition abort +- High: PE: Bug lf#2160 - Dont shuffle clones due to colocation +- Low: PE: Fix find_first_action() when no node filter is specified +- Low: PE: ptest - Suppress deleted ordering constraints from the .dot + graph +- High: PE: New implementation of the resource migration (not + stop/start) logic +- Medium: crmd: Note that dc-deadtime can be used to mask the brokeness + of some switches +- High: Tools: crm_resource - Advertise --move instead of --migrate +- Medium: Extra: New node connectivity RA that uses system ping and + attrd_updater +- High: crmd: Bug bnc#527530 - Wait for the transition to complete + before leaving S_TRANSITION_ENGINE +- High: ais: Avoid excessive load by checking for dead children every 1s + (instead of 100ms) +- Medium: PE: Stop ptest from logging to syslog +- Medium: PE: Correctly log resources that would like to start but can't +- High: PE: Bug lf#2171 - Prevent groups from starting if they depend on + a complex resource which can't +- Low: PE: Add regression test for lf#2171 +- High: PE: Bug lf#2170 - stop-all-resources option had no effect +- High: PE: Disable resource management if stonith-enabled=true and no + stonith resources are defined +- High: Core: Bug lf#2169 - Allow dtd/schema validation to be disabled +- Medium: PE: Bug lf#2180 - Include node information for all failed ops +- Medium: PE: Bug lf#2178 - Indicate unmanaged clones +- Medium: ais: Include version details in plugin name +- High: PE: Bug lf#2106 - Not all anonymous clone children are restarted + after configuration change +- Medium: ais: Attempt to enable core file generation if it was disabled +- Medium: crmd: Requery the resource metadata after every start + operation +- High: Tools: crm: add semantic checks depending on the meta-data from + resource agents + +------------------------------------------------------------------- +Thu Aug 13 14:48:06 CEST 2009 - abeekhof@suse.de + +- Update source tarball to revision: b05d5a2b9c52 + + High (bnc#507255): Tools: crm: implement date expressions + + High: Build: Fix compilation when snmp and esmtp are not available + + High: PE: Bug 2160 - Dont shuffle clones due to colocation + + High: PE: Bug bnc#515172 - Correctly process location constraint rules which contain multiple expressions + + High: PE: Bug bnc#515172 - Fix the boolean-op attribute of rules + + High: PE: New implementation of the resource migration (not stop/start) logic + + High: PE: Only prevent migration if the clone dependancy is stopping/starting on the target node + + High: Tools: crm: new display type (uppercase keywords) + + High: Tools: crm_resource - Advertise --move instead of --migrate + + High: ais: Fix cluster connection when using corosync 1.0 + + High: ais: Ubuntu needs a leading zero for directory modes + + High: crmd: Terminate if we are ever evicted from the membership + + High: crmd: Unset any existing DC value before querying for a new one + + Medium: Extra: Add tools, an RA and tests for the System Health feature written by Mark Hamzy + + Medium: Extra: New node connectivity RA that uses system ping and attrd_updater + + Medium: PE: Prevent use-of-NULL in find_first_action() + + Medium: Tools: crm_resource - Prevent use-of-NULL by requiring a resource name for the -A and -a options + + Medium: crmd: Note that dc-deadtime can be used to mask the brokeness of some switches + +------------------------------------------------------------------- +Thu Aug 13 12:29:37 UTC 2009 - lmb@novell.com + +- Remove references to heartbeat packages. + +------------------------------------------------------------------- +Mon Aug 3 14:00:07 UTC 2009 - lmb@novell.com + +- Require python-curses for CLI color support. + +------------------------------------------------------------------- +Tue Jul 21 14:27:31 CEST 2009 - lmb@novell.com + +- Update to 0123af21a705. + +------------------------------------------------------------------- +Mon Jul 13 12:51:34 CEST 2009 - lmb@novell.com + +- Prevent pacemaker from being installed along with ocfs2-tools-o2cb to + reduce likelihood of misconfiguration (bnc#520721). + +------------------------------------------------------------------- +Wed Jul 8 17:00:00 CEST 2009 - lmb@suse.de + +- Build: properly install crm_standby, crm_failcount, crm_master. + +------------------------------------------------------------------- +Wed Jul 8 10:45:00 CEST 2009 - lmb@suse.de + +- Update source tarball to revision: b05d5a2b9c52 + + High: Core: Show help text and exit with rc 1 if option processing failed + + High: PE: Fix reload for master/slave resources + + High: Tools: Differentiate between --help and an unknown option + + High: Tools: crm: support for color output + + High: lrm: Look in the correct location for stonith agents + + Low: Core: Reduce logging noise + + Low: Tools: Ensure crm_resource -q prints a trailing newline + + Low: Tools: ptest no longer supports --xml-pipe + + Low: Tools: remove spurios newline output to stderr + + Low: ais: Better handling of to_file: and to_syslog: options + + Low: ais: set HA_LOGFACILITY too + + Low: extra: Add a dummy parameter to 'Dummy' so we can test reload + + Medium: Tools: crm: fix the verify exit code properly + + Medium: cib: Supply an empty status section for replace operations + + Dev: Tools: crm: recreate constraints on grouping resources + +------------------------------------------------------------------- +Wed Jun 10 16:05:25 CEST 2009 - abeekhof@suse.de + +- Update source tarball to revision: Pacemaker-1.0.4 + + High: ais: bnc#488291 - don't rely on byte endianness on ptr cast + + High: Tools: bnc#507255 - crm: import properly rsc/op_defaults + + High: Tools: lf#2114 - crm: add support for operation instance attributes + + High: ais: Bug lf#2126 - Messages replies cannot be routed to transient clients + + High: attrd: Support the value++ and value+=... syntax required for failcounts + + High: cib: Fix huge memory leak affecting heartbeat-based clusters + + High: Core: Generate the help text directly from a tool options struct + + High: crmd: Bug lf#2120 - All transient node attribute updates need to go via attrd + + High: crmd: Fix another large memory leak affecting Heartbeat based clusters + + High: PE: Bug bnc#495687 - Filesystem is not notified of successful STONITH under some conditions + + High: PE: Make running a cluster with STONITH enabled but no STONITH resources an error and provide details on resolutions + + High: PE: Prevent use-of-NULL when using resource ordering sets + + High: Tools: attrd - Prevent race condition resulting in the cluster forgetting node's wish to shut down + + High: Tools: crm_mon - Fix smtp notifications + + High: Tools: crm_resource - Repair the ability to query meta attributes + + Medium: Core: Include supported stacks in version information + + Medium: Tools: Include current stack in crm_mon output + + Medium: PE: Correctly log the actions for resources that are being recovered + + Medium: PE: Correctly log the occurance of promotion events + +------------------------------------------------------------------- +Fri Apr 3 12:16:27 CEST 2009 - abeekhof@suse.de + +- Add a man page for crm_shadow +- Update source tarball to revision: 9196be9830c2 + + High: crmd: Bug bnc#480977 - Prevent extra, partial, shutdown when a node restarts too quickly (verified) + + Medium: crmd: Bug bnc#490426 - Escalated shutdowns stall when there are pending resource operations + + Medium: PE: Bug bnc#491441 - crm_mon does not display operations returning 'uninstalled' correctly + +------------------------------------------------------------------- +Tue Mar 31 14:53:08 CEST 2009 - abeekhof@suse.de + +- Update for SLE11 HAE RC9 +- Update source tarball to revision: 61da7b5260df + + High: PE: Bug bnc#490418 - Correctly determine node state for nodes wishing to be terminated + + High: RA: Bug bnc#490641 - Shut down dlm_controld with -TERM instead of -KILL + +------------------------------------------------------------------- +Mon Mar 30 21:21:47 CEST 2009 - abeekhof@suse.de + +- Update source tarball to revision: f090699a99c5 + + High: PE: Bug bnc#488721 - Fix id-ref expansion for clones, the doc-root for clone children is not the cib root + + High: PE: Bug lf#2094 - Fix probe ordering for cloned groups + + High: crmd: Bug bnc#489063 - Ensure the DC is always unset after we 'loose' an election + +------------------------------------------------------------------- +Fri Mar 20 21:16:26 CET 2009 - abeekhof@suse.de + +- Update for SLE11 HAE RC8 +- Update to upstream version number +- Update source tarball to revision: be123e8615a5 + + High: PE: Bug lf#2089 - Meta attributes are not inherited by clone children + + High: PE: Bug lf#2091 - Correctly restart modified resources that were found active by a probe + + High: PE: Correctly handle terminate node attributes that are set to the output from time() + + High: ais plugin: Fix quorum calculation (bnc#487003) + + High: ais: Bug bnc#486858 - Fix update_member() to prevent spamming clients with membership events containing no changes + + High: fencing: stonithd: is_heartbeat_cluster is a no-no if there is no heartbeat support + +------------------------------------------------------------------- +Mon Mar 16 16:15:00 CET 2009 - lmb@suse.de + +- Update for SLE11 HAE RC7 +- Update source tarball to revision: 7e44933b0e46 + - Tools: crm: print short help if there is no long help; replace "desc" with "help" + - Tools: crm: issue warnings on all unrecognized elements of the cib configuration + - Tools: crm: the new configure monitor command + - Tools: crm: return exit code from configure commands + - Tools: crm: check shadow name for sanity in the cib use command + - Tools: crm: more shadow name sanity checks ------------------------------------------------------------------- Mon Mar 16 07:16:29 CET 2009 - abeekhof@suse.de -- Update for SLE11 HAE RC7 - Update source tarball to revision: ec6b0bbee1f3 + High: PE: The ordered option for clones no longer causes extra start/stop operations + High: RA: pingd: Set default ping interval to 1 instead of 0 seconds diff --git a/pacemaker.spec b/pacemaker.spec index 1e06235..d5a6acd 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -1,7 +1,7 @@ # -# spec file for package pacemaker (Version 1.0.1) +# spec file for package pacemaker (Version 1.1.2.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -17,14 +17,15 @@ # norootforbuild +%global pcmk_docdir %{_docdir}/%{name} %if 0%{?suse_version} %define _libexecdir %{_libdir} %endif %define with_extra_warnings 0 %define with_debugging 0 -%define without_fatal_warnings 1 %define with_ais_support 1 %define with_heartbeat_support 0 +%define with_regression_tests 0 %define gname haclient %define uname hacluster %define doc_pkg heartbeat-doc-1.0 @@ -36,23 +37,29 @@ Name: pacemaker Summary: The Pacemaker scalable High-Availability cluster resource manager -Version: 1.0.1 -Release: 19 -License: GPL v2 or later ; LGPL v2.1 or later +Version: 1.1.2.1 +Release: 1 +License: GPLv2+ ; LGPLv2.1+ Url: http://www.clusterlabs.org Group: Productivity/Clustering/HA -Source: pacemaker.tar.gz +Source: pacemaker.tar.bz2 Source2: %{doc_pkg}.tar.gz Source100: pacemaker.rpmlintrc +Patch1: pacemaker-cts-startcmd.patch +Patch2: pacemaker-pyexecdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on -Conflicts: heartbeat < 2.99 -PreReq: heartbeat-common -Requires: libpacemaker3 = %{version}-%{release} -BuildRequires: e2fsprogs-devel glib2-devel gnutls-devel libesmtp-devel libheartbeat-devel libxml2-devel libxslt-devel ncurses-devel net-snmp-devel pam-devel pkgconfig python-devel swig +Conflicts: heartbeat < 3.0 +PreReq: cluster-glue +Requires: resource-agents openais python python-xml +Requires: libpacemaker3 = %{version}-%{release} python-curses +BuildRequires: e2fsprogs-devel glib2-devel gnutls-devel libesmtp-devel libglue-devel libxml2-devel libxslt-devel ncurses-devel net-snmp-devel pam-devel pkgconfig python-devel resource-agents swig +%if %with_regression_tests +BuildRequires: openais procps python python-curses python-xml vim-base +%endif %if %with_ais_support -BuildRequires: libopenais-devel -Requires: openais +BuildRequires: libcorosync-devel +Requires: corosync %endif %if %with_heartbeat_support BuildRequires: heartbeat-devel @@ -61,7 +68,7 @@ Requires: heartbeat %if 0%{?suse_version} BuildRequires: libbz2-devel Suggests: graphviz -Recommends: libdlm heartbeat-resources +Recommends: libdlm resource-agents %if 0%{?suse_version} > 1100 BuildRequires: docbook-xsl-stylesheets %endif @@ -91,7 +98,7 @@ Authors: Andrew Beekhof %package -n libpacemaker3 -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: The Pacemaker scalable High-Availability cluster resource manager Group: Productivity/Clustering/HA @@ -113,12 +120,18 @@ Authors: Andrew Beekhof %package -n libpacemaker-devel -License: GPL v2 only ; GPL v2 or later ; LGPL v2.1 or later +License: GPLv2 ; GPLv2+ ; LGPLv2.1+ Summary: The Pacemaker scalable High-Availability cluster resource manager Group: Development/Libraries/C and C++ Requires: %{name} = %{version}-%{release} Requires: libpacemaker3 = %{version}-%{release} -Requires: libheartbeat-devel +Requires: libglue-devel +%if %with_regression_tests +# For the regression tests, we can run them only if all pacemaker +# packages are installed, so we pull that in here for the regression +# builds; this is supposed to be disabled for shipping code. +Requires: pacemaker +%endif %description -n libpacemaker-devel Pacemaker is an advanced, scalable High-Availability cluster resource @@ -140,48 +153,25 @@ Authors: %prep ########################################################### %setup -a 2 -n pacemaker -q +%patch1 -p1 +%patch2 -p1 ########################################################### %build -# fix build in disabling as-needed export SUSE_ASNEEDED=0 -# TODO: revisit -all + CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" -# Feature-dependent CFLAGS: -%if %with_extra_warnings -# CFLAGS="${CFLAGS} -Wshadow -Wfloat-equal -Waggregate-return -Wnested-externs -Wunreachable-code -Wendif-labels -Winline" -CFLAGS="${CFLAGS} -Wfloat-equal -Wendif-labels -Winline" -%endif -%if %with_debugging -CFLAGS="${CFLAGS} -O0" -%endif -# Distribution specific settings: -%if 0%{?suse_version} > 1001 -CFLAGS="${CFLAGS} -fstack-protector-all" -%endif -%if 0%{?suse_version} < 1001 -export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/opt/gnome/%{_lib}/pkgconfig:/opt/gnome/share/pkgconfig" -%endif -%if 0%{?suse_version} > 1020 -CFLAGS="$CFLAGS -fgnu89-inline" -%endif -%if 0%{?fedora_version} > 6 -CFLAGS="$CFLAGS -fgnu89-inline" -%endif export CFLAGS -./ConfigureMe configure --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} \ - --localstatedir=%{_var} --infodir=%{_infodir} \ - --mandir=%{_mandir} --libdir=%{_libdir} \ - --libexecdir=%{_libexecdir} \ - --with-ais-prefix=%{_prefix} \ -%if %without_fatal_warnings +./autogen.sh +%configure --localstatedir=%{_var} \ + --docdir=%{pcmk_docdir} \ --enable-fatal-warnings=no -%endif -export MAKE="make %{?jobs:-j%jobs}" -make %{?jobs:-j%jobs} +make %{_smp_mflags} + if [ -e /usr/share/xml/docbook/stylesheet/nwalsh/current ]; then make -C %{doc_pkg} man fi + ########################################################### %install @@ -196,13 +186,10 @@ fi chmod a+x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/crm_primitive.py chmod a+x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/hb2openais-helper.py rm $RPM_BUILD_ROOT/%{_libdir}/service_crm.so -( - cd $RPM_BUILD_ROOT/%{_sbindir} - rm crm_standby crm_master crm_failcount - ln crm_attribute crm_standby - ln crm_attribute crm_master - ln crm_attribute crm_failcount -) + +# Don't want to ship this just yet: +rm $RPM_BUILD_ROOT/usr/sbin/crm_report + #%if %with_ais_support # mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/lcrso # cp $RPM_BUILD_ROOT/%{_libdir}/service_crm.so $RPM_BUILD_ROOT/%{_libexecdir}/lcrso/pacemaker.lcrso @@ -214,7 +201,6 @@ find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f find $RPM_BUILD_ROOT -name '*.pyc' -type f -print0 | xargs -0 rm -f find $RPM_BUILD_ROOT -name '*.pyo' -type f -print0 | xargs -0 rm -f -rm -f $RPM_BUILD_ROOT%{_sbindir}/crm_uuid ########################################################### %clean @@ -231,12 +217,31 @@ rm -rf $RPM_BUILD_DIR/pacemaker %postun -n libpacemaker3 -p /sbin/ldconfig +%if %with_regression_tests + +%post -n libpacemaker-devel +if [ ! -e /tmp/.pcmk_regression_tests_ran ]; then + touch /tmp/.pcmk_regression_tests_ran + # Needed so that the shell doesn't get stuck on escape + # sequences + export TERM=dumb + /usr/share/pacemaker/tests/cli/regression.sh || true + /usr/share/pacemaker/tests/pengine/regression.sh -V || true + echo Now running shell regression tests ; date + if ! /usr/share/pacemaker/tests/shell/regression.sh ; then + echo "Shell tests failed." + cat crmtestout/regression.out + fi +fi +%endif + %files ########################################################### %defattr(-,root,root) %dir %{_libdir}/heartbeat %dir %{_var}/lib/heartbeat -%dir %{_datadir}/doc/packages/pacemaker +%dir %{pcmk_docdir} +%exclude %{_datadir}/pacemaker/tests %{_datadir}/pacemaker %{_libdir}/heartbeat/* %{_sbindir}/cibadmin @@ -256,22 +261,37 @@ rm -rf $RPM_BUILD_DIR/pacemaker %{_sbindir}/crm_shadow %{_sbindir}/cibpipe %{_sbindir}/crm_node -%doc %{_datadir}/doc/packages/pacemaker/AUTHORS -%doc %{_datadir}/doc/packages/pacemaker/README -%doc %{_datadir}/doc/packages/pacemaker/README.hb2openais -%doc %{_datadir}/doc/packages/pacemaker/COPYING -%doc %{_datadir}/doc/packages/pacemaker/COPYING.LGPL -%doc %{_datadir}/doc/packages/pacemaker/crm_cli.txt -%doc %{_mandir}/man8/*.8* +%{_sbindir}/crm_simulate +%{_sbindir}/fence_legacy +%{_sbindir}/stonith_admin +%{py_sitedir}/crm + %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/crm %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pengine %dir %attr (750, %{uname}, %{gname}) %{_var}/run/crm %dir /usr/lib/ocf %dir /usr/lib/ocf/resource.d /usr/lib/ocf/resource.d/pacemaker +%{_datadir}/snmp/mibs/PCMK-MIB.txt %if %with_ais_support +%dir %{_libexecdir}/lcrso +%{_libexecdir}/lcrso %{_libexecdir}/lcrso/pacemaker.lcrso %endif +%if !0%{?_without_heartbeat} +%{_sbindir}/crm_uuid +%else +%exclude %{_sbindir}/crm_uuid +%endif +%exclude /usr/lib/ocf/resource.d/pacemaker/o2cb +# Packaged elsewhere +%exclude %{pcmk_docdir}/AUTHORS +%exclude %{pcmk_docdir}/COPYING +%exclude %{pcmk_docdir}/COPYING.LIB +%doc %{pcmk_docdir} +# %doc %{pcmk_docdir}/*.html +%doc %{_mandir}/man8/*.8* +%doc %{_mandir}/man7/*.7* %files -n libpacemaker3 %defattr(-,root,root) @@ -287,8 +307,10 @@ rm -rf $RPM_BUILD_DIR/pacemaker %files -n libpacemaker-devel %defattr(-,root,root) #%doc %{_datadir}/doc/%{name}-%{version} +%{py_sitedir}/cts +%{_datadir}/pacemaker/tests %{_includedir}/pacemaker -%{_includedir}/heartbeat/fencing +# %{_includedir}/heartbeat/fencing %{_libdir}/*.so %changelog diff --git a/pacemaker.tar.bz2 b/pacemaker.tar.bz2 new file mode 100644 index 0000000..d5a91b5 --- /dev/null +++ b/pacemaker.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92837f40a03d1709943b0f452baa4ab4dad3a13314316950a5a43d0410ad1b88 +size 23281120 diff --git a/pacemaker.tar.gz b/pacemaker.tar.gz deleted file mode 100644 index f92a588..0000000 --- a/pacemaker.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db90c7e8a8d3468d5bc71106a8f2dea13433872fdde28ead6bbbefcf58dcb26c -size 790557