Merge pull request #3586 from nrwahl2/nrwahl2-T832
252b5342f9b1
Actions

Description

Merge pull request #3586 from nrwahl2/nrwahl2-T832

[2.1] Backport colocation fixes for cloned groups and promotion priority

Details

Provenance

kgaillot	Authored on Jul 29 2024, 10:15 AM
GitHub <noreply@github.com>	Committed on Jul 29 2024, 10:15 AM

Parents

rP4e8a8ddbdc1c: Test: cts-scheduler: Update outputs for double colocation fix
rPbe4ae919406d: Merge pull request #3583 from kgaillot/backport

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed rP252b5342f9b1: Merge pull request #3586 from nrwahl2/nrwahl2-T832 (authored by kgaillot).Jul 29 2024, 10:15 AM

Merged Changes

4e8a8ddbdc1c Test: cts-scheduler: Update outputs for double colocation fix
Author
nrwahl2
Browse Repository
No Audits
456c46ba7431 Fix: libpacemaker: Don't apply colocation twice for promotion priority
Author
nrwahl2
Browse Repository
No Audits
5c44246ad1ff Test: cts-scheduler: Test for doubled colocation scores for promotion
Author
nrwahl2
Browse Repository
No Audits
e1d0562875cf Fix: libpacemaker: Apply promotion priority to cloned group instance
Author
nrwahl2
Browse Repository
No Audits
bb8286c9554c Refactor: libpacemaker: apply_coloc_score() returns priority delta
Author
nrwahl2
Browse Repository
No Audits
71fb5f6cd809 Refactor: libpacemaker: Clean up pcmk__apply_coloc_to_priority()
Author
nrwahl2
Browse Repository
No Audits
7275eb263298 Test: cts-scheduler: Add tests for cloned group promoted colocations
Author
nrwahl2
Browse Repository
No Audits
3df1a3ce5af8 Log: libpacemaker: Log correct score in pcmk__apply_coloc_to_priority()
Author
nrwahl2
Browse Repository
No Audits

Changes (42)

Path

Size

cts/

cts-scheduler.in

scheduler/

dot/

	coloc-cloned-group-promoted-dependent1.dot
	bug-5025-2.dot

	coloc-cloned-group-promoted-dependent2.dot
	bug-5025-2.dot

coloc-optional-promoted-dependent-moves-1.dot

coloc-optional-promoted-dependent-moves-2.dot

coloc-optional-promoted-dependent-stays-1.dot

coloc-optional-promoted-dependent-stays-2.dot

exp/

	coloc-cloned-group-promoted-dependent1.exp
	bug-5014-GROUP-A-stopped-B-stopped.exp

	coloc-cloned-group-promoted-dependent2.exp
	bug-5014-GROUP-A-stopped-B-stopped.exp

coloc-optional-promoted-dependent-moves-1.exp

coloc-optional-promoted-dependent-moves-2.exp

coloc-optional-promoted-dependent-stays-1.exp

coloc-optional-promoted-dependent-stays-2.exp

scores/

bug-lf-2358.scores

coloc-clone-stays-active.scores

coloc-cloned-group-promoted-dependent1.scores

coloc-cloned-group-promoted-dependent2.scores

coloc-optional-promoted-dependent-moves-1.scores

coloc-optional-promoted-dependent-moves-2.scores

coloc-optional-promoted-dependent-stays-1.scores

coloc-optional-promoted-dependent-stays-2.scores

promoted-partially-demoted-group.scores

use-after-free-merge.scores

summary/

	coloc-cloned-group-promoted-dependent1.summary
	ticket-promoted-12.summary

	coloc-cloned-group-promoted-dependent2.summary
	ticket-promoted-12.summary

coloc-optional-promoted-dependent-moves-1.summary

coloc-optional-promoted-dependent-moves-2.summary

coloc-optional-promoted-dependent-stays-1.summary

coloc-optional-promoted-dependent-stays-2.summary

xml/

coloc-cloned-group-promoted-dependent1.xml

coloc-cloned-group-promoted-dependent2.xml

coloc-optional-promoted-dependent-moves-1.xml

coloc-optional-promoted-dependent-moves-2.xml

coloc-optional-promoted-dependent-stays-1.xml

coloc-optional-promoted-dependent-stays-2.xml

lib/

pacemaker/

libpacemaker_private.h

pcmk_sched_bundle.c

pcmk_sched_clone.c

pcmk_sched_colocation.c

pcmk_sched_group.c

pcmk_sched_primitive.c

pcmk_sched_promotable.c

rP252b5342f9b1

View Options

cts/cts-scheduler.in

View Options

cts/scheduler/dot/coloc-cloned-group-promoted-dependent1.dot

View Options

cts/scheduler/dot/coloc-cloned-group-promoted-dependent2.dot

View Options

cts/scheduler/dot/coloc-optional-promoted-dependent-moves-1.dot

View Options

cts/scheduler/dot/coloc-optional-promoted-dependent-moves-2.dot

View Options

cts/scheduler/dot/coloc-optional-promoted-dependent-stays-1.dot

View Options

cts/scheduler/dot/coloc-optional-promoted-dependent-stays-2.dot

View Options

cts/scheduler/exp/coloc-cloned-group-promoted-dependent1.exp

View Options

cts/scheduler/exp/coloc-cloned-group-promoted-dependent2.exp

View Options

cts/scheduler/exp/coloc-optional-promoted-dependent-moves-1.exp

View Options

cts/scheduler/exp/coloc-optional-promoted-dependent-moves-2.exp

View Options

cts/scheduler/exp/coloc-optional-promoted-dependent-stays-1.exp

View Options

cts/scheduler/exp/coloc-optional-promoted-dependent-stays-2.exp

View Options

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

View Options

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

View Options

cts/scheduler/scores/coloc-cloned-group-promoted-dependent1.scores

View Options

cts/scheduler/scores/coloc-cloned-group-promoted-dependent2.scores

View Options

cts/scheduler/scores/coloc-optional-promoted-dependent-moves-1.scores

View Options

cts/scheduler/scores/coloc-optional-promoted-dependent-moves-2.scores

View Options

cts/scheduler/scores/coloc-optional-promoted-dependent-stays-1.scores

View Options

cts/scheduler/scores/coloc-optional-promoted-dependent-stays-2.scores

View Options

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

View Options

cts/scheduler/scores/use-after-free-merge.scores

View Options

cts/scheduler/summary/coloc-cloned-group-promoted-dependent1.summary

View Options

cts/scheduler/summary/coloc-cloned-group-promoted-dependent2.summary

View Options

cts/scheduler/summary/coloc-optional-promoted-dependent-moves-1.summary

View Options

cts/scheduler/summary/coloc-optional-promoted-dependent-moves-2.summary

View Options

cts/scheduler/summary/coloc-optional-promoted-dependent-stays-1.summary

View Options

cts/scheduler/summary/coloc-optional-promoted-dependent-stays-2.summary

View Options

cts/scheduler/xml/coloc-cloned-group-promoted-dependent1.xml

View Options

cts/scheduler/xml/coloc-cloned-group-promoted-dependent2.xml

View Options

cts/scheduler/xml/coloc-optional-promoted-dependent-moves-1.xml

View Options

cts/scheduler/xml/coloc-optional-promoted-dependent-moves-2.xml

View Options

cts/scheduler/xml/coloc-optional-promoted-dependent-stays-1.xml

View Options

cts/scheduler/xml/coloc-optional-promoted-dependent-stays-2.xml

View Options

lib/pacemaker/libpacemaker_private.h

View Options

lib/pacemaker/pcmk_sched_bundle.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_primitive.c

View Options

lib/pacemaker/pcmk_sched_promotable.c

Merge pull request #3586 from nrwahl2/nrwahl2-T832252b5342f9b1Actions

Description

Details

Event Timeline

Merged Changes

Changes (42)

rP252b5342f9b1

cts/cts-scheduler.in

cts/scheduler/dot/coloc-cloned-group-promoted-dependent1.dot

cts/scheduler/dot/coloc-cloned-group-promoted-dependent2.dot

cts/scheduler/dot/coloc-optional-promoted-dependent-moves-1.dot

cts/scheduler/dot/coloc-optional-promoted-dependent-moves-2.dot

cts/scheduler/dot/coloc-optional-promoted-dependent-stays-1.dot

cts/scheduler/dot/coloc-optional-promoted-dependent-stays-2.dot

cts/scheduler/exp/coloc-cloned-group-promoted-dependent1.exp

cts/scheduler/exp/coloc-cloned-group-promoted-dependent2.exp

cts/scheduler/exp/coloc-optional-promoted-dependent-moves-1.exp

cts/scheduler/exp/coloc-optional-promoted-dependent-moves-2.exp

cts/scheduler/exp/coloc-optional-promoted-dependent-stays-1.exp

cts/scheduler/exp/coloc-optional-promoted-dependent-stays-2.exp

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

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

cts/scheduler/scores/coloc-cloned-group-promoted-dependent1.scores

cts/scheduler/scores/coloc-cloned-group-promoted-dependent2.scores

cts/scheduler/scores/coloc-optional-promoted-dependent-moves-1.scores

cts/scheduler/scores/coloc-optional-promoted-dependent-moves-2.scores

cts/scheduler/scores/coloc-optional-promoted-dependent-stays-1.scores

cts/scheduler/scores/coloc-optional-promoted-dependent-stays-2.scores

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

cts/scheduler/scores/use-after-free-merge.scores

cts/scheduler/summary/coloc-cloned-group-promoted-dependent1.summary

cts/scheduler/summary/coloc-cloned-group-promoted-dependent2.summary

cts/scheduler/summary/coloc-optional-promoted-dependent-moves-1.summary

cts/scheduler/summary/coloc-optional-promoted-dependent-moves-2.summary

cts/scheduler/summary/coloc-optional-promoted-dependent-stays-1.summary

cts/scheduler/summary/coloc-optional-promoted-dependent-stays-2.summary

cts/scheduler/xml/coloc-cloned-group-promoted-dependent1.xml

cts/scheduler/xml/coloc-cloned-group-promoted-dependent2.xml

cts/scheduler/xml/coloc-optional-promoted-dependent-moves-1.xml

cts/scheduler/xml/coloc-optional-promoted-dependent-moves-2.xml

cts/scheduler/xml/coloc-optional-promoted-dependent-stays-1.xml

cts/scheduler/xml/coloc-optional-promoted-dependent-stays-2.xml

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_primitive.c

lib/pacemaker/pcmk_sched_promotable.c

Merge pull request #3586 from nrwahl2/nrwahl2-T832
252b5342f9b1
Actions