From 67df91fd8467c68627bb8f1e507a19564fdd3329 Mon Sep 17 00:00:00 2001
From: Nathaniel Clark <nclark@whamcloud.com>
Date: Wed, 1 Sep 2021 10:39:54 -0400
Subject: [PATCH] EX-3738 hotpools: Strict ordering of client and lamigo

Ensure strict ordering for start and stop of client mount
and lamigo/lpurge.
Ensure enough of a timeout for start and stop.

Test-Parameters: trivial
Signed-off-by: Nathaniel Clark <nclark@whamcloud.com>
Change-Id: I7c50abc5ff82f0cc3fd117fd961f7421ad2df9be
Reviewed-on: https://review.whamcloud.com/44807
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Gaurang Tapase <gtapase@ddn.com>
Reviewed-by: John L. Hammond <jhammond@whamcloud.com>
---
 lipe/scripts/stratagem-hp-config.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lipe/scripts/stratagem-hp-config.sh b/lipe/scripts/stratagem-hp-config.sh
index c34d1a9..677d975 100755
--- a/lipe/scripts/stratagem-hp-config.sh
+++ b/lipe/scripts/stratagem-hp-config.sh
@@ -210,7 +210,7 @@ fi # ! crm_resource client
 echo "Creating Hotpool ticket for $FS"
 clush -Sg ha_heads crm configure <<EOF
 primitive $FS-hotpool ocf:ddn:Ticketer params name=$FS-hotpool-allocated meta allow-migrate=true priority=199 target-role=Stopped op start interval=0 timeout=30 op monitor interval=30 timeout=30 op stop interval=0 timeout=30
-order $FS-hotpool-after-cl-$FS-client 0: cl-$FS-client $FS-hotpool
+order $FS-hotpool-after-cl-$FS-client inf: cl-$FS-client $FS-hotpool
 EOF
 
 echo "Configuring OFD access logs"
@@ -249,7 +249,7 @@ EOF
 
     echo Creating lpurge resource for $FS-OST$OST
     clush -qS --group=ha_heads "crm_resource -QW -r ost$INDEX-$FS >/dev/null 2>&1 && crm configure << EOF || true
-primitive lpurge-$FS-OST$OST systemd:lpurge@$FS-OST$OST.service op monitor interval=30s
+primitive lpurge-$FS-OST$OST systemd:lpurge@$FS-OST$OST.service op monitor interval=30s op start timeout=100s op stop timeout=100s
 colocation lpurge-$FS-$OST-with-ost inf: lpurge-$FS-OST$OST ost$INDEX-$FS
 order lpurge-$FS-$OST-after-ost ost$INDEX-$FS lpurge-$FS-OST$OST
 rsc_ticket ticket-$FS-hotpool-allocated-lpurge-$FS-OST$OST $FS-hotpool-allocated: lpurge-$FS-OST$OST loss-policy=stop
@@ -305,7 +305,7 @@ EOF
 
     echo Creating lamigo resource for $FS-MDT$MDT
     clush -qS --group=ha_heads "crm_resource -QW -r mdt$INDEX-$FS >/dev/null 2>&1 && crm configure << EOF || true
-primitive lamigo-$FS-MDT$MDT systemd:lamigo@$FS-MDT$MDT.service op start timeout=15m op monitor interval=30s
+primitive lamigo-$FS-MDT$MDT systemd:lamigo@$FS-MDT$MDT.service op monitor interval=30s op start timeout=15m op stop timeout=120s
 colocation lamigo-$FS-MDT$MDT-with-mdt inf: lamigo-$FS-MDT$MDT mdt$INDEX-$FS
 order lamigo-$FS-$MDT-after-mdt mdt$INDEX-$FS lamigo-$FS-MDT$MDT
 rsc_ticket ticket-$FS-hotpool-allocated-lamigo-$FS-MDT$MDT $FS-hotpool-allocated: lamigo-$FS-MDT$MDT loss-policy=stop
-- 
1.8.3.1