diff --git a/cts/scheduler/dot/node-maintenance-1.dot b/cts/scheduler/dot/node-maintenance-1.dot index 33dd16a4cf..9c0dbdc1ed 100644 --- a/cts/scheduler/dot/node-maintenance-1.dot +++ b/cts/scheduler/dot/node-maintenance-1.dot @@ -1,4 +1,3 @@ digraph "g" { "Cancel rsc2_monitor_10000 node2" [ style=bold color="green" fontcolor="black"] -"rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black"] } diff --git a/cts/scheduler/dot/systemhealthp2.dot b/cts/scheduler/dot/systemhealthp2.dot index 3d25561c2c..8fb436136c 100644 --- a/cts/scheduler/dot/systemhealthp2.dot +++ b/cts/scheduler/dot/systemhealthp2.dot @@ -1,16 +1,19 @@ digraph "g" { "apache_1_monitor_0 hs21c" -> "apache_1_start_0 hs21c" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black"] "apache_1_monitor_10000 hs21c" [ style=bold color="green" fontcolor="black"] "apache_1_start_0 hs21c" -> "apache_1_monitor_10000 hs21c" [ style = bold] "apache_1_start_0 hs21c" [ style=bold color="green" fontcolor="black"] "nfs_1_monitor_0 hs21c" -> "nfs_1_start_0 hs21c" [ style = bold] "nfs_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black"] "nfs_1_monitor_20000 hs21c" [ style=bold color="green" fontcolor="black"] "nfs_1_start_0 hs21c" -> "nfs_1_monitor_20000 hs21c" [ style = bold] "nfs_1_start_0 hs21c" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' hs21d" -> "apache_1_start_0 hs21c" [ style = bold] "stonith 'reboot' hs21d" -> "nfs_1_start_0 hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 hs21c" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black"] +"stonith-1_start_0 hs21c" [ style=bold color="green" fontcolor="black"] } diff --git a/cts/scheduler/exp/node-maintenance-1.exp b/cts/scheduler/exp/node-maintenance-1.exp index fc031eb12a..a409f24dc0 100644 --- a/cts/scheduler/exp/node-maintenance-1.exp +++ b/cts/scheduler/exp/node-maintenance-1.exp @@ -1,20 +1,11 @@ - - - - - - - - - diff --git a/cts/scheduler/exp/systemhealthp2.exp b/cts/scheduler/exp/systemhealthp2.exp index 51d9650b16..c7f5981a19 100644 --- a/cts/scheduler/exp/systemhealthp2.exp +++ b/cts/scheduler/exp/systemhealthp2.exp @@ -1,98 +1,114 @@ + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/cts/scheduler/summary/node-maintenance-1.summary b/cts/scheduler/summary/node-maintenance-1.summary index eb75567721..c235047c71 100644 --- a/cts/scheduler/summary/node-maintenance-1.summary +++ b/cts/scheduler/summary/node-maintenance-1.summary @@ -1,26 +1,24 @@ Current cluster status: * Node List: * Node node2: maintenance * Online: [ node1 ] * Full List of Resources: * rsc_stonith (stonith:null): Started node1 * rsc1 (ocf:pacemaker:Dummy): Started node1 * rsc2 (ocf:pacemaker:Dummy): Started node2 (maintenance) Transition Summary: - * Stop rsc1 ( node1 ) due to node availability Executing Cluster Transition: - * Resource action: rsc1 stop on node1 * Resource action: rsc2 cancel=10000 on node2 Revised Cluster Status: * Node List: * Node node2: maintenance * Online: [ node1 ] * Full List of Resources: * rsc_stonith (stonith:null): Started node1 - * rsc1 (ocf:pacemaker:Dummy): Stopped + * rsc1 (ocf:pacemaker:Dummy): Started node1 * rsc2 (ocf:pacemaker:Dummy): Started node2 (maintenance) diff --git a/cts/scheduler/summary/systemhealthp2.summary b/cts/scheduler/summary/systemhealthp2.summary index 9dba00189e..e27fcf8587 100644 --- a/cts/scheduler/summary/systemhealthp2.summary +++ b/cts/scheduler/summary/systemhealthp2.summary @@ -1,34 +1,36 @@ Current cluster status: * Node List: * Node hs21c: online (health is YELLOW) * Node hs21d: UNCLEAN (offline) * Full List of Resources: * stonith-1 (stonith:dummy): Stopped * apache_1 (ocf:heartbeat:apache): Stopped * nfs_1 (ocf:heartbeat:Filesystem): Stopped Transition Summary: * Fence (reboot) hs21d 'node is unclean' + * Start stonith-1 ( hs21c ) * Start apache_1 ( hs21c ) * Start nfs_1 ( hs21c ) Executing Cluster Transition: * Resource action: stonith-1 monitor on hs21c * Resource action: apache_1 monitor on hs21c * Resource action: nfs_1 monitor on hs21c * Fencing hs21d (reboot) + * Resource action: stonith-1 start on hs21c * Resource action: apache_1 start on hs21c * Resource action: nfs_1 start on hs21c * Resource action: apache_1 monitor=10000 on hs21c * Resource action: nfs_1 monitor=20000 on hs21c Revised Cluster Status: * Node List: * Node hs21c: online (health is YELLOW) * OFFLINE: [ hs21d ] * Full List of Resources: - * stonith-1 (stonith:dummy): Stopped + * stonith-1 (stonith:dummy): Started hs21c * apache_1 (ocf:heartbeat:apache): Started hs21c * nfs_1 (ocf:heartbeat:Filesystem): Started hs21c