Merge pull request #3579 from nrwahl2/nrwahl2-T832_2
3b7958e2bf04
Actions

Description

Merge pull request #3579 from nrwahl2/nrwahl2-T832_2

Fix: libpacemaker: Don't apply colocation twice for promotion priority

Details

Provenance

kgaillot	Authored on Jul 25 2024, 7:01 PM
GitHub <noreply@github.com>	Committed on Jul 25 2024, 7:01 PM

Parents

rP3f6a6d933ff4: Merge pull request #3582 from kgaillot/doc
rPc6ad50d4d968: Test: cts-scheduler: Update outputs for double colocation fix

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed rP3b7958e2bf04: Merge pull request #3579 from nrwahl2/nrwahl2-T832_2 (authored by kgaillot).Jul 25 2024, 7:01 PM

Merged Changes

c6ad50d4d968 Test: cts-scheduler: Update outputs for double colocation fix
Author
nrwahl2
Browse Repository
No Audits
12c463a993d5 Fix: libpacemaker: Don't apply colocation twice for promotion priority
Author
nrwahl2
Browse Repository
No Audits
e67322a2f4a6 Test: cts-scheduler: Test for doubled colocation scores for promotion
Author
nrwahl2
Browse Repository
No Audits

Changes (26)

Path

Size

cts/

cts-scheduler.in

scheduler/

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-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-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

use-after-free-merge.scores

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-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/

pcmk_sched_colocation.c

pcmk_sched_promotable.c

rP3b7958e2bf04

View Options

cts/cts-scheduler.in

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-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-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/use-after-free-merge.scores

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-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/pcmk_sched_colocation.c

View Options

lib/pacemaker/pcmk_sched_promotable.c

Merge pull request #3579 from nrwahl2/nrwahl2-T832_23b7958e2bf04Actions

Description

Details

Event Timeline

Merged Changes

Changes (26)

rP3b7958e2bf04

cts/cts-scheduler.in

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-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-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/use-after-free-merge.scores

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-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/pcmk_sched_colocation.c

lib/pacemaker/pcmk_sched_promotable.c

Merge pull request #3579 from nrwahl2/nrwahl2-T832_2
3b7958e2bf04
Actions