commit 54c57b981935172a28eea3c1e070c408642846b1
Author: Andrew Beekhof <andrew@beekhof.net>
Date: Wed Apr 2 15:34:26 2014 +1100
Test: PE: Include stonith operation in the summary results and handle unfencing
(cherry picked from commit 8d8de0a3ec77738e5d508b7e746c1d493c9617e1)
Conflicts:
pengine/test10/bug-5186-partial-migrate.summary
pengine/test10/remote-fence-unclean.summary
diff --git a/pengine/test10/594.summary b/pengine/test10/594.summary
index 865b386..08de5cc 100644
--- a/pengine/test10/594.summary
+++ b/pengine/test10/594.summary
@@ -27,7 +27,7 @@ Executing cluster transition:
* Resource action: child_DoFencing:0 monitor on hadev1
* Resource action: child_DoFencing:2 monitor on hadev2
* Pseudo action: DoFencing_stop_0
- * Fencing hadev3
+ * Fencing hadev3 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Resource action: DcIPaddr start on hadev1
diff --git a/pengine/test10/829.summary b/pengine/test10/829.summary
index f08a30a..cf23cf0 100644
--- a/pengine/test10/829.summary
+++ b/pengine/test10/829.summary
@@ -36,7 +36,7 @@ Executing cluster transition:
* Resource action: child_DoFencing:2 monitor on c001n03
* Resource action: child_DoFencing:3 monitor on c001n03
* Resource action: child_DoFencing:3 monitor on c001n01
- * Fencing c001n02
+ * Fencing c001n02 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: rsc_c001n02_stop_0
diff --git a/pengine/test10/bug-lf-2508.summary b/pengine/test10/bug-lf-2508.summary
index 4435ced..7f5aed1 100644
--- a/pengine/test10/bug-lf-2508.summary
+++ b/pengine/test10/bug-lf-2508.summary
@@ -39,7 +39,7 @@ Transition Summary:
Executing cluster transition:
* Pseudo action: Group01_start_0
* Resource action: prmStonith3-1:1 monitor=3600000 on srv01
- * Fencing srv02
+ * Fencing srv02 (reboot)
* Pseudo action: stonith_complete
* Resource action: Dummy01 start on srv01
* Pseudo action: Group02_stop_0
diff --git a/pengine/test10/bug-lf-2551.summary b/pengine/test10/bug-lf-2551.summary
index d299ee9..d362a23 100644
--- a/pengine/test10/bug-lf-2551.summary
+++ b/pengine/test10/bug-lf-2551.summary
@@ -102,7 +102,7 @@ Transition Summary:
Executing cluster transition:
* Resource action: dummy1 monitor=300000 on hex-8
* Resource action: dummy1 monitor=300000 on hex-7
- * Fencing hex-9
+ * Fencing hex-9 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: load_stopped_hex-8
* Pseudo action: load_stopped_hex-7
diff --git a/pengine/test10/bug-lf-2606.summary b/pengine/test10/bug-lf-2606.summary
index c03ed6a..baa0f3b 100644
--- a/pengine/test10/bug-lf-2606.summary
+++ b/pengine/test10/bug-lf-2606.summary
@@ -17,7 +17,7 @@ Transition Summary:
Executing cluster transition:
* Pseudo action: ms3_demote_0
- * Fencing node2
+ * Fencing node2 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: rsc1_stop_0
* Pseudo action: rsc2_stop_0
diff --git a/pengine/test10/interleave-pseudo-stop.summary b/pengine/test10/interleave-pseudo-stop.summary
index 7ac882d..ea86c4f 100644
--- a/pengine/test10/interleave-pseudo-stop.summary
+++ b/pengine/test10/interleave-pseudo-stop.summary
@@ -22,7 +22,7 @@ Executing cluster transition:
* Pseudo action: evmscloneset_pre_notify_stop_0
* Pseudo action: imagestorecloneset_pre_notify_stop_0
* Pseudo action: configstorecloneset_pre_notify_stop_0
- * Fencing node1
+ * Fencing node1 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: stonithcloneset_stop_0
* Resource action: evmsclone:1 notify on node2
diff --git a/pengine/test10/master-7.summary b/pengine/test10/master-7.summary
index 5102290..81aeed7 100644
--- a/pengine/test10/master-7.summary
+++ b/pengine/test10/master-7.summary
@@ -55,7 +55,7 @@ Executing cluster transition:
* Resource action: ocf_msdummy:7 monitor on c001n03
* Resource action: ocf_msdummy:7 monitor on c001n02
* Pseudo action: master_rsc_1_demote_0
- * Fencing c001n01
+ * Fencing c001n01 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: DcIPaddr_stop_0
diff --git a/pengine/test10/master-8.summary b/pengine/test10/master-8.summary
index 8828bfe..e12f791 100644
--- a/pengine/test10/master-8.summary
+++ b/pengine/test10/master-8.summary
@@ -56,7 +56,7 @@ Executing cluster transition:
* Resource action: ocf_msdummy:7 monitor on c001n03
* Resource action: ocf_msdummy:7 monitor on c001n02
* Pseudo action: master_rsc_1_demote_0
- * Fencing c001n01
+ * Fencing c001n01 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: DcIPaddr_stop_0
diff --git a/pengine/test10/migrate-fencing.summary b/pengine/test10/migrate-fencing.summary
index 920e754..e8bcd45 100644
--- a/pengine/test10/migrate-fencing.summary
+++ b/pengine/test10/migrate-fencing.summary
@@ -36,7 +36,7 @@ Transition Summary:
Executing cluster transition:
* Resource action: stateful-1:3 monitor=15000 on pcmk-3
* Resource action: stateful-1:2 monitor=15000 on pcmk-2
- * Fencing pcmk-4
+ * Fencing pcmk-4 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: Fencing_stop_0
* Pseudo action: rsc_pcmk-4_stop_0
diff --git a/pengine/test10/rec-node-11.summary b/pengine/test10/rec-node-11.summary
index 5ba0c0d..d2ad78a 100644
--- a/pengine/test10/rec-node-11.summary
+++ b/pengine/test10/rec-node-11.summary
@@ -19,7 +19,7 @@ Executing cluster transition:
* Resource action: stonith-1 monitor on node2
* Resource action: rsc1 monitor on node2
* Resource action: rsc2 monitor on node2
- * Fencing node1
+ * Fencing node1 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Resource action: stonith-1 start on node2
diff --git a/pengine/test10/rec-node-12.summary b/pengine/test10/rec-node-12.summary
index eeccb53..4fd63b4 100644
--- a/pengine/test10/rec-node-12.summary
+++ b/pengine/test10/rec-node-12.summary
@@ -53,7 +53,7 @@ Executing cluster transition:
* Resource action: child_DoFencing:3 monitor on c001n03
* Resource action: child_DoFencing:3 monitor on c001n01
* Pseudo action: DoFencing_start_0
- * Fencing c001n02
+ * Fencing c001n02 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/rec-node-13.summary b/pengine/test10/rec-node-13.summary
index 356b67d..82f210a 100644
--- a/pengine/test10/rec-node-13.summary
+++ b/pengine/test10/rec-node-13.summary
@@ -37,7 +37,7 @@ Transition Summary:
* Stop ocf_msdummy:6 (c001n04)
Executing cluster transition:
- * Fencing c001n04
+ * Fencing c001n04 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: master_rsc_1_stop_0
* Pseudo action: ocf_msdummy:6_stop_0
diff --git a/pengine/test10/rec-node-14.summary b/pengine/test10/rec-node-14.summary
index 231decd..d97d943 100644
--- a/pengine/test10/rec-node-14.summary
+++ b/pengine/test10/rec-node-14.summary
@@ -10,9 +10,9 @@ Node node3 (uuid3): UNCLEAN (offline)
Transition Summary:
Executing cluster transition:
- * Fencing node1
- * Fencing node3
- * Fencing node2
+ * Fencing node1 (reboot)
+ * Fencing node3 (reboot)
+ * Fencing node2 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/rec-node-15.summary b/pengine/test10/rec-node-15.summary
index 570433c..85bfed5 100644
--- a/pengine/test10/rec-node-15.summary
+++ b/pengine/test10/rec-node-15.summary
@@ -36,7 +36,7 @@ Executing cluster transition:
* Resource action: stonith-1 monitor on sapcl01
* Pseudo action: app02_stop_0
* Pseudo action: oracle_start_0
- * Fencing sapcl03
+ * Fencing sapcl03 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Resource action: stonith-1 start on sapcl01
diff --git a/pengine/test10/rec-node-2.summary b/pengine/test10/rec-node-2.summary
index 645ef46..daa2879 100644
--- a/pengine/test10/rec-node-2.summary
+++ b/pengine/test10/rec-node-2.summary
@@ -32,7 +32,7 @@ Executing cluster transition:
* Pseudo action: group2_start_0
* Resource action: rsc5 monitor on node2
* Resource action: rsc6 monitor on node2
- * Fencing node1
+ * Fencing node1 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/rec-node-4.summary b/pengine/test10/rec-node-4.summary
index 782c377..295da1d 100644
--- a/pengine/test10/rec-node-4.summary
+++ b/pengine/test10/rec-node-4.summary
@@ -16,7 +16,7 @@ Executing cluster transition:
* Resource action: stonith-1 monitor on node2
* Resource action: rsc1 monitor on node2
* Resource action: rsc2 monitor on node2
- * Fencing node1
+ * Fencing node1 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Resource action: stonith-1 start on node2
diff --git a/pengine/test10/rec-node-6.summary b/pengine/test10/rec-node-6.summary
index 2bd563b..300d61b 100644
--- a/pengine/test10/rec-node-6.summary
+++ b/pengine/test10/rec-node-6.summary
@@ -16,7 +16,7 @@ Executing cluster transition:
* Resource action: stonith-1 monitor on node2
* Resource action: rsc1 monitor on node2
* Resource action: rsc2 monitor on node2
- * Fencing node1
+ * Fencing node1 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Resource action: stonith-1 start on node2
diff --git a/pengine/test10/rec-node-7.summary b/pengine/test10/rec-node-7.summary
index 782c377..295da1d 100644
--- a/pengine/test10/rec-node-7.summary
+++ b/pengine/test10/rec-node-7.summary
@@ -16,7 +16,7 @@ Executing cluster transition:
* Resource action: stonith-1 monitor on node2
* Resource action: rsc1 monitor on node2
* Resource action: rsc2 monitor on node2
- * Fencing node1
+ * Fencing node1 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Resource action: stonith-1 start on node2
diff --git a/pengine/test10/rec-rsc-5.summary b/pengine/test10/rec-rsc-5.summary
index 9c9239b..549abe6 100644
--- a/pengine/test10/rec-rsc-5.summary
+++ b/pengine/test10/rec-rsc-5.summary
@@ -16,7 +16,7 @@ Executing cluster transition:
* Resource action: stonith-1 monitor on node1
* Resource action: rsc1 monitor on node1
* Resource action: rsc2 monitor on node1
- * Fencing node2
+ * Fencing node2 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Resource action: stonith-1 start on node1
diff --git a/pengine/test10/stonith-0.summary b/pengine/test10/stonith-0.summary
index 9330291..4ec1ff7 100644
--- a/pengine/test10/stonith-0.summary
+++ b/pengine/test10/stonith-0.summary
@@ -45,8 +45,8 @@ Transition Summary:
Executing cluster transition:
* Resource action: child_DoFencing:4 monitor=20000 on c001n08
- * Fencing c001n05
- * Fencing c001n03
+ * Fencing c001n05 (reboot)
+ * Fencing c001n03 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: group-1_stop_0
* Pseudo action: ocf_192.168.100.183_stop_0
diff --git a/pengine/test10/stonith-1.summary b/pengine/test10/stonith-1.summary
index d3e81db..ed83ad7 100644
--- a/pengine/test10/stonith-1.summary
+++ b/pengine/test10/stonith-1.summary
@@ -44,7 +44,7 @@ Executing cluster transition:
* Resource action: lsb_dummy monitor=5000 on sles-2
* Resource action: rsc_sles-2 monitor=5000 on sles-2
* Resource action: rsc_sles-4 monitor=5000 on sles-4
- * Fencing sles-3
+ * Fencing sles-3 (reboot)
* Pseudo action: stonith_complete
* Resource action: r192.168.100.183 start on sles-1
* Pseudo action: migrator_stop_0
diff --git a/pengine/test10/stonith-2.summary b/pengine/test10/stonith-2.summary
index f02dd74..169f44f 100644
--- a/pengine/test10/stonith-2.summary
+++ b/pengine/test10/stonith-2.summary
@@ -36,7 +36,7 @@ Transition Summary:
* Start rsc_sles-5 (sles-6)
Executing cluster transition:
- * Fencing sles-5
+ * Fencing sles-5 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: all_stopped
* Resource action: rsc_sles-5 start on sles-6
diff --git a/pengine/test10/stonith-3.summary b/pengine/test10/stonith-3.summary
index b5b6d8a..095ce73 100644
--- a/pengine/test10/stonith-3.summary
+++ b/pengine/test10/stonith-3.summary
@@ -15,7 +15,7 @@ Executing cluster transition:
* Resource action: prmIpPostgreSQLDB monitor on rh5node2
* Resource action: prmStonith:0 monitor on rh5node2
* Pseudo action: clnStonith_start_0
- * Fencing rh5node1
+ * Fencing rh5node1 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/stonith-4.summary b/pengine/test10/stonith-4.summary
index 1f87015..2e12deb 100644
--- a/pengine/test10/stonith-4.summary
+++ b/pengine/test10/stonith-4.summary
@@ -17,10 +17,10 @@ Transition Summary:
* Start Fencing (pcmk-1)
Executing cluster transition:
- * Fencing pcmk-10
- * Fencing pcmk-5
- * Fencing pcmk-7
- * Fencing pcmk-8
+ * Fencing pcmk-10 (reboot)
+ * Fencing pcmk-5 (reboot)
+ * Fencing pcmk-7 (reboot)
+ * Fencing pcmk-8 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: all_stopped
Transition failed: terminated
diff --git a/pengine/test10/stop-failure-no-quorum.summary b/pengine/test10/stop-failure-no-quorum.summary
index 49a0f54..d57bdc6 100644
--- a/pengine/test10/stop-failure-no-quorum.summary
+++ b/pengine/test10/stop-failure-no-quorum.summary
@@ -22,7 +22,7 @@ Transition Summary:
* Start Fencing (pcmk-1 - blocked)
Executing cluster transition:
- * Fencing pcmk-2
+ * Fencing pcmk-2 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: clvm-clone_stop_0
* Pseudo action: clvm_stop_0
diff --git a/pengine/test10/stop-failure-with-fencing.summary b/pengine/test10/stop-failure-with-fencing.summary
index 0473b80..de74dbc 100644
--- a/pengine/test10/stop-failure-with-fencing.summary
+++ b/pengine/test10/stop-failure-with-fencing.summary
@@ -22,7 +22,7 @@ Transition Summary:
Executing cluster transition:
* Resource action: Fencing monitor on pcmk-1
- * Fencing pcmk-2
+ * Fencing pcmk-2 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: clvm-clone_stop_0
diff --git a/pengine/test10/systemhealth1.summary b/pengine/test10/systemhealth1.summary
index 49c6579..bbdbcaf 100644
--- a/pengine/test10/systemhealth1.summary
+++ b/pengine/test10/systemhealth1.summary
@@ -10,8 +10,8 @@ Node hs21d (737318c6-0f92-4592-9754-45967d45aff7): UNCLEAN (offline)
Transition Summary:
Executing cluster transition:
- * Fencing hs21d
- * Fencing hs21c
+ * Fencing hs21d (reboot)
+ * Fencing hs21c (reboot)
* Pseudo action: stonith_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/systemhealth2.summary b/pengine/test10/systemhealth2.summary
index dfdfa02..0ca09d0 100644
--- a/pengine/test10/systemhealth2.summary
+++ b/pengine/test10/systemhealth2.summary
@@ -16,7 +16,7 @@ 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
+ * Fencing hs21d (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/systemhealth3.summary b/pengine/test10/systemhealth3.summary
index dfdfa02..0ca09d0 100644
--- a/pengine/test10/systemhealth3.summary
+++ b/pengine/test10/systemhealth3.summary
@@ -16,7 +16,7 @@ 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
+ * Fencing hs21d (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/systemhealthm1.summary b/pengine/test10/systemhealthm1.summary
index 49c6579..bbdbcaf 100644
--- a/pengine/test10/systemhealthm1.summary
+++ b/pengine/test10/systemhealthm1.summary
@@ -10,8 +10,8 @@ Node hs21d (737318c6-0f92-4592-9754-45967d45aff7): UNCLEAN (offline)
Transition Summary:
Executing cluster transition:
- * Fencing hs21d
- * Fencing hs21c
+ * Fencing hs21d (reboot)
+ * Fencing hs21c (reboot)
* Pseudo action: stonith_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/systemhealthm2.summary b/pengine/test10/systemhealthm2.summary
index dfdfa02..0ca09d0 100644
--- a/pengine/test10/systemhealthm2.summary
+++ b/pengine/test10/systemhealthm2.summary
@@ -16,7 +16,7 @@ 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
+ * Fencing hs21d (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/systemhealthm3.summary b/pengine/test10/systemhealthm3.summary
index 6964943..7fcab05 100644
--- a/pengine/test10/systemhealthm3.summary
+++ b/pengine/test10/systemhealthm3.summary
@@ -13,7 +13,7 @@ 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
+ * Fencing hs21d (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/systemhealthn1.summary b/pengine/test10/systemhealthn1.summary
index 49c6579..bbdbcaf 100644
--- a/pengine/test10/systemhealthn1.summary
+++ b/pengine/test10/systemhealthn1.summary
@@ -10,8 +10,8 @@ Node hs21d (737318c6-0f92-4592-9754-45967d45aff7): UNCLEAN (offline)
Transition Summary:
Executing cluster transition:
- * Fencing hs21d
- * Fencing hs21c
+ * Fencing hs21d (reboot)
+ * Fencing hs21c (reboot)
* Pseudo action: stonith_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/systemhealthn2.summary b/pengine/test10/systemhealthn2.summary
index dfdfa02..0ca09d0 100644
--- a/pengine/test10/systemhealthn2.summary
+++ b/pengine/test10/systemhealthn2.summary
@@ -16,7 +16,7 @@ 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
+ * Fencing hs21d (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/systemhealthn3.summary b/pengine/test10/systemhealthn3.summary
index dfdfa02..0ca09d0 100644
--- a/pengine/test10/systemhealthn3.summary
+++ b/pengine/test10/systemhealthn3.summary
@@ -16,7 +16,7 @@ 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
+ * Fencing hs21d (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/systemhealtho1.summary b/pengine/test10/systemhealtho1.summary
index 49c6579..bbdbcaf 100644
--- a/pengine/test10/systemhealtho1.summary
+++ b/pengine/test10/systemhealtho1.summary
@@ -10,8 +10,8 @@ Node hs21d (737318c6-0f92-4592-9754-45967d45aff7): UNCLEAN (offline)
Transition Summary:
Executing cluster transition:
- * Fencing hs21d
- * Fencing hs21c
+ * Fencing hs21d (reboot)
+ * Fencing hs21c (reboot)
* Pseudo action: stonith_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/systemhealtho2.summary b/pengine/test10/systemhealtho2.summary
index 6964943..7fcab05 100644
--- a/pengine/test10/systemhealtho2.summary
+++ b/pengine/test10/systemhealtho2.summary
@@ -13,7 +13,7 @@ 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
+ * Fencing hs21d (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/systemhealtho3.summary b/pengine/test10/systemhealtho3.summary
index 6964943..7fcab05 100644
--- a/pengine/test10/systemhealtho3.summary
+++ b/pengine/test10/systemhealtho3.summary
@@ -13,7 +13,7 @@ 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
+ * Fencing hs21d (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/systemhealthp1.summary b/pengine/test10/systemhealthp1.summary
index 49c6579..bbdbcaf 100644
--- a/pengine/test10/systemhealthp1.summary
+++ b/pengine/test10/systemhealthp1.summary
@@ -10,8 +10,8 @@ Node hs21d (737318c6-0f92-4592-9754-45967d45aff7): UNCLEAN (offline)
Transition Summary:
Executing cluster transition:
- * Fencing hs21d
- * Fencing hs21c
+ * Fencing hs21d (reboot)
+ * Fencing hs21c (reboot)
* Pseudo action: stonith_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/systemhealthp2.summary b/pengine/test10/systemhealthp2.summary
index f01150f..12a888c 100644
--- a/pengine/test10/systemhealthp2.summary
+++ b/pengine/test10/systemhealthp2.summary
@@ -15,7 +15,7 @@ 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
+ * Fencing hs21d (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/systemhealthp3.summary b/pengine/test10/systemhealthp3.summary
index 6964943..7fcab05 100644
--- a/pengine/test10/systemhealthp3.summary
+++ b/pengine/test10/systemhealthp3.summary
@@ -13,7 +13,7 @@ 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
+ * Fencing hs21d (reboot)
* Pseudo action: stonith_complete
* Pseudo action: probe_complete
* Pseudo action: all_stopped
diff --git a/pengine/test10/ticket-clone-21.summary b/pengine/test10/ticket-clone-21.summary
index 7973159..5ae23ec 100644
--- a/pengine/test10/ticket-clone-21.summary
+++ b/pengine/test10/ticket-clone-21.summary
@@ -12,9 +12,9 @@ Transition Summary:
* Stop rsc1:1 (node2)
Executing cluster transition:
- * Fencing node1
+ * Fencing node1 (reboot)
* Pseudo action: rsc_stonith_stop_0
- * Fencing node2
+ * Fencing node2 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: clone1_stop_0
* Pseudo action: rsc1:1_stop_0
diff --git a/pengine/test10/ticket-clone-9.summary b/pengine/test10/ticket-clone-9.summary
index 7973159..5ae23ec 100644
--- a/pengine/test10/ticket-clone-9.summary
+++ b/pengine/test10/ticket-clone-9.summary
@@ -12,9 +12,9 @@ Transition Summary:
* Stop rsc1:1 (node2)
Executing cluster transition:
- * Fencing node1
+ * Fencing node1 (reboot)
* Pseudo action: rsc_stonith_stop_0
- * Fencing node2
+ * Fencing node2 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: clone1_stop_0
* Pseudo action: rsc1:1_stop_0
diff --git a/pengine/test10/ticket-group-21.summary b/pengine/test10/ticket-group-21.summary
index c0783e0..9027d2c 100644
--- a/pengine/test10/ticket-group-21.summary
+++ b/pengine/test10/ticket-group-21.summary
@@ -12,7 +12,7 @@ Transition Summary:
* Stop rsc2 (node2)
Executing cluster transition:
- * Fencing node2
+ * Fencing node2 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: group1_stop_0
* Pseudo action: rsc2_stop_0
diff --git a/pengine/test10/ticket-group-9.summary b/pengine/test10/ticket-group-9.summary
index c0783e0..9027d2c 100644
--- a/pengine/test10/ticket-group-9.summary
+++ b/pengine/test10/ticket-group-9.summary
@@ -12,7 +12,7 @@ Transition Summary:
* Stop rsc2 (node2)
Executing cluster transition:
- * Fencing node2
+ * Fencing node2 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: group1_stop_0
* Pseudo action: rsc2_stop_0
diff --git a/pengine/test10/ticket-master-21.summary b/pengine/test10/ticket-master-21.summary
index ca5bf84..64a9cbe 100644
--- a/pengine/test10/ticket-master-21.summary
+++ b/pengine/test10/ticket-master-21.summary
@@ -13,7 +13,7 @@ Transition Summary:
Executing cluster transition:
* Pseudo action: ms1_demote_0
- * Fencing node1
+ * Fencing node1 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: rsc_stonith_stop_0
* Pseudo action: rsc1:1_demote_0
diff --git a/pengine/test10/ticket-master-9.summary b/pengine/test10/ticket-master-9.summary
index ca5bf84..64a9cbe 100644
--- a/pengine/test10/ticket-master-9.summary
+++ b/pengine/test10/ticket-master-9.summary
@@ -13,7 +13,7 @@ Transition Summary:
Executing cluster transition:
* Pseudo action: ms1_demote_0
- * Fencing node1
+ * Fencing node1 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: rsc_stonith_stop_0
* Pseudo action: rsc1:1_demote_0
diff --git a/pengine/test10/ticket-primitive-21.summary b/pengine/test10/ticket-primitive-21.summary
index 3afd279..6c523fe 100644
--- a/pengine/test10/ticket-primitive-21.summary
+++ b/pengine/test10/ticket-primitive-21.summary
@@ -9,7 +9,7 @@ Transition Summary:
* Stop rsc1 (node2)
Executing cluster transition:
- * Fencing node2
+ * Fencing node2 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: rsc1_stop_0
* Pseudo action: all_stopped
diff --git a/pengine/test10/ticket-primitive-9.summary b/pengine/test10/ticket-primitive-9.summary
index 3afd279..6c523fe 100644
--- a/pengine/test10/ticket-primitive-9.summary
+++ b/pengine/test10/ticket-primitive-9.summary
@@ -9,7 +9,7 @@ Transition Summary:
* Stop rsc1 (node2)
Executing cluster transition:
- * Fencing node2
+ * Fencing node2 (reboot)
* Pseudo action: stonith_complete
* Pseudo action: rsc1_stop_0
* Pseudo action: all_stopped
diff --git a/tools/crm_simulate.c b/tools/crm_simulate.c
index 9d20cdd..e81d4ee 100644
--- a/tools/crm_simulate.c
+++ b/tools/crm_simulate.c
@@ -497,31 +497,36 @@ exec_crmd_action(crm_graph_t * graph, crm_action_t * action)
static gboolean
exec_stonith_action(crm_graph_t * graph, crm_action_t * action)
{
- int rc = 0;
- char xpath[STATUS_PATH_MAX];
+ const char *op = crm_meta_value(action->params, "stonith_action");
char *target = crm_element_value_copy(action->xml, XML_LRM_ATTR_TARGET);
- xmlNode *cib_node = modify_node(global_cib, target, FALSE);
- crm_xml_add(cib_node, XML_ATTR_ORIGIN, __FUNCTION__);
- CRM_ASSERT(cib_node != NULL);
+ quiet_log(" * Fencing %s (%s)\n", target, op);
+ if(safe_str_neq(op, "on")) {
+ int rc = 0;
+ char xpath[STATUS_PATH_MAX];
+ xmlNode *cib_node = modify_node(global_cib, target, FALSE);
- quiet_log(" * Fencing %s\n", target);
- rc = global_cib->cmds->replace(global_cib, XML_CIB_TAG_STATUS, cib_node,
+ crm_xml_add(cib_node, XML_ATTR_ORIGIN, __FUNCTION__);
+ CRM_ASSERT(cib_node != NULL);
+
+ rc = global_cib->cmds->replace(global_cib, XML_CIB_TAG_STATUS, cib_node,
cib_sync_call | cib_scope_local);
- CRM_ASSERT(rc == pcmk_ok);
+ CRM_ASSERT(rc == pcmk_ok);
- snprintf(xpath, STATUS_PATH_MAX, "//node_state[@uname='%s']/%s", target, XML_CIB_TAG_LRM);
- rc = global_cib->cmds->delete(global_cib, xpath, NULL,
- cib_xpath | cib_sync_call | cib_scope_local);
+ snprintf(xpath, STATUS_PATH_MAX, "//node_state[@uname='%s']/%s", target, XML_CIB_TAG_LRM);
+ rc = global_cib->cmds->delete(global_cib, xpath, NULL,
+ cib_xpath | cib_sync_call | cib_scope_local);
- snprintf(xpath, STATUS_PATH_MAX, "//node_state[@uname='%s']/%s", target,
- XML_TAG_TRANSIENT_NODEATTRS);
- rc = global_cib->cmds->delete(global_cib, xpath, NULL,
- cib_xpath | cib_sync_call | cib_scope_local);
+ snprintf(xpath, STATUS_PATH_MAX, "//node_state[@uname='%s']/%s", target,
+ XML_TAG_TRANSIENT_NODEATTRS);
+ rc = global_cib->cmds->delete(global_cib, xpath, NULL,
+ cib_xpath | cib_sync_call | cib_scope_local);
+
+ free_xml(cib_node);
+ }
action->confirmed = TRUE;
update_graph(graph, action);
- free_xml(cib_node);
free(target);
return TRUE;
}