Diffusion Pacemaker e39c27b86e26

Merge pull request #3137 from nrwahl2/nrwahl2-fixes
e39c27b86e26
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge pull request #3137 from nrwahl2/nrwahl2-fixes

Fix: scheduler: Clone instances should not shuffle unnecessarily

Details

Provenance

kgaillot	Authored on Jul 6 2023, 10:14 AM
GitHub <noreply@github.com>	Committed on Jul 6 2023, 10:14 AM

Parents

rPb561198c85ba: Refactor: libpacemaker: Use instance for trace tag in preferred_node()
rP345ee73b735e: Merge pull request #3149 from kgaillot/build

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed rPe39c27b86e26: Merge pull request #3137 from nrwahl2/nrwahl2-fixes (authored by kgaillot).Jul 6 2023, 10:14 AM

Merged Changes

b561198c85ba Refactor: libpacemaker: Use instance for trace tag in preferred_node()
Author
nrwahl2
Browse Repository
No Audits
10401c1655d4 Test: scheduler: Update outputs for promotable bundle colocation fix
Author
nrwahl2
Browse Repository
No Audits
d774d070fa52 Fix: libpacemaker: Honor role-based colocations for bundles
Author
nrwahl2
Browse Repository
No Audits
126930b03ea2 Refactor: libpacemaker: Bundle constraints can apply to bundled resource
Author
nrwahl2
Browse Repository
No Audits
8688ee9d68e4 Refactor: libpe_status: New pe__clone_flag_is_set() function
Author
nrwahl2
Browse Repository
No Audits
d05eb46bd832 Test: scheduler: Update outputs for primitive-with-promoted-bundle
Author
nrwahl2
Browse Repository
No Audits
d7649873a3ba Refactor: libpacemaker: Fix some primitive-with-promoted-bundle colocs
Author
nrwahl2
Browse Repository
No Audits
b51084c0e62b Refactor: libpacemaker: Pass target_rsc to add_colocated_node_scores()
Author
nrwahl2
Browse Repository
No Audits
5215359ad8f8 Refactor: libpacemaker: const colocation arg (add_colocated_node_scores)
Author
nrwahl2
Browse Repository
No Audits
a76cc89644b2 Refactor: various: New force_host arg for pe_node_attribute_calculated()
Author
nrwahl2
Browse Repository
No Audits
aabb9e659b5f Test: scheduler: Update after fixing anticolocation roles
Author
nrwahl2
Browse Repository
No Audits
1560e4752439 Fix: libpacemaker: Anti-colocations affect scores when roles match
Author
nrwahl2
Browse Repository
No Audits
b599fba23255 Test: scheduler: Update outputs after dropping colocation code
Author
nrwahl2
Browse Repository
No Audits
2984222d4665 Refactor: libpacemaker: Drop pcmk__add_collective_constraints()
Author
nrwahl2
Browse Repository
No Audits
5a58756f2291 Test: scheduler: Fix incorrect promotion scores in promoted-probed-score
Author
nrwahl2
Browse Repository
No Audits
b950ced61a37 Test: scheduler: Update test outputs after clone instance shuffling fix
Author
nrwahl2
Browse Repository
No Audits
512556ebd82c Fix: libpacemaker: Don't shuffle clone instances unnecessarily
Author
nrwahl2
Browse Repository
No Audits
0d3faea124cd Test: scheduler: Update tests after new stop_if_fail argument
Author
nrwahl2
Browse Repository
No Audits
4554a4eae89e Refactor: libpacemaker: New stop_if_fail argument for assign() method
Author
nrwahl2
Browse Repository
No Audits
7b643c8a86ba Refactor: libpacemaker: Return chosen node from assign_instance()
Author
nrwahl2
Browse Repository
No Audits
8eee259fdede Refactor: libpe_status: Copy count in pe__copy_node()
Author
nrwahl2
Browse Repository
No Audits
ce3818c8f2db Refactor: libpacemaker: Functionize updating parent allowed node count
Author
nrwahl2
Browse Repository
No Audits
522bb9228e6d Refactor: libpacemaker: Check whether instance already assigned
Author
nrwahl2
Browse Repository
No Audits

Changes (174)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

cts/

scheduler/

dot/

bundle-promoted-anticolocation-1.dot

bundle-promoted-anticolocation-2.dot

bundle-promoted-anticolocation-3.dot

bundle-promoted-anticolocation-4.dot

bundle-promoted-anticolocation-5.dot

bundle-promoted-anticolocation-6.dot

bundle-promoted-colocation-2.dot

bundle-promoted-colocation-3.dot

bundle-promoted-colocation-4.dot

bundle-promoted-colocation-5.dot

bundle-promoted-colocation-6.dot

cancel-behind-moving-remote.dot

clone-recover-no-shuffle-4.dot

clone-recover-no-shuffle-5.dot

clone-recover-no-shuffle-6.dot

clone-recover-no-shuffle-7.dot

promoted-probed-score.dot

exp/

bundle-promoted-anticolocation-1.exp

bundle-promoted-anticolocation-2.exp

bundle-promoted-anticolocation-3.exp

bundle-promoted-anticolocation-4.exp

bundle-promoted-anticolocation-5.exp

bundle-promoted-anticolocation-6.exp

bundle-promoted-colocation-2.exp

bundle-promoted-colocation-3.exp

bundle-promoted-colocation-4.exp

bundle-promoted-colocation-5.exp

bundle-promoted-colocation-6.exp

cancel-behind-moving-remote.exp

clone-recover-no-shuffle-4.exp

clone-recover-no-shuffle-5.exp

clone-recover-no-shuffle-6.exp

clone-recover-no-shuffle-7.exp

promoted-probed-score.exp

scores/

a-promote-then-b-migrate.scores

bug-1822.scores

bug-5014-CLONE-A-stop-B-started.scores

bug-5143-ms-shuffle.scores

bug-5186-partial-migrate.scores

bug-cl-5168.scores

bug-lf-2106.scores

bug-lf-2153.scores

bug-lf-2171.scores

bug-lf-2422.scores

bug-lf-2453.scores

bug-lf-2551.scores

bug-lf-2574.scores

bug-lf-2581.scores

bug-lf-2619.scores

bug-n-387749.scores

bug-suse-707150.scores

bundle-interleave-promote.scores

bundle-interleave-start.scores

bundle-order-partial-start-2.scores

bundle-order-partial-start.scores

bundle-order-stop-clone.scores

bundle-promoted-anticolocation-1.scores

bundle-promoted-anticolocation-2.scores

bundle-promoted-anticolocation-3.scores

bundle-promoted-anticolocation-4.scores

bundle-promoted-anticolocation-5.scores

bundle-promoted-anticolocation-6.scores

bundle-promoted-colocation-2.scores

bundle-promoted-colocation-3.scores

bundle-promoted-colocation-4.scores

bundle-promoted-colocation-5.scores

bundle-promoted-colocation-6.scores

bundle-promoted-location-1.scores

cancel-behind-moving-remote.scores

clone-anon-failcount.scores

clone-fail-block-colocation.scores

clone-max-zero.scores

clone-recover-no-shuffle-10.scores

clone-recover-no-shuffle-4.scores

clone-recover-no-shuffle-5.scores

clone-recover-no-shuffle-6.scores

clone-recover-no-shuffle-7.scores

cloned-group-stop.scores

coloc-clone-stays-active.scores

colocate-primitive-with-clone.scores

complex_enforce_colo.scores

enforce-colo1.scores

group-dependents.scores

load-stopped-loop-2.scores

load-stopped-loop.scores

migrate-begin.scores

migrate-fail-2.scores

migrate-fail-3.scores

migrate-fail-4.scores

migrate-fail-5.scores

migrate-fail-6.scores

migrate-fail-7.scores

migrate-fail-8.scores

migrate-fail-9.scores

migrate-partial-1.scores

migrate-partial-2.scores

migrate-partial-3.scores

migrate-start-complex.scores

migrate-start.scores

migrate-stop-start-complex.scores

migrate-success.scores

notifs-for-unrunnable.scores

novell-239087.scores

params-6.scores

promoted-13.scores

promoted-asymmetrical-order.scores

promoted-demote.scores

promoted-failed-demote-2.scores

promoted-failed-demote.scores

promoted-move.scores

promoted-ordering.scores

promoted-partially-demoted-group.scores

promoted-probed-score.scores

remote-connection-shutdown.scores

remote-fence-unclean-3.scores

route-remote-notify.scores

rsc-sets-clone-1.scores

start-then-stop-with-unfence.scores

unrunnable-2.scores

utilization-complex.scores

utilization-order2.scores

utilization-order4.scores

utilization-shuffle.scores

summary/

bundle-promoted-anticolocation-1.summary

bundle-promoted-anticolocation-2.summary

bundle-promoted-anticolocation-3.summary

bundle-promoted-anticolocation-4.summary

bundle-promoted-anticolocation-5.summary

bundle-promoted-anticolocation-6.summary

bundle-promoted-colocation-2.summary

bundle-promoted-colocation-3.summary

bundle-promoted-colocation-4.summary

bundle-promoted-colocation-5.summary

bundle-promoted-colocation-6.summary

cancel-behind-moving-remote.summary

clone-recover-no-shuffle-4.summary

clone-recover-no-shuffle-5.summary

clone-recover-no-shuffle-6.summary

clone-recover-no-shuffle-7.summary

promoted-probed-score.summary

xml/

bundle-promoted-anticolocation-1.xml

bundle-promoted-anticolocation-2.xml

bundle-promoted-anticolocation-3.xml

bundle-promoted-anticolocation-4.xml

bundle-promoted-anticolocation-5.xml

bundle-promoted-anticolocation-6.xml

bundle-promoted-colocation-2.xml

bundle-promoted-colocation-3.xml

bundle-promoted-colocation-4.xml

bundle-promoted-colocation-5.xml

bundle-promoted-colocation-6.xml

cancel-behind-moving-remote.xml

clone-recover-no-shuffle-4.xml

clone-recover-no-shuffle-5.xml

clone-recover-no-shuffle-6.xml

clone-recover-no-shuffle-7.xml

promoted-probed-score.xml

include/

crm/

pengine/

lib/

pacemaker/

libpacemaker_private.h

pcmk_sched_bundle.c

pcmk_sched_clone.c

pcmk_sched_colocation.c

pcmk_sched_group.c

pcmk_sched_instances.c

pcmk_sched_location.c

pcmk_sched_primitive.c

pcmk_sched_promotable.c

pcmk_sched_resource.c

pcmk_scheduler.c

pengine/

rPe39c27b86e26

cts/scheduler/dot/bundle-promoted-anticolocation-1.dot

cts/scheduler/dot/bundle-promoted-anticolocation-2.dot

cts/scheduler/dot/bundle-promoted-anticolocation-3.dot

cts/scheduler/dot/bundle-promoted-anticolocation-4.dot

cts/scheduler/dot/bundle-promoted-anticolocation-5.dot

cts/scheduler/dot/bundle-promoted-anticolocation-6.dot

cts/scheduler/dot/bundle-promoted-colocation-2.dot

cts/scheduler/dot/bundle-promoted-colocation-3.dot

cts/scheduler/dot/bundle-promoted-colocation-4.dot

cts/scheduler/dot/bundle-promoted-colocation-5.dot

cts/scheduler/dot/bundle-promoted-colocation-6.dot

cts/scheduler/dot/cancel-behind-moving-remote.dot

cts/scheduler/dot/clone-recover-no-shuffle-4.dot

cts/scheduler/dot/clone-recover-no-shuffle-5.dot

cts/scheduler/dot/clone-recover-no-shuffle-6.dot

cts/scheduler/dot/clone-recover-no-shuffle-7.dot

cts/scheduler/dot/promoted-probed-score.dot

cts/scheduler/exp/bundle-promoted-anticolocation-1.exp

cts/scheduler/exp/bundle-promoted-anticolocation-2.exp

cts/scheduler/exp/bundle-promoted-anticolocation-3.exp

cts/scheduler/exp/bundle-promoted-anticolocation-4.exp

cts/scheduler/exp/bundle-promoted-anticolocation-5.exp

cts/scheduler/exp/bundle-promoted-anticolocation-6.exp

cts/scheduler/exp/bundle-promoted-colocation-2.exp

cts/scheduler/exp/bundle-promoted-colocation-3.exp

cts/scheduler/exp/bundle-promoted-colocation-4.exp

cts/scheduler/exp/bundle-promoted-colocation-5.exp

cts/scheduler/exp/bundle-promoted-colocation-6.exp

cts/scheduler/exp/cancel-behind-moving-remote.exp

cts/scheduler/exp/clone-recover-no-shuffle-4.exp

cts/scheduler/exp/clone-recover-no-shuffle-5.exp

cts/scheduler/exp/clone-recover-no-shuffle-6.exp

cts/scheduler/exp/clone-recover-no-shuffle-7.exp

cts/scheduler/exp/promoted-probed-score.exp

cts/scheduler/scores/594.scores

cts/scheduler/scores/a-promote-then-b-migrate.scores

cts/scheduler/scores/bug-1822.scores

cts/scheduler/scores/bug-5014-CLONE-A-stop-B-started.scores

cts/scheduler/scores/bug-5143-ms-shuffle.scores

cts/scheduler/scores/bug-5186-partial-migrate.scores

cts/scheduler/scores/bug-cl-5168.scores

cts/scheduler/scores/bug-lf-2106.scores

cts/scheduler/scores/bug-lf-2153.scores

cts/scheduler/scores/bug-lf-2171.scores

cts/scheduler/scores/bug-lf-2422.scores

cts/scheduler/scores/bug-lf-2453.scores

cts/scheduler/scores/bug-lf-2551.scores

cts/scheduler/scores/bug-lf-2574.scores

cts/scheduler/scores/bug-lf-2581.scores

cts/scheduler/scores/bug-lf-2619.scores

cts/scheduler/scores/bug-n-387749.scores

cts/scheduler/scores/bug-suse-707150.scores

cts/scheduler/scores/bundle-interleave-promote.scores

cts/scheduler/scores/bundle-interleave-start.scores

cts/scheduler/scores/bundle-order-partial-start-2.scores

cts/scheduler/scores/bundle-order-partial-start.scores

cts/scheduler/scores/bundle-order-stop-clone.scores

cts/scheduler/scores/bundle-promoted-anticolocation-1.scores

cts/scheduler/scores/bundle-promoted-anticolocation-2.scores

cts/scheduler/scores/bundle-promoted-anticolocation-3.scores

cts/scheduler/scores/bundle-promoted-anticolocation-4.scores

cts/scheduler/scores/bundle-promoted-anticolocation-5.scores

cts/scheduler/scores/bundle-promoted-anticolocation-6.scores

cts/scheduler/scores/bundle-promoted-colocation-2.scores

cts/scheduler/scores/bundle-promoted-colocation-3.scores

cts/scheduler/scores/bundle-promoted-colocation-4.scores

cts/scheduler/scores/bundle-promoted-colocation-5.scores

cts/scheduler/scores/bundle-promoted-colocation-6.scores

cts/scheduler/scores/bundle-promoted-location-1.scores

cts/scheduler/scores/cancel-behind-moving-remote.scores

cts/scheduler/scores/clone-anon-failcount.scores

cts/scheduler/scores/clone-fail-block-colocation.scores

cts/scheduler/scores/clone-max-zero.scores

cts/scheduler/scores/clone-recover-no-shuffle-10.scores

cts/scheduler/scores/clone-recover-no-shuffle-4.scores

cts/scheduler/scores/clone-recover-no-shuffle-5.scores

cts/scheduler/scores/clone-recover-no-shuffle-6.scores

cts/scheduler/scores/clone-recover-no-shuffle-7.scores

cts/scheduler/scores/cloned-group-stop.scores

cts/scheduler/scores/coloc-clone-stays-active.scores

cts/scheduler/scores/colocate-primitive-with-clone.scores

cts/scheduler/scores/complex_enforce_colo.scores

cts/scheduler/scores/enforce-colo1.scores

cts/scheduler/scores/group-dependents.scores

cts/scheduler/scores/load-stopped-loop-2.scores

cts/scheduler/scores/load-stopped-loop.scores

cts/scheduler/scores/migrate-begin.scores

cts/scheduler/scores/migrate-fail-2.scores

cts/scheduler/scores/migrate-fail-3.scores

cts/scheduler/scores/migrate-fail-4.scores

cts/scheduler/scores/migrate-fail-5.scores

cts/scheduler/scores/migrate-fail-6.scores

cts/scheduler/scores/migrate-fail-7.scores

cts/scheduler/scores/migrate-fail-8.scores

cts/scheduler/scores/migrate-fail-9.scores

cts/scheduler/scores/migrate-partial-1.scores

cts/scheduler/scores/migrate-partial-2.scores

cts/scheduler/scores/migrate-partial-3.scores

cts/scheduler/scores/migrate-start-complex.scores

cts/scheduler/scores/migrate-start.scores

cts/scheduler/scores/migrate-stop-start-complex.scores

cts/scheduler/scores/migrate-success.scores

cts/scheduler/scores/notifs-for-unrunnable.scores

cts/scheduler/scores/novell-239087.scores

cts/scheduler/scores/params-6.scores

cts/scheduler/scores/probe-2.scores

cts/scheduler/scores/promoted-13.scores

cts/scheduler/scores/promoted-asymmetrical-order.scores

cts/scheduler/scores/promoted-demote.scores

cts/scheduler/scores/promoted-failed-demote-2.scores

cts/scheduler/scores/promoted-failed-demote.scores

cts/scheduler/scores/promoted-move.scores

cts/scheduler/scores/promoted-ordering.scores

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

cts/scheduler/scores/promoted-probed-score.scores

cts/scheduler/scores/remote-connection-shutdown.scores

cts/scheduler/scores/remote-fence-unclean-3.scores

cts/scheduler/scores/route-remote-notify.scores

cts/scheduler/scores/rsc-sets-clone-1.scores

cts/scheduler/scores/start-then-stop-with-unfence.scores

cts/scheduler/scores/unrunnable-2.scores

cts/scheduler/scores/utilization-complex.scores

cts/scheduler/scores/utilization-order2.scores

cts/scheduler/scores/utilization-order4.scores

cts/scheduler/scores/utilization-shuffle.scores

cts/scheduler/summary/bundle-promoted-anticolocation-1.summary

cts/scheduler/summary/bundle-promoted-anticolocation-2.summary

cts/scheduler/summary/bundle-promoted-anticolocation-3.summary

cts/scheduler/summary/bundle-promoted-anticolocation-4.summary

cts/scheduler/summary/bundle-promoted-anticolocation-5.summary

cts/scheduler/summary/bundle-promoted-anticolocation-6.summary

cts/scheduler/summary/bundle-promoted-colocation-2.summary

cts/scheduler/summary/bundle-promoted-colocation-3.summary

cts/scheduler/summary/bundle-promoted-colocation-4.summary

cts/scheduler/summary/bundle-promoted-colocation-5.summary

cts/scheduler/summary/bundle-promoted-colocation-6.summary

cts/scheduler/summary/cancel-behind-moving-remote.summary

cts/scheduler/summary/clone-recover-no-shuffle-4.summary

cts/scheduler/summary/clone-recover-no-shuffle-5.summary

cts/scheduler/summary/clone-recover-no-shuffle-6.summary

cts/scheduler/summary/clone-recover-no-shuffle-7.summary

cts/scheduler/summary/promoted-probed-score.summary

cts/scheduler/xml/bundle-promoted-anticolocation-1.xml

cts/scheduler/xml/bundle-promoted-anticolocation-2.xml

cts/scheduler/xml/bundle-promoted-anticolocation-3.xml

cts/scheduler/xml/bundle-promoted-anticolocation-4.xml

cts/scheduler/xml/bundle-promoted-anticolocation-5.xml

cts/scheduler/xml/bundle-promoted-anticolocation-6.xml

cts/scheduler/xml/bundle-promoted-colocation-2.xml

cts/scheduler/xml/bundle-promoted-colocation-3.xml

cts/scheduler/xml/bundle-promoted-colocation-4.xml

cts/scheduler/xml/bundle-promoted-colocation-5.xml

cts/scheduler/xml/bundle-promoted-colocation-6.xml

cts/scheduler/xml/cancel-behind-moving-remote.xml

cts/scheduler/xml/clone-recover-no-shuffle-4.xml

cts/scheduler/xml/clone-recover-no-shuffle-5.xml

cts/scheduler/xml/clone-recover-no-shuffle-6.xml

cts/scheduler/xml/clone-recover-no-shuffle-7.xml

cts/scheduler/xml/promoted-probed-score.xml

include/crm/pengine/internal.h

lib/pacemaker/libpacemaker_private.h

lib/pacemaker/pcmk_sched_bundle.c

lib/pacemaker/pcmk_sched_clone.c

lib/pacemaker/pcmk_sched_colocation.c

lib/pacemaker/pcmk_sched_group.c

lib/pacemaker/pcmk_sched_instances.c

lib/pacemaker/pcmk_sched_location.c

lib/pacemaker/pcmk_sched_primitive.c

lib/pacemaker/pcmk_sched_promotable.c

lib/pacemaker/pcmk_sched_resource.c

lib/pacemaker/pcmk_scheduler.c

lib/pengine/clone.c

lib/pengine/common.c

lib/pengine/utils.c