Blame SOURCES/timeout-interval-add-s-suffix.patch

b4b3ce
From 1c23bbf9700eda44d0d64f34bcb538d7b9e4f6f6 Mon Sep 17 00:00:00 2001
b4b3ce
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
b4b3ce
Date: Tue, 4 Sep 2018 09:19:59 +0200
b4b3ce
Subject: [PATCH] timeout/interval: add "s" suffix where it's missing
b4b3ce
b4b3ce
---
b4b3ce
 .gitignore                    |  1 +
b4b3ce
 heartbeat/SAPInstance         |  2 +-
b4b3ce
 heartbeat/aliyun-vpc-move-ip  | 10 +++++-----
b4b3ce
 heartbeat/gcp-vpc-move-vip.in | 10 +++++-----
b4b3ce
 heartbeat/mariadb.in          | 22 +++++++++++-----------
b4b3ce
 heartbeat/sybaseASE.in        | 32 ++++++++++++++++----------------
b4b3ce
 6 files changed, 39 insertions(+), 38 deletions(-)
b4b3ce
b4b3ce
diff --git a/.gitignore b/.gitignore
b4b3ce
index bbff032c3..3a9be36e5 100644
b4b3ce
--- a/.gitignore
b4b3ce
+++ b/.gitignore
b4b3ce
@@ -44,6 +44,7 @@ heartbeat/ocf-directories
b4b3ce
 heartbeat/ocf-shellfuncs
b4b3ce
 heartbeat/send_ua
b4b3ce
 heartbeat/shellfuncs
b4b3ce
+heartbeat/*.pyc
b4b3ce
 include/agent_config.h
b4b3ce
 include/config.h
b4b3ce
 include/config.h.in
b4b3ce
diff --git a/heartbeat/aliyun-vpc-move-ip b/heartbeat/aliyun-vpc-move-ip
b4b3ce
index e27952adb..ed446c9c1 100755
b4b3ce
--- a/heartbeat/aliyun-vpc-move-ip
b4b3ce
+++ b/heartbeat/aliyun-vpc-move-ip
b4b3ce
@@ -155,11 +155,11 @@ Valid Aliyun CLI profile name
b4b3ce
 </parameter>
b4b3ce
 </parameters>
b4b3ce
 <actions>
b4b3ce
-<action name="start" timeout="180" />
b4b3ce
-<action name="stop" timeout="180" />
b4b3ce
-<action name="monitor" depth="0" timeout="30" interval="30" />
b4b3ce
-<action name="validate-all" timeout="5" />
b4b3ce
-<action name="meta-data" timeout="5" />
b4b3ce
+<action name="start" timeout="180s" />
b4b3ce
+<action name="stop" timeout="180s" />
b4b3ce
+<action name="monitor" depth="0" timeout="30s" interval="30s" />
b4b3ce
+<action name="validate-all" timeout="5s" />
b4b3ce
+<action name="meta-data" timeout="5s" />
b4b3ce
 </actions>
b4b3ce
 </resource-agent>
b4b3ce
 END
b4b3ce
diff --git a/heartbeat/gcp-vpc-move-vip.in b/heartbeat/gcp-vpc-move-vip.in
b4b3ce
index ba61193b6..31d84643a 100755
b4b3ce
--- a/heartbeat/gcp-vpc-move-vip.in
b4b3ce
+++ b/heartbeat/gcp-vpc-move-vip.in
b4b3ce
@@ -77,11 +77,11 @@ METADATA = \
b4b3ce
     </parameter>
b4b3ce
   </parameters>
b4b3ce
   <actions>
b4b3ce
-    <action name="start" timeout="300" />
b4b3ce
-    <action name="stop" timeout="15" />
b4b3ce
-    <action name="monitor" timeout="15" interval="60" depth="0" />
b4b3ce
-    <action name="meta-data" timeout="15" />
b4b3ce
-    <action name="validate-all" timeout="15" />
b4b3ce
+    <action name="start" timeout="300s" />
b4b3ce
+    <action name="stop" timeout="15s" />
b4b3ce
+    <action name="monitor" timeout="15s" interval="60s" depth="0" />
b4b3ce
+    <action name="meta-data" timeout="15s" />
b4b3ce
+    <action name="validate-all" timeout="15s" />
b4b3ce
   </actions>
b4b3ce
 </resource-agent>'''
b4b3ce
 
b4b3ce
diff --git a/heartbeat/mariadb.in b/heartbeat/mariadb.in
b4b3ce
index 860fea7fd..c1969d70e 100644
b4b3ce
--- a/heartbeat/mariadb.in
b4b3ce
+++ b/heartbeat/mariadb.in
b4b3ce
@@ -250,17 +250,17 @@ The port on which the Master MariaDB instance is listening.
b4b3ce
 </parameters>
b4b3ce
 
b4b3ce
 <actions>
b4b3ce
-<action name="start" timeout="120" />
b4b3ce
-<action name="stop" timeout="120" />
b4b3ce
-<action name="status" timeout="60" />
b4b3ce
-<action name="monitor" depth="0" timeout="30" interval="20" />
b4b3ce
-<action name="monitor" role="Master" depth="0" timeout="30" interval="10" />
b4b3ce
-<action name="monitor" role="Slave" depth="0" timeout="30" interval="30" />
b4b3ce
-<action name="promote" timeout="120" />
b4b3ce
-<action name="demote" timeout="120" />
b4b3ce
-<action name="notify" timeout="90" />
b4b3ce
-<action name="validate-all" timeout="5" />
b4b3ce
-<action name="meta-data" timeout="5" />
b4b3ce
+<action name="start" timeout="120s" />
b4b3ce
+<action name="stop" timeout="120s" />
b4b3ce
+<action name="status" timeout="60s" />
b4b3ce
+<action name="monitor" depth="0" timeout="30s" interval="20s" />
b4b3ce
+<action name="monitor" role="Master" depth="0" timeout="30s" interval="10s" />
b4b3ce
+<action name="monitor" role="Slave" depth="0" timeout="30s" interval="30s" />
b4b3ce
+<action name="promote" timeout="120s" />
b4b3ce
+<action name="demote" timeout="120s" />
b4b3ce
+<action name="notify" timeout="90s" />
b4b3ce
+<action name="validate-all" timeout="5s" />
b4b3ce
+<action name="meta-data" timeout="5s" />
b4b3ce
 </actions>
b4b3ce
 </resource-agent>
b4b3ce
 END
b4b3ce
diff --git a/heartbeat/sybaseASE.in b/heartbeat/sybaseASE.in
b4b3ce
index a4a0b7a0c..b4809ea23 100755
b4b3ce
--- a/heartbeat/sybaseASE.in
b4b3ce
+++ b/heartbeat/sybaseASE.in
b4b3ce
@@ -26,19 +26,19 @@
b4b3ce
 #         /$sybase_home/$sybase_ase/install/RUN_$server_name
b4b3ce
 #
b4b3ce
 # (2) You can customize the interval value in the meta-data section if needed:
b4b3ce
-#                <action name="start" timeout="300" />
b4b3ce
-#                <action name="stop" timeout="300" />
b4b3ce
+#                <action name="start" timeout="300s" />
b4b3ce
+#                <action name="stop" timeout="300s" />
b4b3ce
 #
b4b3ce
 #                
b4b3ce
-#                <action name="status"  interval="30" timeout="100" />
b4b3ce
-#                <action name="monitor" interval="30" timeout="100" />
b4b3ce
+#                <action name="status"  interval="30s" timeout="100s" />
b4b3ce
+#                <action name="monitor" interval="30s" timeout="100s" />
b4b3ce
 #
b4b3ce
 #                
b4b3ce
-#                <action name="status" depth="10" timeout="100" interval="120" />
b4b3ce
-#                <action name="monitor" depth="10" timeout="100" interval="120" />
b4b3ce
+#                <action name="status" depth="10" timeout="100s" interval="120s" />
b4b3ce
+#                <action name="monitor" depth="10" timeout="100s" interval="120s" />
b4b3ce
 #
b4b3ce
-#                <action name="meta-data" timeout="5" />
b4b3ce
-#                <action name="validate-all" timeout="5" />
b4b3ce
+#                <action name="meta-data" timeout="5s" />
b4b3ce
+#                <action name="validate-all" timeout="5s" />
b4b3ce
 #     The timeout value is not supported by Redhat in RHCS5.0.
b4b3ce
 #
b4b3ce
 
b4b3ce
@@ -226,19 +226,19 @@ meta_data()
b4b3ce
 	</parameters>
b4b3ce
 
b4b3ce
 	<actions>
b4b3ce
-		<action name="start" timeout="300" />
b4b3ce
-		<action name="stop" timeout="300" />
b4b3ce
+		<action name="start" timeout="300s" />
b4b3ce
+		<action name="stop" timeout="300s" />
b4b3ce
 
b4b3ce
 		
b4b3ce
-		<action name="status"  interval="30" timeout="100" />
b4b3ce
-		<action name="monitor" interval="30" timeout="100" />
b4b3ce
+		<action name="status"  interval="30s" timeout="100s" />
b4b3ce
+		<action name="monitor" interval="30s" timeout="100s" />
b4b3ce
 
b4b3ce
 		
b4b3ce
-		<action name="status" depth="10" timeout="100" interval="120" />
b4b3ce
-		<action name="monitor" depth="10" timeout="100" interval="120" />
b4b3ce
+		<action name="status" depth="10" timeout="100" interval="120s" />
b4b3ce
+		<action name="monitor" depth="10" timeout="100" interval="120s" />
b4b3ce
 
b4b3ce
-		<action name="meta-data" timeout="5" />
b4b3ce
-		<action name="validate-all" timeout="5" />
b4b3ce
+		<action name="meta-data" timeout="5s" />
b4b3ce
+		<action name="validate-all" timeout="5s" />
b4b3ce
 	</actions>
b4b3ce
 </resource-agent>
b4b3ce
 EOT