Diffusion Pacemaker 80e79172903c

Merge branch '1.1'
80e79172903c
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch '1.1'

Conflicts:
cts/CTSlab.py

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Jun 15 2014, 11:51 PM

Parents

rP3f6f842f75fb: Bug rhbz#1054307 - cname pattern match should be more restrictive in init script
rP5588e363526d: Merge pull request #540 from krig/readme-shells

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

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

3f6f842f75fb Bug rhbz#1054307 - cname pattern match should be more restrictive in init script
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
97629ded958f Bug cl#5219 - PE: Allow unrelated resources with a common colocation target to…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4f00ccce11db Bug cl#5222 - Enable legacy mode whenever a broadcast update is detected
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0d85614af078 Merge pull request #542 from gao-yan/xml-diff-check
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
cee935ff9ab3 Fix: xml: Prevent incorrect xml diffs from corrupting the cib
Author
gao-yan
Browse Repository
No Audits
5de17b267962 Merge pull request #541 from yuusuke/fix_log
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
ba8e10532b8e Log: Reduce the log when pacemakerd is run on command.
Author
yuusuke <yusk.iida@gmail.com>
Browse Repository
No Audits
524a790d43f1 Merge pull request #538 from inouekazu/1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c258ed5f4bc5 Merge pull request #539 from gao-yan/search-node-uname
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
8e5d4ceb59ba mainloop: implement gio_poll_dispatch_mod
Author
Michael Chapman <mike@very.puzzling.org>
Browse Repository
No Audits
2b52f8cf5c8e Fix: cluster: Prevent search of unames from attempting to create node entries…
Author
gao-yan
Browse Repository
No Audits
6fef52bce613 Low: mcp: Add config example to exert watchdog of corosync
Author
inouekazu
Browse Repository
No Audits
734e6b538b0a Fix: crm_report: Gracefully handle rediculously large logfiles
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
34721d2829c4 Bug cl#5222 - cib: Repair rolling update capability
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
8563023fd89a Test: cts: Provide more instructions when setting up cts
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
912c7e146afc Fix: cib: Use a better option name for enabling the legacy cib diff code
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e362ffe0ce26 Merge pull request #536 from davidvossel/cts-lxc-updates
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
945c354e4b0e Merge pull request #535 from gao-yan/cib-sync-request-assert
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
14f1ecb4a559 Low: pengine: regression test updates for recent container fixes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
efe9927f0f9f High: remote: clear remote-node status correctly
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
59bd43b002a3 Low: cts: fix how lxc_autogen handles placing resources on remote nodes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
ebb4645df4f1 Low: cts: reference ping resource by clone id in location constraints
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
7df3e48769a7 Fix: pengine: properly handle fencing of container remote-nodes when the…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
82e6bd30f182 Fix: remote: Handle request/response ipc proxy correctly
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
e854c9bf003b Fix: cib: Prevent assert on sending cib sync requests
Author
gao-yan
Browse Repository
No Audits
f3c8490f0e73 Merge pull request #532 from gao-yan/load-stopped-migrate
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
bb6084bceb19 Merge pull request #534 from gao-yan/remove-temp-shadow
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
16e70ade9cdf Fix: crm_simulate: Clean up temporary shadow files on exit
Author
gao-yan
Browse Repository
No Audits
c64608ed859a Test: pengine: cl#5200 - Before migrating utilization-using resources to a node…
Author
gao-yan
Browse Repository
No Audits
6c16cc1043ee Fix: pengine: cl#5200 - Before migrating utilization-using resources to a node…
Author
gao-yan
Browse Repository
No Audits
d924912c046b Fix: Fencing: Cache metadata lookups to avoid repeated blocking during device…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e647feca3bca Merge pull request #531 from davidvossel/cts-lxc-updates
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
aa994b10fa21 Low: pengine: container is remote regression test
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9f834d4b39b8 Fix: pengine: properly place resource within a container when container is a…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
e847b035e57b Low: cts: fixes syntax error
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
2bc1061b0559 Fix: mainloop: Better handle the killing of processes in the act of exiting
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b8abdb3850b7 Fix: services: Remove cancelled recurring ops from internal lists as early as…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c2047468f4c1 Fix: services: Remove file descriptors from mainloop as soon as we have drained…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5e2e37c6c7e3 Log: services: Some extra detail about which pid is being killed
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
429db487de7d Merge pull request #530 from davidvossel/cts-lxc-updates
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d17f258087af Low: pengine: Update pengine regression test to reflect corrected LogActions…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
994faad2deec Low: pengine: Don't report a resource as restarting when it is a moving…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
fdd473517da2 Fix: pengine: avoid assert by searching for stop action on correct node during…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
146d71beb5de Low: cts: properly detect when test environment is incapable of running…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
422bd26f357d Low: cts: Avoid asking for user permission during lxc_autogen script
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
abb9cd9976f5 Low: cts: Use a more reliable way to set lxc network addresses for container…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
559f733e8818 Log: cib: Drop the message serverity now that the cause is well understood
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
dc71cd2a47e9 Fix: crmd: Avoid spamming the cib by triggering a transition only once per non…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
9776707a6232 Merge pull request #522 from gao-yan/pengine-segfault
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a1835403eec7 Merge branch 'master' into 1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits

Changes (118)

Path

Size

attrd/

cib/

crmd/

remote_lrmd_ra.c

cts/

lxc_autogen.sh.in

doc/

Pacemaker_Explained/

en-US/

fencing/

include/

crm/

cluster/

common/

pengine/

lib/

cib/

cluster/

common/

pengine/

services/

services_linux.c

lrmd/

mcp/

pacemaker.combined.upstart.in

pacemaker.spec.in

pengine/

test10/

9-am-then-bm-b-migrating-a-stopping.summary

bug-5028.summary

bug-cl-5212.dot

bug-cl-5212.exp

bug-cl-5212.scores

bug-cl-5212.summary

bug-cl-5212.xml

bug-cl-5213.dot

bug-cl-5213.exp

bug-cl-5213.scores

bug-cl-5213.summary

bug-cl-5213.xml

bug-cl-5219.dot

bug-cl-5219.exp

bug-cl-5219.scores

bug-cl-5219.summary

bug-cl-5219.xml

bug-rh-1097457.dot

bug-rh-1097457.exp

bug-rh-1097457.scores

bug-rh-1097457.summary

bug-rh-1097457.xml

bug-rh-880249.summary

cluster-specific-params.xml

colo_master_w_native.scores

container-is-remote-node.dot

container-is-remote-node.exp

container-is-remote-node.scores

container-is-remote-node.summary

container-is-remote-node.xml

group14.summary

migrate-begin.dot

migrate-begin.exp

migrate-begin.summary

migrate-both-vms.dot

migrate-both-vms.exp

migrate-both-vms.summary

quorum-3.summary

rec-node-10.summary

rec-node-8.summary

site-specific-params.dot

site-specific-params.exp

site-specific-params.scores

site-specific-params.summary

site-specific-params.xml

unmanaged-block-restart.dot

unmanaged-block-restart.exp

unmanaged-block-restart.scores

unmanaged-block-restart.summary

unmanaged-block-restart.xml

utilization-order3.dot

utilization-order3.exp

utilization-order3.summary

utilization-order4.dot

utilization-order4.exp

utilization-order4.summary

whitebox-fail1.exp

whitebox-fail2.exp

whitebox-fail3.exp

whitebox-migrate1.exp

whitebox-move.exp

whitebox-ms-ordering.exp

whitebox-start.exp

whitebox-stop.exp

whitebox-unexpectedly-running.exp

tools/

report.common.in

rP80e79172903c

attrd/commands.c

Loading...

cib/callbacks.c

Loading...

cib/cibmessages.h

Loading...

cib/common.h

Loading...

cib/io.c

Loading...

cib/main.c

Loading...

cib/messages.c

Loading...

crmd/control.c

Loading...

crmd/crmd_fsa.h

Loading...

crmd/election.c

Loading...

crmd/fsa.c

Loading...

crmd/lrm.c

Loading...

crmd/lrm_state.c

Loading...

crmd/remote_lrmd_ra.c

Loading...

crmd/te_callbacks.c

Loading...

crmd/te_utils.c

Loading...

cts/CTStests.py

Loading...

cts/cts

Loading...

cts/lxc_autogen.sh.in

Loading...

doc/Pacemaker_Explained/en-US/Ch-Options.txt

Loading...

fencing/commands.c

Loading...

fencing/main.c

Loading...

include/crm/cluster/internal.h

Loading...

include/crm/common/ipc.h

Loading...

include/crm/common/ipcs.h

Loading...

include/crm/msg_xml.h

Loading...

include/crm/pengine/status.h

Loading...

lib/cib/cib_ops.c

Loading...

lib/cluster/cluster.c

Loading...

lib/cluster/corosync.c

Loading...

lib/common/ipc.c

Loading...

lib/common/mainloop.c

Loading...

lib/common/xml.c

Loading...

lib/pengine/unpack.c

Loading...

lib/pengine/utils.c

Loading...

lib/services/dbus.c

Loading...

lib/services/services.c

Loading...

lib/services/services_linux.c

Loading...

lib/services/systemd.c

Loading...

lrmd/ipc_proxy.c

Loading...

mcp/pacemaker.c

Loading...

mcp/pacemaker.combined.upstart.in

Loading...

mcp/pacemaker.in

Loading...

pacemaker.spec.in

Loading...

pengine/Makefile.am

Loading...

pengine/allocate.c

Loading...

pengine/graph.c

Loading...

pengine/master.c

Loading...

pengine/native.c

Loading...

pengine/regression.sh

Loading...

pengine/test10/797.summary

Loading...

pengine/test10/9-am-then-bm-b-migrating-a-stopping.summary

Loading...

pengine/test10/bug-5028.summary

Loading...

pengine/test10/bug-cl-5212.dot

Loading...

pengine/test10/bug-cl-5212.exp

Loading...

pengine/test10/bug-cl-5212.scores

Loading...

pengine/test10/bug-cl-5212.summary

Loading...

pengine/test10/bug-cl-5212.xml

Loading...

pengine/test10/bug-cl-5213.dot

Loading...

pengine/test10/bug-cl-5213.exp

Loading...

pengine/test10/bug-cl-5213.scores

Loading...

pengine/test10/bug-cl-5213.summary

Loading...

pengine/test10/bug-cl-5213.xml

Loading...

pengine/test10/bug-cl-5219.dot

Loading...

pengine/test10/bug-cl-5219.exp

Loading...

pengine/test10/bug-cl-5219.scores

Loading...

pengine/test10/bug-cl-5219.summary

Loading...

pengine/test10/bug-cl-5219.xml

Loading...

pengine/test10/bug-rh-1097457.dot

Loading...

pengine/test10/bug-rh-1097457.exp

Loading...

pengine/test10/bug-rh-1097457.scores

Loading...

pengine/test10/bug-rh-1097457.summary

Loading...

pengine/test10/bug-rh-1097457.xml

Loading...

pengine/test10/bug-rh-880249.summary

Loading...

pengine/test10/cluster-specific-params.xml

Loading...

pengine/test10/colo_master_w_native.scores

Loading...

pengine/test10/container-is-remote-node.dot

Loading...

pengine/test10/container-is-remote-node.exp

Loading...

pengine/test10/container-is-remote-node.scores

Loading...

pengine/test10/container-is-remote-node.summary

Loading...

pengine/test10/container-is-remote-node.xml

Loading...

pengine/test10/group14.summary

Loading...

pengine/test10/migrate-begin.dot

Loading...

pengine/test10/migrate-begin.exp

Loading...

pengine/test10/migrate-begin.summary

Loading...

pengine/test10/migrate-both-vms.dot

Loading...

pengine/test10/migrate-both-vms.exp

Loading...

pengine/test10/migrate-both-vms.summary

Loading...

pengine/test10/quorum-3.summary

Loading...

pengine/test10/rec-node-10.summary

Loading...

pengine/test10/rec-node-8.summary

Loading...

pengine/test10/site-specific-params.dot

Loading...

pengine/test10/site-specific-params.exp

Loading...

pengine/test10/site-specific-params.scores

Loading...

pengine/test10/site-specific-params.summary

Loading...

pengine/test10/site-specific-params.xml

Loading...

pengine/test10/unmanaged-block-restart.dot

Loading...

pengine/test10/unmanaged-block-restart.exp

Loading...

pengine/test10/unmanaged-block-restart.scores

Loading...

pengine/test10/unmanaged-block-restart.summary

Loading...

pengine/test10/unmanaged-block-restart.xml

Loading...

pengine/test10/utilization-order3.dot

Loading...

pengine/test10/utilization-order3.exp

Loading...

pengine/test10/utilization-order3.summary

Loading...

pengine/test10/utilization-order4.dot

Loading...

pengine/test10/utilization-order4.exp

Loading...

pengine/test10/utilization-order4.summary

Loading...

pengine/test10/whitebox-fail1.exp

Loading...

pengine/test10/whitebox-fail2.exp

Loading...

pengine/test10/whitebox-fail3.exp

Loading...

pengine/test10/whitebox-migrate1.exp

Loading...

pengine/test10/whitebox-move.exp

Loading...

pengine/test10/whitebox-ms-ordering.exp

Loading...

pengine/test10/whitebox-start.exp

Loading...

pengine/test10/whitebox-stop.exp

Loading...

pengine/test10/whitebox-unexpectedly-running.exp

Loading...

tools/crm_simulate.c

Loading...

tools/report.common.in

Loading...