Diffusion Pacemaker 2cbb99f89ff5

Hg: Automated merge
2cbb99f89ff5
Actions

Description

Hg: Automated merge

Mercurial revision: 4477953aa6c36929be95ee9920eb2ab5cda6f9c3

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Jul 5 2010, 2:45 AM

Parents

rP8f902ffb9ea4: Low: Build: Allow easy building of the working directory
rP8a0f2f574fe9: High: crmd: Fix assertion failure when performing async resource failures

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

8f902ffb9ea4 Low: Build: Allow easy building of the working directory
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d00754022cfb Low: Build: Correctly expand package features in shell scripts
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6a4baadac20d Low: tools: crm_report - Grab everything up to EOF for tests that haven't…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7980d84da022 Low: tools: crm_report - Some extra debug information
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
dad9b4a8948e High: tools: crm_report - corosync.conf wont necessarily contain the text…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5f50e84ae72d Low: Remove debug messages now that proc updates are correctly parsed
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6efd0bcc1f7b High: Core: Correctly unpack HA_Messages containing multiple entries with the…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5cf84b75ce8d High: mcp: Read config early so we can re-initialize logging asap if daemonizing
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c0c2fe06ec59 Low: crmd: Extra debugging
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
49cfaaa067db High: mcp: Resend our process list after every CPG change
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0d740abb4df5 High: crmd: Base DC election on process relative uptime
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
86393dd542b7 High: crmd: Disable age as a criteria for cman based clusters, its not reliable…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
cc42ac230483 High: PE: Correctly handle pseudo action creation
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
f71891bb83d2 High: crmd: Allow non-DC nodes to clear failcounts too
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6e6115b1e7e5 Low: cts: Fix call to scenario.TearDown()
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
da6d6d720bc1 Medium: Build: Include calls to chkconfig in the post and preun scripts for rpm
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
17a16d70b5aa High: crmd: Only need to request quorum update for plugin based clusters
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d6dd29745d44 High: mcp: Fix macro expansion in init script
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
67b60bb9f2f3 Low: Build: Allow building against CMAN if present
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
10baf785a357 High: mcp: Rename the mcp binary to pacemakerd and create a 'pacemaker' init…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a070edefe4cd Low: cts: Clean up after a leaking corosync
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1a3b96263020 Low: Build: Easily build package variants
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4f2173d62f17 Low: Build: add cman support as a non-default build option
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d05878167a32 High: Support starting plugin-based Pacemaker clusters with the MCP as well
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b80a15becf10 High: mcp: Make sure we can compile the mcp without cman present
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
08574a2a70c3 High: mcp: Make sure we can compile the mcp without cman present
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
ccde24a735e9 High: cman: Make sure we can compile without cman present
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d0e499e135bd Low: Build: cman based clusters don't use a plugin at all, so no need to change…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0fd1b7d39a85 Low: Build: Hook up building of the new MCP
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
90459a9c78c8 High: Introduce two new cluster types 'cman' and 'corosync', replaces…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
9e0918e026c4 Low: ais: Move assertion to a more relevant location
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
cb452f0ea8bc High: mcp: New master control process for (re)spawning pacemaker daemons
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e49d1e136163 Medium: Core: Switch to coredir when not running from a regular login shell
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
54a3cfc1b6c7 High: cman: Filter directed messages not intended for us
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
393c9fc83969 Medium: ais: Fix autodetection of cman-based quorum
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
819fc0806c17 High: cman: Populate sender details for cpg messages
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
30572dec82ee Medium: cman: Autodetect when cman membership should be used
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b5d9a4b2ca62 Medium: cman: Switch to CPG for peer process messaging
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
031b5596a979 High: cman: Correctly process membership/quorum changes from the pcmk plugin.
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
8e939b0ad779 Medium: ais: Use the original service address unless building for cman
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
19f337b72230 Low: cman: Debugging
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c8b16f0a3c85 High: cman: Keep the list of peer processes up-to-date
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
43042b9c9594 High: cman: Grab the initial membership when we connect
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7d9f0a7d5c32 High: ais: Never allow quorum plugins to affect connection to the pacemaker…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a889446a75c0 Low: ais: Strip out the remaining support for openais
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
2f5ef195dd0c Medium: ais: Add the ability to use quorum directly from corosync
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
28f292edd936 Hg: Merge with 1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d933490d41ec Medium: cman: Tell fenced about completed stonith events
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
9b4fa1302781 Low: RA: controld - Start the regular RHCS daemons if we're using membership…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7ff3975f5ea1 Dev: Shell: fix changeset 3aa4c83ec3e5
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits

Changes (40)

Path

Size

crmd/

cts/

doc/

extra/

resources/

controld

include/

crm/

common/

lib/

ais/

common/

pengine/

	mcp/
	lib/	cib/

Makefile.am

pacemaker.spec

shell/

modules/

tools/

rP2cbb99f89ff5

View Options

GNUmakefile

View Options

Makefile.am

View Options

configure.ac

View Options

crmd/Makefile.am

View Options

crmd/control.c

View Options

crmd/corosync.c

View Options

crmd/election.c

View Options

crmd/messages.c

View Options

crmd/te_utils.c

View Options

cts/CTS.py

View Options

cts/CTSscenarios.py

View Options

doc/crm_cli.txt

View Options

extra/resources/controld

View Options

include/crm/ais.h

View Options

include/crm/common/cluster.h

View Options

include/crm/common/util.h

View Options

include/crm/msg_xml.h

View Options

lib/ais/plugin.c

View Options

lib/ais/utils.c

View Options

lib/ais/utils.h

View Options

lib/common/ais.c

View Options

lib/common/cluster.c

View Options

lib/common/membership.c

View Options

lib/common/stack.h

View Options

lib/common/utils.c

View Options

lib/common/xml.c

View Options

lib/pengine/utils.c

View Options

mcp/Makefile.am

View Options

mcp/corosync.c

View Options

mcp/pacemaker.c

View Options

mcp/pacemaker.h

View Options

mcp/pacemaker.in

View Options

pacemaker.spec

View Options

shell/modules/cibconfig.py

View Options

shell/modules/cibstatus.py

View Options

shell/modules/ui.py.in

View Options

tools/crm_report.in

View Options

tools/report.collector

View Options

Hg: Automated merge2cbb99f89ff5Actions

Description

Details

Event Timeline

Merged Changes

Changes (40)

rP2cbb99f89ff5

GNUmakefile

Makefile.am

configure.ac

crmd/Makefile.am

crmd/control.c

crmd/corosync.c

crmd/election.c

crmd/messages.c

crmd/te_utils.c

cts/CTS.py

cts/CTSscenarios.py

doc/crm_cli.txt

extra/resources/controld

include/crm/ais.h

include/crm/common/cluster.h

include/crm/common/util.h

include/crm/msg_xml.h

lib/ais/plugin.c

lib/ais/utils.c

lib/ais/utils.h

lib/common/ais.c

lib/common/cluster.c

lib/common/membership.c

lib/common/stack.h

lib/common/utils.c

lib/common/xml.c

lib/pengine/utils.c

mcp/Makefile.am

mcp/corosync.c

mcp/pacemaker.c

mcp/pacemaker.h

mcp/pacemaker.in

pacemaker.spec

shell/modules/cibconfig.py

shell/modules/cibstatus.py

shell/modules/ui.py.in

tools/crm_report.in

tools/report.collector

tools/report.common

Hg: Automated merge
2cbb99f89ff5
Actions