Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP2:Update
pacemaker.13547
bsc#1130122-0002-Test-scheduler-wait-for-probe-...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File bsc#1130122-0002-Test-scheduler-wait-for-probe-actions-to-complete-to-1.1.patch of Package pacemaker.13547
From 3228b6b4df624db4b72d40bd366433f673a8780e Mon Sep 17 00:00:00 2001 From: "Gao,Yan" <ygao@suse.com> Date: Tue, 30 Apr 2019 03:47:07 +0200 Subject: [PATCH 2/2] Test: scheduler: wait for probe actions to complete to prevent unnecessary restart/re-promote of dependent resources (update tests) --- .../test10/11-a-then-bm-b-move-a-clone-starting.dot | 1 + .../test10/11-a-then-bm-b-move-a-clone-starting.exp | 6 +++++- pengine/test10/bug-n-387749.dot | 7 +++++++ pengine/test10/bug-n-387749.exp | 21 +++++++++++++++++++++ pengine/test10/group5.dot | 3 +++ pengine/test10/group5.exp | 9 +++++++++ pengine/test10/group6.dot | 6 ++++++ pengine/test10/group6.exp | 18 ++++++++++++++++++ pengine/test10/group9.dot | 6 ++++++ pengine/test10/group9.exp | 18 ++++++++++++++++++ pengine/test10/order6.dot | 2 ++ pengine/test10/order6.exp | 12 ++++++++++-- pengine/test10/reload-becomes-restart.dot | 1 + pengine/test10/reload-becomes-restart.exp | 3 +++ 14 files changed, 110 insertions(+), 3 deletions(-) Index: pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/11-a-then-bm-b-move-a-clone-starting.dot =================================================================== --- pacemaker-1.1.19+20181105.ccd6b5b10.orig/pengine/test10/11-a-then-bm-b-move-a-clone-starting.dot +++ pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/11-a-then-bm-b-move-a-clone-starting.dot @@ -14,6 +14,7 @@ "myclone_monitor_0 f20node2" -> "all_stopped" [ style = bold] "myclone_monitor_0 f20node2" -> "myclone-clone_start_0" [ style = bold] "myclone_monitor_0 f20node2" -> "myclone-clone_stopped_0" [ style = bold] +"myclone_monitor_0 f20node2" -> "vm_stop_0 f20node1" [ style = bold] "myclone_monitor_0 f20node2" [ style=bold color="green" fontcolor="black"] "myclone_start_0 f20node2" -> "myclone-clone_running_0" [ style = bold] "myclone_start_0 f20node2" [ style=bold color="green" fontcolor="black"] Index: pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp =================================================================== --- pacemaker-1.1.19+20181105.ccd6b5b10.orig/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp +++ pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp @@ -120,7 +120,11 @@ <attributes CRM_meta_on_node="f20node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs/> + <inputs> + <trigger> + <rsc_op id="2" operation="monitor" operation_key="myclone_monitor_0" internal_operation_key="myclone:0_monitor_0" on_node="f20node2" on_node_uuid="2"/> + </trigger> + </inputs> </synapse> <synapse id="9"> <action_set> Index: pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/bug-n-387749.dot =================================================================== --- pacemaker-1.1.19+20181105.ccd6b5b10.orig/pengine/test10/bug-n-387749.dot +++ pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/bug-n-387749.dot @@ -2,6 +2,8 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "export_home_ocfs2:0_monitor_0 power720-1" -> "all_stopped" [ style = bold] "export_home_ocfs2:0_monitor_0 power720-1" -> "export_home_ocfs2_clone_set_start_0" [ style = bold] +"export_home_ocfs2:0_monitor_0 power720-1" -> "resource_ipaddr1_single_stop_0 power720-2" [ style = bold] +"export_home_ocfs2:0_monitor_0 power720-1" -> "resource_nfsserver_single_stop_0 power720-2" [ style = bold] "export_home_ocfs2:0_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ] "export_home_ocfs2:0_post_notify_start_0 power720-1" -> "export_home_ocfs2_clone_set_confirmed-post_notify_running_0" [ style = bold] "export_home_ocfs2:0_post_notify_start_0 power720-1" [ style=bold color="green" fontcolor="black" ] @@ -9,6 +11,8 @@ digraph "g" { "export_home_ocfs2:0_start_0 power720-1" [ style=bold color="green" fontcolor="black" ] "export_home_ocfs2:1_monitor_0 power720-1" -> "all_stopped" [ style = bold] "export_home_ocfs2:1_monitor_0 power720-1" -> "export_home_ocfs2_clone_set_start_0" [ style = bold] +"export_home_ocfs2:1_monitor_0 power720-1" -> "resource_ipaddr1_single_stop_0 power720-2" [ style = bold] +"export_home_ocfs2:1_monitor_0 power720-1" -> "resource_nfsserver_single_stop_0 power720-2" [ style = bold] "export_home_ocfs2:1_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ] "export_home_ocfs2:1_post_notify_start_0 power720-2" -> "export_home_ocfs2_clone_set_confirmed-post_notify_running_0" [ style = bold] "export_home_ocfs2:1_post_notify_start_0 power720-2" [ style=bold color="green" fontcolor="black" ] @@ -16,6 +20,8 @@ digraph "g" { "export_home_ocfs2:1_pre_notify_start_0 power720-2" [ style=bold color="green" fontcolor="black" ] "export_home_ocfs2:2_monitor_0 power720-1" -> "all_stopped" [ style = bold] "export_home_ocfs2:2_monitor_0 power720-1" -> "export_home_ocfs2_clone_set_start_0" [ style = bold] +"export_home_ocfs2:2_monitor_0 power720-1" -> "resource_ipaddr1_single_stop_0 power720-2" [ style = bold] +"export_home_ocfs2:2_monitor_0 power720-1" -> "resource_nfsserver_single_stop_0 power720-2" [ style = bold] "export_home_ocfs2:2_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ] "export_home_ocfs2_clone_set_confirmed-post_notify_running_0" -> "group_nfs_start_0" [ style = bold] "export_home_ocfs2_clone_set_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] @@ -48,6 +54,7 @@ digraph "g" { "resource_ipaddr1_single_monitor_0 power720-1" -> "all_stopped" [ style = bold] "resource_ipaddr1_single_monitor_0 power720-1" -> "group_nfs_stopped_0" [ style = bold] "resource_ipaddr1_single_monitor_0 power720-1" -> "resource_ipaddr1_single_start_0 power720-1" [ style = bold] +"resource_ipaddr1_single_monitor_0 power720-1" -> "resource_nfsserver_single_stop_0 power720-2" [ style = bold] "resource_ipaddr1_single_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ] "resource_ipaddr1_single_monitor_5000 power720-1" [ style=bold color="green" fontcolor="black" ] "resource_ipaddr1_single_start_0 power720-1" -> "group_nfs_running_0" [ style = bold] Index: pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/group5.dot =================================================================== --- pacemaker-1.1.19+20181105.ccd6b5b10.orig/pengine/test10/group5.dot +++ pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/group5.dot @@ -2,6 +2,8 @@ "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1_monitor_0 node2" -> "child_rsc1_start_0 node2" [ style = bold] +"child_rsc1_monitor_0 node2" -> "child_rsc2_stop_0 node1" [ style = bold] +"child_rsc1_monitor_0 node2" -> "child_rsc3_stop_0 node1" [ style = bold] "child_rsc1_monitor_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold] @@ -14,6 +16,7 @@ "child_rsc2_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc2_monitor_0 node2" -> "child_rsc1_stop_0 node1" [ style = bold] "child_rsc2_monitor_0 node2" -> "child_rsc2_start_0 node2" [ style = bold] +"child_rsc2_monitor_0 node2" -> "child_rsc3_stop_0 node1" [ style = bold] "child_rsc2_monitor_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold] Index: pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/group6.dot =================================================================== --- pacemaker-1.1.19+20181105.ccd6b5b10.orig/pengine/test10/group6.dot +++ pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/group6.dot @@ -2,6 +2,8 @@ "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1_monitor_0 node2" -> "child_rsc1_start_0 node2" [ style = bold] +"child_rsc1_monitor_0 node2" -> "child_rsc2_stop_0 node1" [ style = bold] +"child_rsc1_monitor_0 node2" -> "child_rsc3_stop_0 node1" [ style = bold] "child_rsc1_monitor_0 node2" -> "rsc1_stopped_0" [ style = bold] "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold] @@ -14,6 +16,7 @@ "child_rsc2_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc2_monitor_0 node2" -> "child_rsc1_stop_0 node1" [ style = bold] "child_rsc2_monitor_0 node2" -> "child_rsc2_start_0 node2" [ style = bold] +"child_rsc2_monitor_0 node2" -> "child_rsc3_stop_0 node1" [ style = bold] "child_rsc2_monitor_0 node2" -> "rsc1_stopped_0" [ style = bold] "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold] @@ -38,6 +41,8 @@ "child_rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc4_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc4_monitor_0 node2" -> "child_rsc4_start_0 node2" [ style = bold] +"child_rsc4_monitor_0 node2" -> "child_rsc5_stop_0 node1" [ style = bold] +"child_rsc4_monitor_0 node2" -> "child_rsc6_stop_0 node1" [ style = bold] "child_rsc4_monitor_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc4_start_0 node2" -> "child_rsc5_start_0 node2" [ style = bold] @@ -50,6 +55,7 @@ "child_rsc5_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc5_monitor_0 node2" -> "child_rsc4_stop_0 node1" [ style = bold] "child_rsc5_monitor_0 node2" -> "child_rsc5_start_0 node2" [ style = bold] +"child_rsc5_monitor_0 node2" -> "child_rsc6_stop_0 node1" [ style = bold] "child_rsc5_monitor_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc5_start_0 node2" -> "child_rsc6_start_0 node2" [ style = bold] Index: pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/group9.dot =================================================================== --- pacemaker-1.1.19+20181105.ccd6b5b10.orig/pengine/test10/group9.dot +++ pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/group9.dot @@ -30,10 +30,13 @@ "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc3_monitor_0 node2" -> "foo_stopped_0" [ style = bold] +"rsc3_monitor_0 node2" -> "rsc4_stop_0 node1" [ style = bold] +"rsc3_monitor_0 node2" -> "rsc5_stop_0 node1" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc4_monitor_0 node2" -> "foo_stopped_0" [ style = bold] "rsc4_monitor_0 node2" -> "rsc4_start_0 node1" [ style = bold] +"rsc4_monitor_0 node2" -> "rsc5_stop_0 node1" [ style = bold] "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node1" -> "foo_running_0" [ style = bold] "rsc4_start_0 node1" -> "rsc5_start_0 node1" [ style = bold] @@ -57,6 +60,8 @@ "rsc6_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc6_monitor_0 node2" -> "bar_stopped_0" [ style = bold] "rsc6_monitor_0 node2" -> "rsc6_start_0 node2" [ style = bold] +"rsc6_monitor_0 node2" -> "rsc7_stop_0 node1" [ style = bold] +"rsc6_monitor_0 node2" -> "rsc8_stop_0 node1" [ style = bold] "rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6_start_0 node2" -> "bar_running_0" [ style = bold] "rsc6_start_0 node2" -> "rsc7_start_0 node2" [ style = bold] @@ -69,6 +74,7 @@ "rsc7_monitor_0 node2" -> "bar_stopped_0" [ style = bold] "rsc7_monitor_0 node2" -> "rsc6_stop_0 node1" [ style = bold] "rsc7_monitor_0 node2" -> "rsc7_start_0 node2" [ style = bold] +"rsc7_monitor_0 node2" -> "rsc8_stop_0 node1" [ style = bold] "rsc7_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc7_start_0 node2" -> "bar_running_0" [ style = bold] "rsc7_start_0 node2" -> "rsc8_start_0 node2" [ style = bold] Index: pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/order6.exp =================================================================== --- pacemaker-1.1.19+20181105.ccd6b5b10.orig/pengine/test10/order6.exp +++ pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/order6.exp @@ -31,7 +31,11 @@ <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs/> + <inputs> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + </inputs> </synapse> <synapse id="3"> <action_set> @@ -117,7 +121,11 @@ <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs/> + <inputs> + <trigger> + <rsc_op id="2" operation="monitor" operation_key="rsc5_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + </inputs> </synapse> <synapse id="11"> <action_set> Index: pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/reload-becomes-restart.dot =================================================================== --- pacemaker-1.1.19+20181105.ccd6b5b10.orig/pengine/test10/reload-becomes-restart.dot +++ pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/reload-becomes-restart.dot @@ -35,6 +35,7 @@ digraph "g" { "rsc1:0_start_0 node2" [ style=bold color="green" fontcolor="black"] "rsc1:1_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_monitor_0 node1" -> "cl-rsc1_start_0" [ style = bold] +"rsc1:1_monitor_0 node1" -> "rsc2_stop_0 node1" [ style = bold] "rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black"] "rsc1:1_monitor_120000 node1" [ style=bold color="green" fontcolor="black"] "rsc1:1_start_0 node1" -> "cl-rsc1_running_0" [ style = bold] Index: pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/reload-becomes-restart.exp =================================================================== --- pacemaker-1.1.19+20181105.ccd6b5b10.orig/pengine/test10/reload-becomes-restart.exp +++ pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/reload-becomes-restart.exp @@ -177,6 +177,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="5" operation="monitor" operation_key="rsc1:1_monitor_0" on_node="node1" on_node_uuid="1"/> + </trigger> + <trigger> <pseudo_event id="25" operation="stop" operation_key="cl-rsc2_stop_0"/> </trigger> </inputs> Index: pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/bug-n-387749.exp =================================================================== --- pacemaker-1.1.19+20181105.ccd6b5b10.orig/pengine/test10/bug-n-387749.exp +++ pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/bug-n-387749.exp @@ -276,6 +276,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="4" operation="monitor" operation_key="export_home_ocfs2:0_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="export_home_ocfs2:1_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="export_home_ocfs2:2_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/> + </trigger> + <trigger> <rsc_op id="8" operation="monitor" operation_key="resource_nfsserver_single_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/> </trigger> <trigger> @@ -339,6 +348,18 @@ </action_set> <inputs> <trigger> + <rsc_op id="4" operation="monitor" operation_key="export_home_ocfs2:0_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="export_home_ocfs2:1_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="export_home_ocfs2:2_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="resource_ipaddr1_single_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/> + </trigger> + <trigger> <pseudo_event id="32" operation="stop" operation_key="group_nfs_stop_0"/> </trigger> </inputs> Index: pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/group5.exp =================================================================== --- pacemaker-1.1.19+20181105.ccd6b5b10.orig/pengine/test10/group5.exp +++ pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/group5.exp @@ -196,6 +196,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="3" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="5" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> </trigger> <trigger> @@ -246,6 +249,12 @@ </action_set> <inputs> <trigger> + <rsc_op id="3" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <pseudo_event id="17" operation="stop" operation_key="rsc2_stop_0"/> </trigger> </inputs> Index: pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/group6.exp =================================================================== --- pacemaker-1.1.19+20181105.ccd6b5b10.orig/pengine/test10/group6.exp +++ pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/group6.exp @@ -152,6 +152,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="4" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> </trigger> <trigger> @@ -202,6 +205,12 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <pseudo_event id="16" operation="stop" operation_key="rsc1_stop_0"/> </trigger> </inputs> @@ -367,6 +376,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="5" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="7" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node2" on_node_uuid="uuid2"/> </trigger> <trigger> @@ -417,6 +429,12 @@ </action_set> <inputs> <trigger> + <rsc_op id="5" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <pseudo_event id="26" operation="stop" operation_key="rsc2_stop_0"/> </trigger> </inputs> Index: pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/group9.exp =================================================================== --- pacemaker-1.1.19+20181105.ccd6b5b10.orig/pengine/test10/group9.exp +++ pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/group9.exp @@ -128,6 +128,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="6" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> <rsc_op id="8" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="node2"/> </trigger> <trigger> @@ -169,6 +172,12 @@ </action_set> <inputs> <trigger> + <rsc_op id="6" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> <pseudo_event id="23" operation="stop" operation_key="foo_stop_0"/> </trigger> </inputs> @@ -340,6 +349,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="9" operation="monitor" operation_key="rsc6_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> <rsc_op id="11" operation="monitor" operation_key="rsc8_monitor_0" on_node="node2" on_node_uuid="node2"/> </trigger> <trigger> @@ -381,6 +393,12 @@ </action_set> <inputs> <trigger> + <rsc_op id="9" operation="monitor" operation_key="rsc6_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="rsc7_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> <pseudo_event id="32" operation="stop" operation_key="bar_stop_0"/> </trigger> </inputs> Index: pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/order6.dot =================================================================== --- pacemaker-1.1.19+20181105.ccd6b5b10.orig/pengine/test10/order6.dot +++ pacemaker-1.1.19+20181105.ccd6b5b10/pengine/test10/order6.dot @@ -1,6 +1,7 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] +"rsc1_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] @@ -19,6 +20,7 @@ "rsc4_stop_0 node1" -> "rsc4_start_0 node2" [ style = bold] "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5_monitor_0 node1" -> "all_stopped" [ style = bold] +"rsc5_monitor_0 node1" -> "rsc6_stop_0 node2" [ style = bold] "rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc6_monitor_0 node1" -> "rsc6_start_0 node1" [ style = bold]
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
