[Cluster-devel] cluster/rgmanager/src/resources mysql.metadata ...

[mgrac at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	mgrac at sourceware.org	2006-09-20 08:15:01

Modified files:
	rgmanager/src/resources: mysql.metadata mysql.sh 

Log message:
	Adds possibility to add command line options to MySQL RA. Names of variable in RA's metadata are changed to unify style.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/mysql.metadata.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/mysql.sh.diff?cvsroot=cluster&r1=1.4&r2=1.5

--- cluster/rgmanager/src/resources/mysql.metadata	2006/08/31 13:52:21	1.1
+++ cluster/rgmanager/src/resources/mysql.metadata	2006/09/20 08:15:01	1.2
@@ -20,7 +20,7 @@
 	    <content type="string"/>
         </parameter>
 
-        <parameter name="configFile">
+        <parameter name="config_file">
             <longdesc lang="en">
                 Define configuration file
             </longdesc>
@@ -30,7 +30,7 @@
 	    <content type="string" default="/etc/my.cnf"/>
         </parameter>
 
-        <parameter name="ipAddress">
+        <parameter name="listen_address">
             <longdesc lang="en">
 		Define an IP address for MySQL
             </longdesc>
@@ -41,6 +41,16 @@
             <content type="string"/>
         </parameter>
 
+	<parameter name="mysqld_options">
+		<longdesc lang="en">
+			Other command-line options for httpd
+		</longdesc>
+		<shortdesc lang="en">
+			Other command-line options for httpd
+		</shortdesc>
+		<content type="string" />
+	</parameter>
+
         <parameter name="service_name" inherit="service%name">
             <longdesc lang="en">
 	    	Inherit the service name.  We need to know
--- cluster/rgmanager/src/resources/mysql.sh	2006/09/18 13:48:07	1.4
+++ cluster/rgmanager/src/resources/mysql.sh	2006/09/20 08:15:01	1.5
@@ -46,14 +46,14 @@
 		return $OCF_ERR_ARGS
 	fi
 
-	if [ -z "$OCF_RESKEY_configFile" ]; then
-		clog_check_file_exist $CLOG_FAILED_INVALID "$OCF_RESKEY_configFile"
+	if [ -z "$OCF_RESKEY_config_file" ]; then
+		clog_check_file_exist $CLOG_FAILED_INVALID "$OCF_RESKEY_config_file"
 		clog_service_verify $CLOG_FAILED
 		return $OCF_ERR_ARGS
 	fi
 
-	if [ ! -r "$OCF_RESKEY_configFile" ]; then
-		clog_check_file_exist $CLOG_FAILED_NOT_READABLE $OCF_RESKEY_configFile
+	if [ ! -r "$OCF_RESKEY_config_file" ]; then
+		clog_check_file_exist $CLOG_FAILED_NOT_READABLE $OCF_RESKEY_config_file
 		clog_service_verify $CLOG_FAILED
 		return $OCF_ERR_ARGS
 	fi
@@ -81,8 +81,8 @@
 		return $OCF_ERR_GENERIC
 	fi
 
-	if [ -n "$OCF_RESKEY_ipAddress" ]; then
-		MYSQL_ipAddress="$OCF_RESKEY_ipAddress"
+	if [ -n "$OCF_RESKEY_listen_address" ]; then
+		MYSQL_ipAddress="$OCF_RESKEY_listen_address"
 	else
 		clog_looking_for $CLOG_INIT "IP Address"
 
@@ -107,9 +107,10 @@
 
 	clog_looking_for $CLOG_SUCCEED "IP Address"
 
-	$MYSQL_MYSQLD --defaults-file="$OCF_RESKEY_configFile" \
+	$MYSQL_MYSQLD --defaults-file="$OCF_RESKEY_config_file" \
 		--pid-file="$MYSQL_pid_file" \
-		--bind-address="$MYSQL_ipAddress" > /dev/null 2>&1 &
+		--bind-address="$MYSQL_ipAddress" \
+		$OCF_RESKEY_mysqld_options > /dev/null 2>&1 &
 
 	if [ $? -ne 0 ]; then
 		clog_service_start $CLOG_FAILED