commit 6b3407f69109e4ce2cec728817f271c7c2d88c16 Author: Gao,Yan Date: Mon Jan 7 10:50:43 2013 +0800 Low: PE: cl#5128 - Support maintenance mode for a single node (regression tests) diff --git a/pengine/regression.sh b/pengine/regression.sh index 0f96239..47c1180 100755 --- a/pengine/regression.sh +++ b/pengine/regression.sh @@ -488,6 +488,8 @@ do_test load-stopped-loop "Avoid transition loop due to load_stopped (cl#5044)" echo "" do_test reprobe-target_rc "Ensure correct target_rc for reprobe of inactive resources" +do_test node-maintenance-1 "cl#5128 - Node maintenance" +do_test node-maintenance-2 "cl#5128 - Node maintenance (coming out of maintenance mode)" echo "" do_test stopped-monitor-00 "Stopped Monitor - initial start" diff --git a/pengine/test10/node-maintenance-1.dot b/pengine/test10/node-maintenance-1.dot new file mode 100644 index 0000000..e7332ef --- /dev/null +++ b/pengine/test10/node-maintenance-1.dot @@ -0,0 +1,8 @@ +digraph "g" { +"Cancel rsc2_monitor_10000 node2" [ style=bold color="green" fontcolor="black"] +"all_stopped" [ style=bold color="green" fontcolor="orange"] +"probe_complete node1" [ style=bold color="green" fontcolor="black"] +"probe_complete node2" [ style=bold color="green" fontcolor="black"] +"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] +"rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black"] +} diff --git a/pengine/test10/node-maintenance-1.exp b/pengine/test10/node-maintenance-1.exp new file mode 100644 index 0000000..3c73791 --- /dev/null +++ b/pengine/test10/node-maintenance-1.exp @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pengine/test10/node-maintenance-1.scores b/pengine/test10/node-maintenance-1.scores new file mode 100644 index 0000000..0b1e6dc --- /dev/null +++ b/pengine/test10/node-maintenance-1.scores @@ -0,0 +1,7 @@ +Allocation scores: +native_color: rsc1 allocation score on node1: -1 +native_color: rsc1 allocation score on node2: 0 +native_color: rsc2 allocation score on node1: 0 +native_color: rsc2 allocation score on node2: INFINITY +native_color: rsc_stonith allocation score on node1: 0 +native_color: rsc_stonith allocation score on node2: 0 diff --git a/pengine/test10/node-maintenance-1.summary b/pengine/test10/node-maintenance-1.summary new file mode 100644 index 0000000..85dfb46 --- /dev/null +++ b/pengine/test10/node-maintenance-1.summary @@ -0,0 +1,25 @@ + +Current cluster status: +Node node2: maintenance +Online: [ node1 ] + + rsc_stonith (stonith:null): Started node1 + rsc1 (ocf::pacemaker:Dummy): Started node1 + rsc2 (ocf::pacemaker:Dummy): Started node2 (unmanaged) + +Transition Summary: + * Stop rsc1 (node1) + +Executing cluster transition: + * Resource action: rsc1 stop on node1 + * Resource action: rsc2 cancel=10000 on node2 + * Pseudo action: all_stopped + +Revised cluster status: +Node node2: maintenance +Online: [ node1 ] + + rsc_stonith (stonith:null): Started node1 + rsc1 (ocf::pacemaker:Dummy): Stopped + rsc2 (ocf::pacemaker:Dummy): Started node2 (unmanaged) + diff --git a/pengine/test10/node-maintenance-1.xml b/pengine/test10/node-maintenance-1.xml new file mode 100644 index 0000000..783b0b5 --- /dev/null +++ b/pengine/test10/node-maintenance-1.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pengine/test10/node-maintenance-2.dot b/pengine/test10/node-maintenance-2.dot new file mode 100644 index 0000000..59fa1dc --- /dev/null +++ b/pengine/test10/node-maintenance-2.dot @@ -0,0 +1,8 @@ +digraph "g" { +"probe_complete node1" [ style=bold color="green" fontcolor="black"] +"probe_complete node2" [ style=bold color="green" fontcolor="black"] +"rsc1_monitor_10000 node2" [ style=bold color="green" fontcolor="black"] +"rsc1_start_0 node2" -> "rsc1_monitor_10000 node2" [ style = bold] +"rsc1_start_0 node2" [ style=bold color="green" fontcolor="black"] +"rsc2_monitor_10000 node2" [ style=bold color="green" fontcolor="black"] +} diff --git a/pengine/test10/node-maintenance-2.exp b/pengine/test10/node-maintenance-2.exp new file mode 100644 index 0000000..0156835 --- /dev/null +++ b/pengine/test10/node-maintenance-2.exp @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pengine/test10/node-maintenance-2.scores b/pengine/test10/node-maintenance-2.scores new file mode 100644 index 0000000..c3fe45f --- /dev/null +++ b/pengine/test10/node-maintenance-2.scores @@ -0,0 +1,7 @@ +Allocation scores: +native_color: rsc1 allocation score on node1: -1 +native_color: rsc1 allocation score on node2: 0 +native_color: rsc2 allocation score on node1: 0 +native_color: rsc2 allocation score on node2: 0 +native_color: rsc_stonith allocation score on node1: 0 +native_color: rsc_stonith allocation score on node2: 0 diff --git a/pengine/test10/node-maintenance-2.summary b/pengine/test10/node-maintenance-2.summary new file mode 100644 index 0000000..9712d04 --- /dev/null +++ b/pengine/test10/node-maintenance-2.summary @@ -0,0 +1,23 @@ + +Current cluster status: +Online: [ node1 node2 ] + + rsc_stonith (stonith:null): Started node1 + rsc1 (ocf::pacemaker:Dummy): Stopped + rsc2 (ocf::pacemaker:Dummy): Started node2 + +Transition Summary: + * Start rsc1 (node2) + +Executing cluster transition: + * Resource action: rsc1 start on node2 + * Resource action: rsc2 monitor=10000 on node2 + * Resource action: rsc1 monitor=10000 on node2 + +Revised cluster status: +Online: [ node1 node2 ] + + rsc_stonith (stonith:null): Started node1 + rsc1 (ocf::pacemaker:Dummy): Started node2 + rsc2 (ocf::pacemaker:Dummy): Started node2 + diff --git a/pengine/test10/node-maintenance-2.xml b/pengine/test10/node-maintenance-2.xml new file mode 100644 index 0000000..2f2f966 --- /dev/null +++ b/pengine/test10/node-maintenance-2.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +