File bsc#1182313-0005-Test-scheduler-update-expected-output-for-migration-.patch of Package pacemaker.32036
From 4bc705ad3b55f6b3f5e19481873bdc70cfbb13c8 Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Thu, 2 Feb 2023 15:48:01 -0600
Subject: [PATCH 5/5] Test: scheduler: update expected output for migration fix
---
.../dot/migration-intermediary-cleaned.dot | 8 --
.../exp/migration-intermediary-cleaned.exp | 88 ++++---------------
.../migration-intermediary-cleaned.scores | 2 +-
.../migration-intermediary-cleaned.summary | 9 +-
4 files changed, 22 insertions(+), 85 deletions(-)
diff --git a/cts/scheduler/dot/migration-intermediary-cleaned.dot b/cts/scheduler/dot/migration-intermediary-cleaned.dot
index 09568d054..f6eabba58 100644
--- a/cts/scheduler/dot/migration-intermediary-cleaned.dot
+++ b/cts/scheduler/dot/migration-intermediary-cleaned.dot
@@ -7,15 +7,7 @@
"FencingPass_monitor_0 rhel8-2" [ style=bold color="green" fontcolor="black"]
"Fencing_monitor_0 rhel8-2" [ style=bold color="green" fontcolor="black"]
"lsb-dummy_monitor_0 rhel8-2" [ style=bold color="green" fontcolor="black"]
-"migrator_monitor_0 rhel8-2" -> "migrator_start_0 rhel8-5" [ style = bold]
"migrator_monitor_0 rhel8-2" [ style=bold color="green" fontcolor="black"]
-"migrator_monitor_10000 rhel8-5" [ style=bold color="green" fontcolor="black"]
-"migrator_start_0 rhel8-5" -> "migrator_monitor_10000 rhel8-5" [ style = bold]
-"migrator_start_0 rhel8-5" [ style=bold color="green" fontcolor="black"]
-"migrator_stop_0 rhel8-2" -> "migrator_start_0 rhel8-5" [ style = bold]
-"migrator_stop_0 rhel8-2" [ style=bold color="green" fontcolor="black"]
-"migrator_stop_0 rhel8-5" -> "migrator_start_0 rhel8-5" [ style = bold]
-"migrator_stop_0 rhel8-5" [ style=bold color="green" fontcolor="black"]
"petulant_monitor_0 rhel8-2" [ style=bold color="green" fontcolor="black"]
"ping-1_monitor_0 rhel8-2" -> "Connectivity_start_0" [ style = bold]
"ping-1_monitor_0 rhel8-2" [ style=bold color="green" fontcolor="black"]
diff --git a/cts/scheduler/exp/migration-intermediary-cleaned.exp b/cts/scheduler/exp/migration-intermediary-cleaned.exp
index 28fa776dd..8b9bb3994 100644
--- a/cts/scheduler/exp/migration-intermediary-cleaned.exp
+++ b/cts/scheduler/exp/migration-intermediary-cleaned.exp
@@ -148,91 +148,41 @@
<inputs/>
</synapse>
<synapse id="14">
- <action_set>
- <rsc_op id="53" operation="start" operation_key="migrator_start_0" on_node="rhel8-5" on_node_uuid="5">
- <primitive id="migrator" class="ocf" provider="pacemaker" type="Dummy"/>
- <attributes CRM_meta_on_node="rhel8-5" CRM_meta_on_node_uuid="5" CRM_meta_timeout="90000" passwd="whatever"/>
- </rsc_op>
- </action_set>
- <inputs>
- <trigger>
- <rsc_op id="26" operation="monitor" operation_key="migrator_monitor_0" on_node="rhel8-2" on_node_uuid="2"/>
- </trigger>
- <trigger>
- <rsc_op id="51" operation="stop" operation_key="migrator_stop_0" on_node="rhel8-5" on_node_uuid="5"/>
- </trigger>
- <trigger>
- <rsc_op id="52" operation="stop" operation_key="migrator_stop_0" on_node="rhel8-2" on_node_uuid="2"/>
- </trigger>
- </inputs>
- </synapse>
- <synapse id="15">
- <action_set>
- <rsc_op id="52" operation="stop" operation_key="migrator_stop_0" on_node="rhel8-2" on_node_uuid="2">
- <primitive id="migrator" class="ocf" provider="pacemaker" type="Dummy"/>
- <attributes CRM_meta_on_node="rhel8-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="90000" passwd="whatever"/>
- </rsc_op>
- </action_set>
- <inputs/>
- </synapse>
- <synapse id="16">
- <action_set>
- <rsc_op id="51" operation="stop" operation_key="migrator_stop_0" on_node="rhel8-5" on_node_uuid="5">
- <primitive id="migrator" class="ocf" provider="pacemaker" type="Dummy"/>
- <attributes CRM_meta_on_node="rhel8-5" CRM_meta_on_node_uuid="5" CRM_meta_timeout="90000" passwd="whatever"/>
- </rsc_op>
- </action_set>
- <inputs/>
- </synapse>
- <synapse id="17">
<action_set>
<rsc_op id="26" operation="monitor" operation_key="migrator_monitor_0" on_node="rhel8-2" on_node_uuid="2">
<primitive id="migrator" class="ocf" provider="pacemaker" type="Dummy"/>
- <attributes CRM_meta_on_node="rhel8-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="90000" passwd="whatever"/>
+ <attributes CRM_meta_on_node="rhel8-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="90000" passwd="whatever"/>
</rsc_op>
</action_set>
<inputs/>
</synapse>
- <synapse id="18">
- <action_set>
- <rsc_op id="17" operation="monitor" operation_key="migrator_monitor_10000" on_node="rhel8-5" on_node_uuid="5">
- <primitive id="migrator" class="ocf" provider="pacemaker" type="Dummy"/>
- <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="rhel8-5" CRM_meta_on_node_uuid="5" CRM_meta_timeout="90000" passwd="whatever"/>
- </rsc_op>
- </action_set>
- <inputs>
- <trigger>
- <rsc_op id="53" operation="start" operation_key="migrator_start_0" on_node="rhel8-5" on_node_uuid="5"/>
- </trigger>
- </inputs>
- </synapse>
- <synapse id="19">
+ <synapse id="15">
<action_set>
- <rsc_op id="61" operation="monitor" operation_key="ping-1_monitor_60000" internal_operation_key="ping-1:3_monitor_60000" on_node="rhel8-2" on_node_uuid="2">
+ <rsc_op id="60" operation="monitor" operation_key="ping-1_monitor_60000" internal_operation_key="ping-1:3_monitor_60000" on_node="rhel8-2" on_node_uuid="2">
<primitive id="ping-1" long-id="ping-1:3" class="ocf" provider="pacemaker" type="ping"/>
<attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="rhel8-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="90000" debug="true" host_list="192.168.122.80" name="connected"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
- <rsc_op id="60" operation="start" operation_key="ping-1_start_0" internal_operation_key="ping-1:3_start_0" on_node="rhel8-2" on_node_uuid="2"/>
+ <rsc_op id="59" operation="start" operation_key="ping-1_start_0" internal_operation_key="ping-1:3_start_0" on_node="rhel8-2" on_node_uuid="2"/>
</trigger>
</inputs>
</synapse>
- <synapse id="20">
+ <synapse id="16">
<action_set>
- <rsc_op id="60" operation="start" operation_key="ping-1_start_0" internal_operation_key="ping-1:3_start_0" on_node="rhel8-2" on_node_uuid="2">
+ <rsc_op id="59" operation="start" operation_key="ping-1_start_0" internal_operation_key="ping-1:3_start_0" on_node="rhel8-2" on_node_uuid="2">
<primitive id="ping-1" long-id="ping-1:3" class="ocf" provider="pacemaker" type="ping"/>
<attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="rhel8-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="90000" debug="true" host_list="192.168.122.80" name="connected"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
- <pseudo_event id="62" operation="start" operation_key="Connectivity_start_0"/>
+ <pseudo_event id="61" operation="start" operation_key="Connectivity_start_0"/>
</trigger>
</inputs>
</synapse>
- <synapse id="21">
+ <synapse id="17">
<action_set>
<rsc_op id="27" operation="monitor" operation_key="ping-1_monitor_0" internal_operation_key="ping-1:3_monitor_0" on_node="rhel8-2" on_node_uuid="2">
<primitive id="ping-1" long-id="ping-1:3" class="ocf" provider="pacemaker" type="ping"/>
@@ -241,24 +191,24 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="22" priority="1000000">
+ <synapse id="18" priority="1000000">
<action_set>
- <pseudo_event id="63" operation="running" operation_key="Connectivity_running_0">
+ <pseudo_event id="62" operation="running" operation_key="Connectivity_running_0">
<attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="90000" />
</pseudo_event>
</action_set>
<inputs>
<trigger>
- <rsc_op id="60" operation="start" operation_key="ping-1_start_0" internal_operation_key="ping-1:3_start_0" on_node="rhel8-2" on_node_uuid="2"/>
+ <rsc_op id="59" operation="start" operation_key="ping-1_start_0" internal_operation_key="ping-1:3_start_0" on_node="rhel8-2" on_node_uuid="2"/>
</trigger>
<trigger>
- <pseudo_event id="62" operation="start" operation_key="Connectivity_start_0"/>
+ <pseudo_event id="61" operation="start" operation_key="Connectivity_start_0"/>
</trigger>
</inputs>
</synapse>
- <synapse id="23">
+ <synapse id="19">
<action_set>
- <pseudo_event id="62" operation="start" operation_key="Connectivity_start_0">
+ <pseudo_event id="61" operation="start" operation_key="Connectivity_start_0">
<attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="90000" />
</pseudo_event>
</action_set>
@@ -268,7 +218,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="24">
+ <synapse id="20">
<action_set>
<rsc_op id="28" operation="monitor" operation_key="stateful-1_monitor_0" internal_operation_key="stateful-1:0_monitor_0" on_node="rhel8-2" on_node_uuid="2">
<primitive id="stateful-1" long-id="stateful-1:0" class="ocf" provider="pacemaker" type="Stateful"/>
@@ -277,7 +227,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="25">
+ <synapse id="21">
<action_set>
<rsc_op id="29" operation="monitor" operation_key="r192.168.122.207_monitor_0" on_node="rhel8-2" on_node_uuid="2">
<primitive id="r192.168.122.207" class="ocf" provider="heartbeat" type="IPaddr2"/>
@@ -286,7 +236,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="26">
+ <synapse id="22">
<action_set>
<rsc_op id="30" operation="monitor" operation_key="petulant_monitor_0" on_node="rhel8-2" on_node_uuid="2">
<primitive id="petulant" class="service" type="pacemaker-cts-dummyd@10"/>
@@ -295,7 +245,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="27">
+ <synapse id="23">
<action_set>
<rsc_op id="31" operation="monitor" operation_key="r192.168.122.208_monitor_0" on_node="rhel8-2" on_node_uuid="2">
<primitive id="r192.168.122.208" class="ocf" provider="heartbeat" type="IPaddr2"/>
@@ -304,7 +254,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="28">
+ <synapse id="24">
<action_set>
<rsc_op id="32" operation="monitor" operation_key="lsb-dummy_monitor_0" on_node="rhel8-2" on_node_uuid="2">
<primitive id="lsb-dummy" class="lsb" type="LSBDummy"/>
diff --git a/cts/scheduler/scores/migration-intermediary-cleaned.scores b/cts/scheduler/scores/migration-intermediary-cleaned.scores
index b3b8dff5f..09f05d174 100644
--- a/cts/scheduler/scores/migration-intermediary-cleaned.scores
+++ b/cts/scheduler/scores/migration-intermediary-cleaned.scores
@@ -103,7 +103,7 @@ pcmk__primitive_assign: migrator allocation score on rhel8-1: 0
pcmk__primitive_assign: migrator allocation score on rhel8-2: 0
pcmk__primitive_assign: migrator allocation score on rhel8-3: 0
pcmk__primitive_assign: migrator allocation score on rhel8-4: 0
-pcmk__primitive_assign: migrator allocation score on rhel8-5: 0
+pcmk__primitive_assign: migrator allocation score on rhel8-5: 1
pcmk__primitive_assign: petulant allocation score on rhel8-1: -INFINITY
pcmk__primitive_assign: petulant allocation score on rhel8-2: -INFINITY
pcmk__primitive_assign: petulant allocation score on rhel8-3: 0
diff --git a/cts/scheduler/summary/migration-intermediary-cleaned.summary b/cts/scheduler/summary/migration-intermediary-cleaned.summary
index 5de1355dd..dd127a848 100644
--- a/cts/scheduler/summary/migration-intermediary-cleaned.summary
+++ b/cts/scheduler/summary/migration-intermediary-cleaned.summary
@@ -13,7 +13,7 @@ Current cluster status:
* rsc_rhel8-3 (ocf:heartbeat:IPaddr2): Started rhel8-3
* rsc_rhel8-4 (ocf:heartbeat:IPaddr2): Started rhel8-4
* rsc_rhel8-5 (ocf:heartbeat:IPaddr2): Started rhel8-5
- * migrator (ocf:pacemaker:Dummy): Started [ rhel8-5 rhel8-2 ]
+ * migrator (ocf:pacemaker:Dummy): Started rhel8-5
* Clone Set: Connectivity [ping-1]:
* Started: [ rhel8-3 rhel8-4 rhel8-5 ]
* Stopped: [ rhel8-1 rhel8-2 ]
@@ -30,7 +30,6 @@ Current cluster status:
Transition Summary:
* Move rsc_rhel8-1 ( rhel8-3 -> rhel8-2 )
* Move rsc_rhel8-2 ( rhel8-4 -> rhel8-2 )
- * Restart migrator ( rhel8-5 )
* Start ping-1:3 ( rhel8-2 )
Executing Cluster Transition:
@@ -44,8 +43,6 @@ Executing Cluster Transition:
* Resource action: rsc_rhel8-3 monitor on rhel8-2
* Resource action: rsc_rhel8-4 monitor on rhel8-2
* Resource action: rsc_rhel8-5 monitor on rhel8-2
- * Resource action: migrator stop on rhel8-2
- * Resource action: migrator stop on rhel8-5
* Resource action: migrator monitor on rhel8-2
* Resource action: ping-1 monitor on rhel8-2
* Pseudo action: Connectivity_start_0
@@ -56,8 +53,6 @@ Executing Cluster Transition:
* Resource action: lsb-dummy monitor on rhel8-2
* Resource action: rsc_rhel8-1 start on rhel8-2
* Resource action: rsc_rhel8-2 start on rhel8-2
- * Resource action: migrator start on rhel8-5
- * Resource action: migrator monitor=10000 on rhel8-5
* Resource action: ping-1 start on rhel8-2
* Pseudo action: Connectivity_running_0
* Resource action: rsc_rhel8-1 monitor=5000 on rhel8-2
@@ -79,7 +74,7 @@ Revised Cluster Status:
* rsc_rhel8-3 (ocf:heartbeat:IPaddr2): Started rhel8-3
* rsc_rhel8-4 (ocf:heartbeat:IPaddr2): Started rhel8-4
* rsc_rhel8-5 (ocf:heartbeat:IPaddr2): Started rhel8-5
- * migrator (ocf:pacemaker:Dummy): Started [ rhel8-2 rhel8-5 ]
+ * migrator (ocf:pacemaker:Dummy): Started rhel8-5
* Clone Set: Connectivity [ping-1]:
* Started: [ rhel8-2 rhel8-3 rhel8-4 rhel8-5 ]
* Stopped: [ rhel8-1 ]
--
2.35.3
