cluster: RHEL5 - [RGMANAGER] Resolves #481058 - Add option startup_wait for mysql RA

cluster: RHEL5 - [RGMANAGER] Resolves #481058 - Add option startup_wait for mysql RA

[Marek Grác]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d3448b818eb074e31a23ab797138cb6bd27e5799
Commit:        d3448b818eb074e31a23ab797138cb6bd27e5799
Parent:        e4c7af4521fdacd4663ccf44d21208973f891ede
Author:        Marek 'marx' Grac <mgrac@redhat.com>
AuthorDate:    Mon Jan 26 12:58:50 2009 +0100
Committer:     Marek 'marx' Grac <mgrac@redhat.com>
CommitterDate: Mon Jan 26 12:58:50 2009 +0100

[RGMANAGER] Resolves #481058 - Add option startup_wait for mysql RA

---
 rgmanager/src/resources/mysql.metadata |   10 ++++++++++
 rgmanager/src/resources/mysql.sh       |    8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/rgmanager/src/resources/mysql.metadata b/rgmanager/src/resources/mysql.metadata
index 29784e2..270ec27 100644
--- a/rgmanager/src/resources/mysql.metadata
+++ b/rgmanager/src/resources/mysql.metadata
@@ -51,6 +51,16 @@
 		<content type="string" />
 	</parameter>
 
+	<parameter name="startup_wait">
+		<longdesc lang="en">
+			Wait X seconds for correct end of service startup
+		</longdesc>
+		<shortdesc lang="en">
+			Wait X seconds for correct end of service startup
+		</shortdesc>
+		<content type="number" default="30" />
+	</parameter>
+
 	<parameter name="shutdown_wait">
 		<longdesc lang="en">
 			Wait X seconds for correct end of service shutdown
diff --git a/rgmanager/src/resources/mysql.sh b/rgmanager/src/resources/mysql.sh
index 6d7ea18..1f1215d 100755
--- a/rgmanager/src/resources/mysql.sh
+++ b/rgmanager/src/resources/mysql.sh
@@ -35,7 +35,6 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 declare MYSQL_MYSQLD=/usr/bin/mysqld_safe
 declare MYSQL_ipAddress
 declare MYSQL_pid_file="`generate_name_for_pid_file`"
-declare MYSQL_timeout=30
 
 verify_all()
 {
@@ -123,15 +122,16 @@ start()
 		return $OCF_ERR_GENERIC
 	fi
 
-	while [ "$MYSQL_timeout" -gt 0 ]; do
+	declare i=$OCF_RESKEY_startup_wait
+	while [ "$i" -gt 0 ]; do
 		if [ -f "$MYSQL_pid_file" ]; then
 			break;			
 		fi
 		sleep 1
-		let MYSQL_timeout=${MYSQL_timeout}-1
+		let i=$i-1
         done
 
-        if [ "$MYSQL_timeout" -eq 0 ]; then
+        if [ "$i" -eq 0 ]; then
 		clog_service_start $CLOG_FAILED_TIMEOUT
 		return $OCF_ERR_GENERIC
 	fi