File jsc#ECO-1611-0015-Test-fencer-update-cpg_topolo... of Package pacemaker.21299

Overview Repositories Revisions Requests Users Attributes Meta

File jsc#ECO-1611-0015-Test-fencer-update-cpg_topology_delay-test-to-also-v.patch of Package pacemaker.21299

From 6ab6d380b2f8df97e51cbb494a69dfc87272888a Mon Sep 17 00:00:00 2001
From: "Gao,Yan" <ygao@suse.com>
Date: Wed, 1 Apr 2020 19:17:48 +0200
Subject: [PATCH 15/15] Test: fencer: update cpg_topology_delay test to also
 verify pcmk_delay_base is added

This commit also updates log patterns for the log changes.
---
 cts/cts-stonithd.in | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

Index: pacemaker-1.1.18+20180430.b12c320f5/cts/cts-stonithd.in
===================================================================
--- pacemaker-1.1.18+20180430.b12c320f5.orig/cts/cts-stonithd.in
+++ pacemaker-1.1.18+20180430.b12c320f5/cts/cts-stonithd.in
@@ -992,22 +992,23 @@ class Tests(object):
             test.add_stonith_neg_log_pattern("does not advertise support for 'reboot', performing 'off'")
             test.add_stonith_log_pattern("with device 'true1' returned: 0 (OK)")
 
-        # make sure enforced fencing delay is applied only for the first device in the first level
+        # make sure requested fencing delay is applied only for the first device in the first level
+        # make sure static delay from pcmk_delay_base is added
         for test_type in test_types:
             if test_type["use_cpg"] == 0:
                 continue
 
             test = self.new_test("%s_topology_delay" % test_type["prefix"],
-                                 "Verify enforced fencing delay is applied only for the first device in the first level.",
+                                 "Verify requested fencing delay is applied only for the first device in the first level and pcmk_delay_base is added.",
                                  test_type["use_cpg"])
             test.add_cmd("stonith_admin",
-                         "-R true1 -a fence_dummy -o \"mode=pass\" -o \"pcmk_host_list=node1 node2 node3\"")
+                         "-R true1 -a fence_dummy -o \"mode=pass\" -o \"pcmk_host_list=node1 node2 node3\" -o \"pcmk_delay_base=1\"")
             test.add_cmd("stonith_admin",
-                         "-R false1  -a fence_dummy -o \"mode=fail\" -o \"pcmk_host_list=node1 node2 node3\"")
+                         "-R false1 -a fence_dummy -o \"mode=fail\" -o \"pcmk_host_list=node1 node2 node3\" -o \"pcmk_delay_base=1\"")
             test.add_cmd("stonith_admin",
-                         "-R true2  -a fence_dummy -o \"mode=pass\" -o \"pcmk_host_list=node1 node2 node3\"")
+                         "-R true2 -a fence_dummy -o \"mode=pass\" -o \"pcmk_host_list=node1 node2 node3\"")
             test.add_cmd("stonith_admin",
-                         "-R true3  -a fence_dummy -o \"mode=pass\" -o \"pcmk_host_list=node1 node2 node3\"")
+                         "-R true3 -a fence_dummy -o \"mode=pass\" -o \"pcmk_host_list=node1 node2 node3\"")
 
             test.add_cmd("stonith_admin", "-r node3 -i 1 -v true1")
             test.add_cmd("stonith_admin", "-r node3 -i 1 -v false1")
@@ -1016,8 +1017,8 @@ class Tests(object):
 
             test.add_cmd("stonith_admin", "-F node3 --delay 1")
 
-            test.add_stonith_log_pattern("Delaying 'off' action targeting node3 on true1 for enforced 1s")
-            test.add_stonith_neg_log_pattern("Delaying 'off' action targeting node3 on false1")
+            test.add_stonith_log_pattern("Delaying 'off' action targeting node3 on true1 for 2s (timeout=120s, requested_delay=1s, base=1s, max=1s)")
+            test.add_stonith_log_pattern("Delaying 'off' action targeting node3 on false1 for 1s (timeout=120s, requested_delay=0s, base=1s, max=1s)")
             test.add_stonith_neg_log_pattern("Delaying 'off' action targeting node3 on true2")
             test.add_stonith_neg_log_pattern("Delaying 'off' action targeting node3 on true3")

Places

File jsc#ECO-1611-0015-Test-fencer-update-cpg_topology_delay-test-to-also-v.patch of Package pacemaker.21299

Places