diff --git a/pengine/test10/failcount-block.dot b/pengine/test10/failcount-block.dot index b652d56ebc..c45ebad2ec 100644 --- a/pengine/test10/failcount-block.dot +++ b/pengine/test10/failcount-block.dot @@ -1,11 +1,12 @@ digraph "g" { "rsc_pcmk-1_clear_failcount pcmk-1" [ style=bold color="green" fontcolor="black"] "rsc_pcmk-1_monitor_5000 pcmk-1" [ style=bold color="green" fontcolor="black"] "rsc_pcmk-3_clear_failcount pcmk-1" [ style=bold color="green" fontcolor="black"] "rsc_pcmk-3_monitor_5000 pcmk-1" [ style=bold color="green" fontcolor="black"] "rsc_pcmk-3_start_0 pcmk-1" -> "rsc_pcmk-3_monitor_5000 pcmk-1" [ style = bold] "rsc_pcmk-3_start_0 pcmk-1" [ style=bold color="green" fontcolor="black"] "rsc_pcmk-4_monitor_5000 pcmk-1" [ style=bold color="green" fontcolor="black"] "rsc_pcmk-4_start_0 pcmk-1" -> "rsc_pcmk-4_monitor_5000 pcmk-1" [ style = bold] "rsc_pcmk-4_start_0 pcmk-1" [ style=bold color="green" fontcolor="black"] +"rsc_pcmk-5_clear_failcount pcmk-1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/failcount-block.exp b/pengine/test10/failcount-block.exp index 31968c7a2e..9ac63a29bd 100644 --- a/pengine/test10/failcount-block.exp +++ b/pengine/test10/failcount-block.exp @@ -1,74 +1,83 @@ - + - + - + - + - + - + + + + + + + + + + diff --git a/pengine/test10/failcount-block.scores b/pengine/test10/failcount-block.scores index c6cdd4b70d..09896aaead 100644 --- a/pengine/test10/failcount-block.scores +++ b/pengine/test10/failcount-block.scores @@ -1,9 +1,11 @@ Allocation scores: native_color: rsc_pcmk-1 allocation score on pcmk-1: 0 native_color: rsc_pcmk-1 allocation score on pcmk-4: 0 native_color: rsc_pcmk-2 allocation score on pcmk-1: INFINITY native_color: rsc_pcmk-2 allocation score on pcmk-4: 0 native_color: rsc_pcmk-3 allocation score on pcmk-1: 0 native_color: rsc_pcmk-3 allocation score on pcmk-4: 0 native_color: rsc_pcmk-4 allocation score on pcmk-1: 0 native_color: rsc_pcmk-4 allocation score on pcmk-4: 0 +native_color: rsc_pcmk-5 allocation score on pcmk-1: 0 +native_color: rsc_pcmk-5 allocation score on pcmk-4: 0 diff --git a/pengine/test10/failcount-block.summary b/pengine/test10/failcount-block.summary index 2a26bc11cd..93a2022f01 100644 --- a/pengine/test10/failcount-block.summary +++ b/pengine/test10/failcount-block.summary @@ -1,32 +1,35 @@ Current cluster status: Online: [ pcmk-1 ] OFFLINE: [ pcmk-4 ] rsc_pcmk-1 (ocf::heartbeat:IPaddr2): Started pcmk-1 rsc_pcmk-2 (ocf::heartbeat:IPaddr2): Started pcmk-1 (unmanaged) FAILED rsc_pcmk-3 (ocf::heartbeat:IPaddr2): Stopped rsc_pcmk-4 (ocf::heartbeat:IPaddr2): Stopped + rsc_pcmk-5 (ocf::heartbeat:IPaddr2): Started pcmk-1 Transition Summary: * Start rsc_pcmk-3 (pcmk-1) * Start rsc_pcmk-4 (pcmk-1) Executing cluster transition: * Resource action: rsc_pcmk-1 monitor=5000 on pcmk-1 * Cluster action: clear_failcount for rsc_pcmk-1 on pcmk-1 * Resource action: rsc_pcmk-3 start on pcmk-1 * Cluster action: clear_failcount for rsc_pcmk-3 on pcmk-1 * Resource action: rsc_pcmk-4 start on pcmk-1 + * Cluster action: clear_failcount for rsc_pcmk-5 on pcmk-1 * Resource action: rsc_pcmk-3 monitor=5000 on pcmk-1 * Resource action: rsc_pcmk-4 monitor=5000 on pcmk-1 Revised cluster status: Online: [ pcmk-1 ] OFFLINE: [ pcmk-4 ] rsc_pcmk-1 (ocf::heartbeat:IPaddr2): Started pcmk-1 rsc_pcmk-2 (ocf::heartbeat:IPaddr2): Started pcmk-1 (unmanaged) FAILED rsc_pcmk-3 (ocf::heartbeat:IPaddr2): Started pcmk-1 rsc_pcmk-4 (ocf::heartbeat:IPaddr2): Started pcmk-1 + rsc_pcmk-5 (ocf::heartbeat:IPaddr2): Started pcmk-1 diff --git a/pengine/test10/failcount-block.xml b/pengine/test10/failcount-block.xml index f473732fa8..12d4937e62 100644 --- a/pengine/test10/failcount-block.xml +++ b/pengine/test10/failcount-block.xml @@ -1,115 +1,147 @@ + + + + + + + + + + + + + + + - + + - + + - + + - + + + + + + +