Merge pull request #1934 from kgaillot/rhbz1458953
4303744948e9
Actions

Description

Merge pull request #1934 from kgaillot/rhbz1458953

Count resources correctly for status displays

Details

Provenance

kgaillot	Authored on Nov 7 2019, 4:32 PM
GitHub <noreply@github.com>	Committed on Nov 7 2019, 4:32 PM

Parents

rP3b30b1e5ae80: Test: scheduler: update regression test output for resource counting change
rPaa5756d1d3da: Merge pull request #1935 from clumens/crm_element_name-2.0

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

3b30b1e5ae80 Test: scheduler: update regression test output for resource counting change
Author
kgaillot
Browse Repository
No Audits
ade5350425ad Fix: scheduler: count disabled and blocked resources correctly
Author
kgaillot
Browse Repository
No Audits
5463dd1eac5e Refactor: scheduler: add library function for checking whether resource is…
Author
kgaillot
Browse Repository
No Audits
67f8b41da74b Log: scheduler: simplify logging resource info
Author
kgaillot
Browse Repository
No Audits

Changes (125)

Path

Size

cts/

scheduler/

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

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

asymmetrical-order-move.summary

asymmetrical-order-restart.summary

bug-1718.summary

bug-5014-A-stop-B-started.summary

bug-5014-A-stopped-B-stopped.summary

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

bug-5014-CthenAthenB-C-stopped.summary

bug-5014-GROUP-A-stopped-B-started.summary

bug-5014-GROUP-A-stopped-B-stopped.summary

bug-5014-ordered-set-symmetrical-false.summary

bug-5014-ordered-set-symmetrical-true.summary

bug-5028-bottom.summary

bug-5028-detach.summary

bug-5028.summary

bug-5140-require-all-false.summary

bug-5143-ms-shuffle.summary

bug-rh-1097457.summary

bug-suse-707150.summary

clone-fail-block-colocation.summary

clone-order-16instances.summary

cloned-group-stop.summary

coloc-clone-stays-active.summary

colocation_constraint_stops_slave.summary

complex_enforce_colo.summary

container-is-remote-node.summary

enforce-colo1.summary

expire-non-blocked-failure.summary

failcount-block.summary

group-stop-ordering.summary

group11.summary

intervals.summary

load-stopped-loop-2.summary

load-stopped-loop.summary

master-asymmetrical-order.summary

master-demote-block.summary

master-depend.summary

master-probed-score.summary

master-promotion-constraint.summary

multiple-active-block-group.summary

not-reschedule-unneeded-monitor.summary

novell-251689.summary

one-or-more-1.summary

one-or-more-2.summary

one-or-more-3.summary

one-or-more-4.summary

one-or-more-5.summary

one-or-more-6.summary

one-or-more-7.summary

order-clone.summary

order7.summary

order_constraint_stops_master.summary

order_constraint_stops_slave.summary

ordered-set-basic-startup.summary

ordered-set-natural.summary

params-6.summary

rec-rsc-4.summary

rec-rsc-8.summary

remote-disable.summary

remote-probe-disable.summary

rsc-maintenance.summary

rsc-sets-clone-1.summary

stop-failure-no-fencing.summary

stop-failure-no-quorum.summary

stopped-monitor-03.summary

stopped-monitor-04.summary

stopped-monitor-05.summary

stopped-monitor-06.summary

stopped-monitor-07.summary

stopped-monitor-11.summary

stopped-monitor-12.summary

stopped-monitor-20.summary

stopped-monitor-21.summary

stopped-monitor-22.summary

stopped-monitor-24.summary

stopped-monitor-25.summary

stopped-monitor-31.summary

target-1.summary

target-2.summary

template-1.summary

unmanaged-block-restart.summary

unmanaged-stop-1.summary

unmanaged-stop-2.summary

unmanaged-stop-3.summary

unmanaged-stop-4.summary

unrunnable-2.summary

use-after-free-merge.summary

utilization-order4.summary

whitebox-asymmetric.summary

whitebox-stop.summary

daemons/

execd/

cts-exec-helper.c

fenced/

pacemaker-fenced.c

schedulerd/

pacemaker-schedulerd.c

include/

crm/

pengine/

internal.h

pe_types.h

lib/

pacemaker/

pengine/

tools/

crm_resource_runtime.c

rP4303744948e9

View Options

cts/scheduler/8-am-then-bm-a-migrating-b-stopping.summary

View Options

cts/scheduler/9-am-then-bm-b-migrating-a-stopping.summary

View Options

cts/scheduler/asymmetrical-order-move.summary

View Options

cts/scheduler/asymmetrical-order-restart.summary

View Options

cts/scheduler/bug-1718.summary

View Options

cts/scheduler/bug-5014-A-stop-B-started.summary

View Options

cts/scheduler/bug-5014-A-stopped-B-stopped.summary

View Options

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

View Options

cts/scheduler/bug-5014-CthenAthenB-C-stopped.summary

View Options

cts/scheduler/bug-5014-GROUP-A-stopped-B-started.summary

View Options

cts/scheduler/bug-5014-GROUP-A-stopped-B-stopped.summary

View Options

cts/scheduler/bug-5014-ordered-set-symmetrical-false.summary

View Options

cts/scheduler/bug-5014-ordered-set-symmetrical-true.summary

View Options

cts/scheduler/bug-5028-bottom.summary

View Options

cts/scheduler/bug-5028-detach.summary

View Options

cts/scheduler/bug-5028.summary

View Options

cts/scheduler/bug-5140-require-all-false.summary

View Options

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

View Options

cts/scheduler/bug-cl-5170.summary

View Options

cts/scheduler/bug-cl-5219.summary

View Options

cts/scheduler/bug-lf-2171.summary

View Options

cts/scheduler/bug-lf-2358.summary

View Options

cts/scheduler/bug-lf-2422.summary

View Options

cts/scheduler/bug-lf-2453.summary

View Options

cts/scheduler/bug-lf-2606.summary

View Options

cts/scheduler/bug-rh-1097457.summary

View Options

cts/scheduler/bug-suse-707150.summary

View Options

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

View Options

cts/scheduler/clone-order-16instances.summary

View Options

cts/scheduler/cloned-group-stop.summary

View Options

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

View Options

cts/scheduler/colocation_constraint_stops_slave.summary

View Options

cts/scheduler/complex_enforce_colo.summary

View Options

cts/scheduler/container-is-remote-node.summary

View Options

cts/scheduler/enforce-colo1.summary

View Options

cts/scheduler/expire-non-blocked-failure.summary

View Options

cts/scheduler/failcount-block.summary

View Options

cts/scheduler/group-stop-ordering.summary

View Options

cts/scheduler/group11.summary

View Options

cts/scheduler/intervals.summary

View Options

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

View Options

cts/scheduler/load-stopped-loop.summary

View Options

cts/scheduler/master-asymmetrical-order.summary

View Options

cts/scheduler/master-demote-block.summary

View Options

cts/scheduler/master-depend.summary

View Options

cts/scheduler/master-probed-score.summary

View Options

cts/scheduler/master-promotion-constraint.summary

View Options

cts/scheduler/multiple-active-block-group.summary

View Options

cts/scheduler/not-reschedule-unneeded-monitor.summary

View Options

cts/scheduler/novell-251689.summary

View Options

cts/scheduler/one-or-more-1.summary

View Options

cts/scheduler/one-or-more-2.summary

View Options

cts/scheduler/one-or-more-3.summary

View Options

cts/scheduler/one-or-more-4.summary

View Options

cts/scheduler/one-or-more-5.summary

View Options

cts/scheduler/one-or-more-6.summary

View Options

cts/scheduler/one-or-more-7.summary

View Options

cts/scheduler/order-clone.summary

View Options

cts/scheduler/order7.summary

View Options

cts/scheduler/order_constraint_stops_master.summary

View Options

cts/scheduler/order_constraint_stops_slave.summary

View Options

cts/scheduler/ordered-set-basic-startup.summary

View Options

cts/scheduler/ordered-set-natural.summary

View Options

cts/scheduler/params-6.summary

View Options

cts/scheduler/rec-rsc-4.summary

View Options

cts/scheduler/rec-rsc-8.summary

View Options

cts/scheduler/remote-disable.summary

View Options

cts/scheduler/remote-probe-disable.summary

View Options

cts/scheduler/rsc-maintenance.summary

View Options

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

View Options

cts/scheduler/stop-failure-no-fencing.summary

View Options

cts/scheduler/stop-failure-no-quorum.summary

View Options

cts/scheduler/stopped-monitor-03.summary

View Options

cts/scheduler/stopped-monitor-04.summary

View Options

cts/scheduler/stopped-monitor-05.summary

View Options

cts/scheduler/stopped-monitor-06.summary

View Options

cts/scheduler/stopped-monitor-07.summary

View Options

cts/scheduler/stopped-monitor-11.summary

View Options

cts/scheduler/stopped-monitor-12.summary

View Options

cts/scheduler/stopped-monitor-20.summary

View Options

cts/scheduler/stopped-monitor-21.summary

View Options

cts/scheduler/stopped-monitor-22.summary

View Options

cts/scheduler/stopped-monitor-24.summary

View Options

cts/scheduler/stopped-monitor-25.summary

View Options

cts/scheduler/stopped-monitor-31.summary

View Options

cts/scheduler/target-1.summary

View Options

cts/scheduler/target-2.summary

View Options

cts/scheduler/template-1.summary

View Options

cts/scheduler/unmanaged-block-restart.summary

View Options

cts/scheduler/unmanaged-stop-1.summary

View Options

cts/scheduler/unmanaged-stop-2.summary

View Options

cts/scheduler/unmanaged-stop-3.summary

View Options

cts/scheduler/unmanaged-stop-4.summary

View Options

cts/scheduler/unrunnable-2.summary

View Options

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

View Options

cts/scheduler/utilization-order4.summary

View Options

cts/scheduler/whitebox-asymmetric.summary

View Options

cts/scheduler/whitebox-stop.summary

View Options

daemons/execd/cts-exec-helper.c

View Options

daemons/fenced/pacemaker-fenced.c

View Options

daemons/schedulerd/pacemaker-schedulerd.c

View Options

include/crm/pengine/internal.h

View Options

include/crm/pengine/pe_types.h

View Options

lib/pacemaker/pcmk_sched_group.c

View Options

lib/pacemaker/pcmk_sched_native.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/native.c

View Options

lib/pengine/pe_output.c

View Options

lib/pengine/status.c

View Options

lib/pengine/unpack.c

View Options

lib/pengine/utils.c

View Options

tools/crm_mon.c

View Options

tools/crm_mon.h

View Options

tools/crm_mon_output.c

View Options

tools/crm_mon_print.c

View Options

tools/crm_mon_runtime.c

View Options

tools/crm_resource.c

View Options

tools/crm_resource_runtime.c

View Options

tools/crm_rule.c

View Options

tools/crm_simulate.c

View Options

tools/crm_ticket.c

View Options

Merge pull request #1934 from kgaillot/rhbz14589534303744948e9Actions

Description

Details

Event Timeline

Merged Changes

Changes (125)

rP4303744948e9

cts/scheduler/8-am-then-bm-a-migrating-b-stopping.summary

cts/scheduler/9-am-then-bm-b-migrating-a-stopping.summary

cts/scheduler/asymmetrical-order-move.summary

cts/scheduler/asymmetrical-order-restart.summary

cts/scheduler/bug-1718.summary

cts/scheduler/bug-5014-A-stop-B-started.summary

cts/scheduler/bug-5014-A-stopped-B-stopped.summary

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

cts/scheduler/bug-5014-CthenAthenB-C-stopped.summary

cts/scheduler/bug-5014-GROUP-A-stopped-B-started.summary

cts/scheduler/bug-5014-GROUP-A-stopped-B-stopped.summary

cts/scheduler/bug-5014-ordered-set-symmetrical-false.summary

cts/scheduler/bug-5014-ordered-set-symmetrical-true.summary

cts/scheduler/bug-5028-bottom.summary

cts/scheduler/bug-5028-detach.summary

cts/scheduler/bug-5028.summary

cts/scheduler/bug-5140-require-all-false.summary

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

cts/scheduler/bug-cl-5170.summary

cts/scheduler/bug-cl-5219.summary

cts/scheduler/bug-lf-2171.summary

cts/scheduler/bug-lf-2358.summary

cts/scheduler/bug-lf-2422.summary

cts/scheduler/bug-lf-2453.summary

cts/scheduler/bug-lf-2606.summary

cts/scheduler/bug-rh-1097457.summary

cts/scheduler/bug-suse-707150.summary

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

cts/scheduler/clone-order-16instances.summary

cts/scheduler/cloned-group-stop.summary

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

cts/scheduler/colocation_constraint_stops_slave.summary

cts/scheduler/complex_enforce_colo.summary

cts/scheduler/container-is-remote-node.summary

cts/scheduler/enforce-colo1.summary

cts/scheduler/expire-non-blocked-failure.summary

cts/scheduler/failcount-block.summary

cts/scheduler/group-stop-ordering.summary

cts/scheduler/group11.summary

cts/scheduler/intervals.summary

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

cts/scheduler/load-stopped-loop.summary

cts/scheduler/master-asymmetrical-order.summary

cts/scheduler/master-demote-block.summary

cts/scheduler/master-depend.summary

cts/scheduler/master-probed-score.summary

cts/scheduler/master-promotion-constraint.summary

cts/scheduler/multiple-active-block-group.summary

cts/scheduler/not-reschedule-unneeded-monitor.summary

cts/scheduler/novell-251689.summary

cts/scheduler/one-or-more-1.summary

cts/scheduler/one-or-more-2.summary

cts/scheduler/one-or-more-3.summary

cts/scheduler/one-or-more-4.summary

cts/scheduler/one-or-more-5.summary

cts/scheduler/one-or-more-6.summary

cts/scheduler/one-or-more-7.summary

cts/scheduler/order-clone.summary

cts/scheduler/order7.summary

cts/scheduler/order_constraint_stops_master.summary

cts/scheduler/order_constraint_stops_slave.summary

cts/scheduler/ordered-set-basic-startup.summary

cts/scheduler/ordered-set-natural.summary

cts/scheduler/params-6.summary

cts/scheduler/rec-rsc-4.summary

cts/scheduler/rec-rsc-8.summary

cts/scheduler/remote-disable.summary

cts/scheduler/remote-probe-disable.summary

cts/scheduler/rsc-maintenance.summary

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

cts/scheduler/stop-failure-no-fencing.summary

cts/scheduler/stop-failure-no-quorum.summary

cts/scheduler/stopped-monitor-03.summary

Merge pull request #1934 from kgaillot/rhbz1458953
4303744948e9
Actions