Merge pull request #2938 from ClusterLabs/2.1
39209c14e951
Actions

Description

Merge pull request #2938 from ClusterLabs/2.1

Pull 2.1.5-rc2 back into main

Details

Provenance

kgaillot	Authored on Nov 15 2022, 4:17 PM
GitHub <noreply@github.com>	Committed on Nov 15 2022, 4:17 PM

Parents

rPf319114963a5: Merge pull request #2924 from nrwahl2/nrwahl2-T246
rPd3699a6216bd: Doc: ChangeLog: update for 2.1.5-rc2 release

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed rP39209c14e951: Merge pull request #2938 from ClusterLabs/2.1 (authored by kgaillot).Nov 15 2022, 4:17 PM

Merged Changes

d3699a6216bd Doc: ChangeLog: update for 2.1.5-rc2 release
Author
kgaillot
Browse Repository
No Audits
421518056611 Low: tools: quote timestamp in operation history output
Author
kgaillot
Browse Repository
No Audits
22404026ba67 Refactor: libcrmcommon: avoid switch fall-through
Author
kgaillot
Browse Repository
No Audits
97f63017195e Merge pull request #2931 from gao-yan/cts-cli-crm_resource--list-operations
Author
kgaillot
Browse Repository
No Audits
c63fa84ec604 Merge pull request #2934 from clumens/set-utilization
Author
kgaillot
Browse Repository
No Audits
7abf528ca84b Merge pull request #2929 from kgaillot/groups
Author
kgaillot
Browse Repository
No Audits
721670a4cbf2 Doc: scheduler: clarify a comment
Author
kgaillot
Browse Repository
No Audits
7637ce173781 Test: cts-cli: Add a test for setting/querying a utilization attr.
Author
clumens
Browse Repository
No Audits
566fb0c5cea8 Low: tools: Fix setting utilization attrs with crm_attribute.
Author
clumens
Browse Repository
No Audits
a072fd3c68d3 Test: cts-cli: add test for text output of crm_resource --list-operations/-O
Author
gao-yan
Browse Repository
No Audits
4b5789da4e5a Merge pull request #2930 from clumens/multi-message-bug
Author
kgaillot
Browse Repository
No Audits
012ae78322cf Low: daemons: Set an attribute on the child of a multi-attr message.
Author
clumens
Browse Repository
No Audits
f4d07a6edcef Test: cts-scheduler: update promoted-with-blocked test for colocation fix
Author
kgaillot
Browse Repository
No Audits
2edade14f94d Fix: scheduler: consider roles when blocking colocation dependents
Author
kgaillot
Browse Repository
No Audits
8290289d7fec Test: cts-scheduler: add regression test for promoted role with blocked resource
Author
kgaillot
Browse Repository
No Audits
4b944eb3a95a Test: cts-scheduler: update test outputs for colocation change
Author
kgaillot
Browse Repository
No Audits
092d2228eea0 Low: scheduler: when blocking starts, block children's starts as well
Author
kgaillot
Browse Repository
No Audits
ba419204ab9a Merge pull request #2926 from kgaillot/groups
Author
kgaillot
Browse Repository
No Audits
bd9895a6e35a Test: cts-cli: add test for crm_resource --constraints --force
Author
kgaillot
Browse Repository
No Audits
38788c56f25b Test: cts-cli: add fencing device to constraints.xml
Author
kgaillot
Browse Repository
No Audits
89d5809db3e9 Feature: tools: crm_resource --constraints now accepts --force
Author
kgaillot
Browse Repository
No Audits
eca4f5d88dee Feature: tools: crm_resource --constraints --recursive
Author
kgaillot
Browse Repository
No Audits
f9ef5bfc87eb Refactor: rename "stacks-constraints" message
Author
kgaillot
Browse Repository
No Audits
2e5322c4a75a Merge pull request #2925 from clumens/i686-cmocka-2.1
Author
kgaillot
Browse Repository
No Audits
d57379d2a2e0 Tests: Fix running pcmk__procfs_pid2path_test on i686.
Author
clumens
Browse Repository
No Audits
812b6120195a Merge pull request #2920 from gao-yan/reset_options-syntax
Author
kgaillot
Browse Repository
No Audits
6b71332eca12 Fix: tools: fix syntax on resetting options in crm_resource
Author
gao-yan
Browse Repository
No Audits
0b3656e850ea Merge pull request #2916 from kgaillot/groups
Author
kgaillot
Browse Repository
No Audits
38196514b9b9 Doc: Pacemaker Explained: clarify how advisory colocation constraints behave
Author
kgaillot
Browse Repository
No Audits
469e2c4ceb69 Refactor: scheduler: prioritize clone colocations properly
Author
kgaillot
Browse Repository
No Audits
caab312f807a Test: cts-scheduler: update colocation-priority-group outputs for fix
Author
kgaillot
Browse Repository
No Audits
018dc240fe65 Fix: scheduler: prioritize group colocations properly
Author
kgaillot
Browse Repository
No Audits
47cf8c5c7a7d Refactor: scheduler: functionize adding colocations to resources
Author
kgaillot
Browse Repository
No Audits
3a94d679a7e5 Refactor: scheduler: ignore empty groups in group-specific function
Author
kgaillot
Browse Repository
No Audits
92197a3cf632 Refactor: scheduler: functionize non-group colocation table initialization
Author
kgaillot
Browse Repository
No Audits
b60a4ec51ef9 Refactor: scheduler: functionize group colocation table initialization
Author
kgaillot
Browse Repository
No Audits
c2eb24f02741 Low: scheduler: ignore empty groups in pcmk__add_colocated_node_scores()
Author
kgaillot
Browse Repository
No Audits
84c95c0276a3 Test: cts-scheduler: update scores for colocation change
Author
kgaillot
Browse Repository
No Audits
60343e7cc794 Fix: scheduler: properly consider effect of "with group" colocations
Author
kgaillot
Browse Repository
No Audits
f899c8c3f5cf Low: scheduler: ensure group methods handle empty groups
Author
kgaillot
Browse Repository
No Audits
11abdbfabd88 Refactor: scheduler: use pe__last_group_member() where appropriate
Author
kgaillot
Browse Repository
No Audits
7fb6962bdee2 Refactor: scheduler: drop dead code related to versioned attributes
Author
kgaillot
Browse Repository
No Audits
5892a2bd9d63 Low: scheduler: improve error handling when unpacking resources
Author
kgaillot
Browse Repository
No Audits
c05bb8df3b36 Test: cts-scheduler: add test for group stickiness outweighing anti-colocation
Author
kgaillot
Browse Repository
No Audits
9b0e2177c940 Test: cts-scheduler: add test for group colocations with different primary…
Author
kgaillot
Browse Repository
No Audits
dd2670e91ac1 Test: cts-scheduler: add test for colocated groups with failed dependent
Author
kgaillot
Browse Repository
No Audits
1807d55f0f08 Test: cts-scheduler: add test for anti-colocated groups with failed dependent
Author
kgaillot
Browse Repository
No Audits

Changes (58)

Path

Size

ChangeLog

cts/

cli/

scheduler/

dot/

colocation-priority-group.dot

colocation-vs-stickiness.dot

group-anticolocation.dot

group-colocation-failure.dot

promoted-with-blocked.dot

exp/

colocation-priority-group.exp

colocation-vs-stickiness.exp

group-anticolocation.exp

group-colocation-failure.exp

promoted-with-blocked.exp

scores/

colocation-priority-group.scores

colocation-vs-stickiness.scores

group-anticolocation.scores

group-colocation-failure.scores

group-dependents.scores

promoted-partially-demoted-group.scores

promoted-with-blocked.scores

summary/

bundle-order-partial-stop.summary

bundle-order-stop.summary

colocation-priority-group.summary

colocation-vs-stickiness.summary

group-anticolocation.summary

group-colocation-failure.summary

promoted-with-blocked.summary

xml/

colocation-priority-group.xml

colocation-vs-stickiness.xml

group-anticolocation.xml

group-colocation-failure.xml

promoted-with-blocked.xml

daemons/

attrd/

attrd_corosync.c

doc/

sphinx/

Pacemaker_Explained/

constraints.rst

lib/

common/

operations.c

options.c

tests/

procfs/

pcmk__procfs_pid2path_test.c

pacemaker/

libpacemaker_private.h

pcmk_output.c

pcmk_sched_actions.c

pcmk_sched_clone.c

pcmk_sched_colocation.c

pcmk_sched_group.c

pcmk_sched_ordering.c

pcmk_sched_primitive.c

pcmk_sched_promotable.c

pcmk_sched_resource.c

pengine/

tools/

rP39209c14e951

View Options

ChangeLog

View Options

cts/cli/constraints.xml

View Options

cts/cli/regression.tools.exp

View Options

cts/cts-cli.in

View Options

cts/cts-scheduler.in

View Options

cts/scheduler/dot/colocation-priority-group.dot

View Options

cts/scheduler/dot/colocation-vs-stickiness.dot

View Options

cts/scheduler/dot/group-anticolocation.dot

View Options

cts/scheduler/dot/group-colocation-failure.dot

View Options

cts/scheduler/dot/promoted-with-blocked.dot

View Options

cts/scheduler/exp/colocation-priority-group.exp

View Options

cts/scheduler/exp/colocation-vs-stickiness.exp

View Options

cts/scheduler/exp/group-anticolocation.exp

View Options

cts/scheduler/exp/group-colocation-failure.exp

View Options

cts/scheduler/exp/promoted-with-blocked.exp

View Options

cts/scheduler/scores/colocation-priority-group.scores

View Options

cts/scheduler/scores/colocation-vs-stickiness.scores

View Options

cts/scheduler/scores/group-anticolocation.scores

View Options

cts/scheduler/scores/group-colocation-failure.scores

View Options

cts/scheduler/scores/group-dependents.scores

View Options

cts/scheduler/scores/promoted-partially-demoted-group.scores

View Options

cts/scheduler/scores/promoted-with-blocked.scores

View Options

cts/scheduler/summary/bundle-order-partial-stop.summary

View Options

cts/scheduler/summary/bundle-order-stop.summary

View Options

cts/scheduler/summary/colocation-priority-group.summary

View Options

cts/scheduler/summary/colocation-vs-stickiness.summary

View Options

cts/scheduler/summary/group-anticolocation.summary

View Options

cts/scheduler/summary/group-colocation-failure.summary

View Options

cts/scheduler/summary/promoted-with-blocked.summary

View Options

cts/scheduler/xml/colocation-priority-group.xml

View Options

cts/scheduler/xml/colocation-vs-stickiness.xml

View Options

cts/scheduler/xml/group-anticolocation.xml

View Options

cts/scheduler/xml/group-colocation-failure.xml

View Options

cts/scheduler/xml/promoted-with-blocked.xml

View Options

daemons/attrd/attrd_corosync.c

View Options

doc/sphinx/Pacemaker_Explained/constraints.rst

View Options

lib/common/operations.c

View Options

lib/common/options.c

View Options

lib/common/tests/procfs/pcmk__procfs_pid2path_test.c

View Options

lib/pacemaker/libpacemaker_private.h

View Options

lib/pacemaker/pcmk_output.c

View Options

lib/pacemaker/pcmk_sched_actions.c

View Options

lib/pacemaker/pcmk_sched_clone.c

View Options

lib/pacemaker/pcmk_sched_colocation.c

View Options

lib/pacemaker/pcmk_sched_group.c

View Options

lib/pacemaker/pcmk_sched_ordering.c

View Options

lib/pacemaker/pcmk_sched_primitive.c

View Options

lib/pacemaker/pcmk_sched_promotable.c

View Options

lib/pacemaker/pcmk_sched_resource.c

View Options

lib/pengine/bundle.c

View Options

lib/pengine/clone.c

View Options

lib/pengine/complex.c

View Options

lib/pengine/group.c

View Options

lib/pengine/pe_actions.c

View Options

lib/pengine/pe_output.c

View Options

lib/pengine/unpack.c

View Options

tools/crm_attribute.c

View Options

Merge pull request #2938 from ClusterLabs/2.139209c14e951Actions

Description

Details

Event Timeline

Merged Changes

Changes (58)

rP39209c14e951

ChangeLog

cts/cli/constraints.xml

cts/cli/regression.tools.exp

cts/cts-cli.in

cts/cts-scheduler.in

cts/scheduler/dot/colocation-priority-group.dot

cts/scheduler/dot/colocation-vs-stickiness.dot

cts/scheduler/dot/group-anticolocation.dot

cts/scheduler/dot/group-colocation-failure.dot

cts/scheduler/dot/promoted-with-blocked.dot

cts/scheduler/exp/colocation-priority-group.exp

cts/scheduler/exp/colocation-vs-stickiness.exp

cts/scheduler/exp/group-anticolocation.exp

cts/scheduler/exp/group-colocation-failure.exp

cts/scheduler/exp/promoted-with-blocked.exp

cts/scheduler/scores/colocation-priority-group.scores

cts/scheduler/scores/colocation-vs-stickiness.scores

cts/scheduler/scores/group-anticolocation.scores

cts/scheduler/scores/group-colocation-failure.scores

cts/scheduler/scores/group-dependents.scores

cts/scheduler/scores/promoted-partially-demoted-group.scores

cts/scheduler/scores/promoted-with-blocked.scores

cts/scheduler/summary/bundle-order-partial-stop.summary

cts/scheduler/summary/bundle-order-stop.summary

cts/scheduler/summary/colocation-priority-group.summary

cts/scheduler/summary/colocation-vs-stickiness.summary

cts/scheduler/summary/group-anticolocation.summary

cts/scheduler/summary/group-colocation-failure.summary

cts/scheduler/summary/promoted-with-blocked.summary

cts/scheduler/xml/colocation-priority-group.xml

cts/scheduler/xml/colocation-vs-stickiness.xml

cts/scheduler/xml/group-anticolocation.xml

cts/scheduler/xml/group-colocation-failure.xml

cts/scheduler/xml/promoted-with-blocked.xml

daemons/attrd/attrd_corosync.c

doc/sphinx/Pacemaker_Explained/constraints.rst

lib/common/operations.c

lib/common/options.c

lib/common/tests/procfs/pcmk__procfs_pid2path_test.c

lib/pacemaker/libpacemaker_private.h

lib/pacemaker/pcmk_output.c

lib/pacemaker/pcmk_sched_actions.c

lib/pacemaker/pcmk_sched_clone.c

lib/pacemaker/pcmk_sched_colocation.c

lib/pacemaker/pcmk_sched_group.c

lib/pacemaker/pcmk_sched_ordering.c

lib/pacemaker/pcmk_sched_primitive.c

lib/pacemaker/pcmk_sched_promotable.c

lib/pacemaker/pcmk_sched_resource.c

lib/pengine/bundle.c

lib/pengine/clone.c

lib/pengine/complex.c

lib/pengine/group.c

lib/pengine/pe_actions.c

lib/pengine/pe_output.c

lib/pengine/unpack.c

tools/crm_attribute.c

tools/crm_resource.c

Merge pull request #2938 from ClusterLabs/2.1
39209c14e951
Actions