[Cluster-devel] cluster/rgmanager/src/resources apache.sh mysq ...
mgrac at sourceware.org
mgrac at sourceware.org
Tue Sep 26 23:59:14 UTC 2006
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: mgrac at sourceware.org 2006-09-26 23:59:14
Modified files:
rgmanager/src/resources: apache.sh mysql.sh openldap.sh
postgres-8.sh samba.sh
Log message:
Add check if the instance of RA has parent (variable service_name)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/apache.sh.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/mysql.sh.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/openldap.sh.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/postgres-8.sh.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/samba.sh.diff?cvsroot=cluster&r1=1.1&r2=1.2
--- cluster/rgmanager/src/resources/apache.sh 2006/09/20 08:50:12 1.5
+++ cluster/rgmanager/src/resources/apache.sh 2006/09/26 23:59:14 1.6
@@ -53,7 +53,17 @@
verify_all()
{
clog_service_verify $CLOG_INIT
-
+
+ if [ -z "$OCF_RESKEY_name" ]; then
+ clog_service_verify $CLOG_FAILED "Invalid Name Of Service"
+ return $OCF_ERR_ARGS
+ fi
+
+ if [ -z "$OCF_RESKEY_service_name" ]; then
+ clog_service_verify $CLOG_FAILED_NOT_CHILD
+ return $OCF_ERR_ARGS
+ fi
+
if [ -z "$OCF_RESKEY_server_root" ]; then
clog_service_verify $CLOG_FAILED "Invalid ServerRoot"
return $OCF_ERR_ARGS
--- cluster/rgmanager/src/resources/mysql.sh 2006/09/20 08:15:01 1.5
+++ cluster/rgmanager/src/resources/mysql.sh 2006/09/26 23:59:14 1.6
@@ -46,6 +46,11 @@
return $OCF_ERR_ARGS
fi
+ if [ -z "$OCF_RESKEY_service_name" ]; then
+ clog_service_verify $CLOG_FAILED_NOT_CHILD
+ return $OCF_ERR_ARGS
+ fi
+
if [ -z "$OCF_RESKEY_config_file" ]; then
clog_check_file_exist $CLOG_FAILED_INVALID "$OCF_RESKEY_config_file"
clog_service_verify $CLOG_FAILED
--- cluster/rgmanager/src/resources/openldap.sh 2006/09/18 13:48:07 1.3
+++ cluster/rgmanager/src/resources/openldap.sh 2006/09/26 23:59:14 1.4
@@ -46,6 +46,11 @@
return $OCF_ERR_ARGS
fi
+ if [ -z "$OCF_RESKEY_service_name" ]; then
+ clog_service_verify $CLOG_FAILED_NOT_CHILD
+ return $OCF_ERR_ARGS
+ fi
+
if [ -z "$OCF_RESKEY_config_file" ]; then
clog_check_file_exist $CLOG_FAILED_INVALID "$OCF_RESKEY_config_file"
clog_service_verify $CLOG_FAILED
--- cluster/rgmanager/src/resources/postgres-8.sh 2006/09/20 07:14:54 1.1
+++ cluster/rgmanager/src/resources/postgres-8.sh 2006/09/26 23:59:14 1.2
@@ -45,6 +45,11 @@
return $OCF_ERR_ARGS
fi
+ if [ -z "$OCF_RESKEY_service_name" ]; then
+ clog_service_verify $CLOG_FAILED_NOT_CHILD
+ return $OCF_ERR_ARGS
+ fi
+
if [ -z "$OCF_RESKEY_config_file" ]; then
clog_check_file_exist $CLOG_FAILED_INVALID "$OCF_RESKEY_config_file"
clog_service_verify $CLOG_FAILED
--- cluster/rgmanager/src/resources/samba.sh 2006/09/26 23:18:44 1.1
+++ cluster/rgmanager/src/resources/samba.sh 2006/09/26 23:59:14 1.2
@@ -48,6 +48,11 @@
return $OCF_ERR_ARGS
fi
+ if [ -z "$OCF_RESKEY_service_name" ]; then
+ clog_service_verify $CLOG_FAILED_NOT_CHILD
+ return $OCF_ERR_ARGS
+ fi
+
if [ -z "$OCF_RESKEY_config_file" ]; then
clog_check_file_exist $CLOG_FAILED_INVALID "$OCF_RESKEY_config_file"
clog_service_verify $CLOG_FAILED
More information about the Cluster-devel
mailing list