Re: [Cluster-devel] [PATCH] Fixed scripts for use with rgmanager
On Wed, Aug 10, 2011 at 10:56:38PM -0400, Chris Feist wrote: 12 files changed, 53 insertions(+), 11 deletions(-) mode change 100644 = 100755 rgmanager/src/resources/apache.sh mode change 100644 = 100755 rgmanager/src/resources/clusterfs.sh mode change 100644 = 100755 rgmanager/src/resources/ip.sh mode change 100644 = 100755 rgmanager/src/resources/mysql.sh mode change 100644 = 100755 rgmanager/src/resources/netfs.sh mode change 100644 = 100755 rgmanager/src/resources/nfsclient.sh mode change 100644 = 100755 rgmanager/src/resources/nfsserver.sh mode change 100644 = 100755 rgmanager/src/resources/utils/httpd-parse-config.pl Modes didn't need to be changed. Modes need to be changed to pass ocf_tester (it's one of the tests), should we just skip this? Looking at the heartbeat agents they all are executable in the source, should we try to match that with the agents we've converted? Or should we just keep them as is? The only issue is that then we can't fully test the ocf_tester until after we install. This is fine -- testing from the source tree is a valid thing to do. -- Lon Hohberger - Red Hat, Inc.
[Cluster-devel] [PATCH] Fixed scripts for use with rgmanager
Patch to fix common rgmanager scripts for use with pacemaker.
From a656372b8873d8ec9afd97e84b3a6dc6460e4bb3 Mon Sep 17 00:00:00 2001
From: Chris Feist cfe...@redhat.com
Date: Wed, 6 Jul 2011 15:39:04 -0500
Subject: [PATCH] Fixed scripts for use with rgmanager
- Fixed the following scripts: fs, ip, apache, mysql, clusterfs,
nfsclient, netfs, nfsserver, vm
---
rgmanager/src/resources/apache.metadata|1 +
rgmanager/src/resources/apache.sh | 26 ++-
rgmanager/src/resources/clusterfs.sh |1 +
rgmanager/src/resources/fs.sh.in |1 +
rgmanager/src/resources/ip.sh |1 +
rgmanager/src/resources/mysql.metadata |1 +
rgmanager/src/resources/mysql.sh | 21
rgmanager/src/resources/netfs.sh |1 +
rgmanager/src/resources/nfsclient.sh |3 +-
rgmanager/src/resources/nfsserver.sh |3 +-
rgmanager/src/resources/utils/ra-skelet.sh |2 +-
rgmanager/src/resources/vm.sh |3 +-
12 files changed, 53 insertions(+), 11 deletions(-)
mode change 100644 = 100755 rgmanager/src/resources/apache.sh
mode change 100644 = 100755 rgmanager/src/resources/clusterfs.sh
mode change 100644 = 100755 rgmanager/src/resources/ip.sh
mode change 100644 = 100755 rgmanager/src/resources/mysql.sh
mode change 100644 = 100755 rgmanager/src/resources/netfs.sh
mode change 100644 = 100755 rgmanager/src/resources/nfsclient.sh
mode change 100644 = 100755 rgmanager/src/resources/nfsserver.sh
mode change 100644 = 100755
rgmanager/src/resources/utils/httpd-parse-config.pl
diff --git a/rgmanager/src/resources/apache.metadata
b/rgmanager/src/resources/apache.metadata
index 727d138..93d5fd8 100644
--- a/rgmanager/src/resources/apache.metadata
+++ b/rgmanager/src/resources/apache.metadata
@@ -1,4 +1,5 @@
?xml version=1.0?
+!DOCTYPE resource-agent SYSTEM ra-api-1-modified.dtd
resource-agent version=rgmanager 2.0 name=apache
version1.0/version
diff --git a/rgmanager/src/resources/apache.sh
b/rgmanager/src/resources/apache.sh
old mode 100644
new mode 100755
index 2ec0d4d..f0da4b0
--- a/rgmanager/src/resources/apache.sh
+++ b/rgmanager/src/resources/apache.sh
@@ -161,6 +161,11 @@ EOT
start()
{
+ if status; then
+ ocf_log info Starting Service $OCF_RESOURCE_INSTANCE Already
running
+ return $OCF_SUCCESS
+ fi
+
declare ip_addresses
clog_service_start $CLOG_INIT
@@ -226,13 +231,20 @@ status()
clog_service_status $CLOG_INIT
status_check_pid $APACHE_pid_file
- if [ $? -ne 0 ]; then
- clog_service_status $CLOG_FAILED $APACHE_pid_file
- return $OCF_ERR_GENERIC
- fi
-
- clog_service_status $CLOG_SUCCEED
- return 0
+ case $? in
+ $OCF_NOT_RUNNING)
+ clog_service_status $CLOG_FAILED $APAHCE_pid_file
+ return $OCF_NOT_RUNNING
+ ;;
+ 0)
+ clog_service_status $CLOG_SUCCEED
+ exit 0
+ ;;
+ *)
+ clog_service_status $CLOG_FAILED $APACHE_pid_file
+ return $OCF_ERR_GENERIC
+ ;;
+ esac
}
if [ $1 != meta-data ]; then
diff --git a/rgmanager/src/resources/clusterfs.sh
b/rgmanager/src/resources/clusterfs.sh
old mode 100644
new mode 100755
index af40f08..d052ffe
--- a/rgmanager/src/resources/clusterfs.sh
+++ b/rgmanager/src/resources/clusterfs.sh
@@ -27,6 +27,7 @@ do_metadata()
{
cat EOT
?xml version=1.0 ?
+!DOCTYPE resource-agent SYSTEM ra-api-1-modified.dtd
resource-agent name=clusterfs version=rgmanager 2.0
version1.0/version
diff --git a/rgmanager/src/resources/fs.sh.in b/rgmanager/src/resources/fs.sh.in
index 3e1cc15..c43c177 100644
--- a/rgmanager/src/resources/fs.sh.in
+++ b/rgmanager/src/resources/fs.sh.in
@@ -28,6 +28,7 @@ do_metadata()
{
cat EOT
?xml version=1.0 encoding=ISO-8859-1 ?
+!DOCTYPE resource-agent SYSTEM ra-api-1-modified.dtd
resource-agent name=fs version=rgmanager 2.0
version1.0/version
diff --git a/rgmanager/src/resources/ip.sh b/rgmanager/src/resources/ip.sh
old mode 100644
new mode 100755
index 04d5230..8686f02
--- a/rgmanager/src/resources/ip.sh
+++ b/rgmanager/src/resources/ip.sh
@@ -42,6 +42,7 @@ meta_data()
{
cat EOT
?xml version=1.0 ?
+!DOCTYPE resource-agent SYSTEM ra-api-1-modified.dtd
resource-agent version=rgmanager 2.0 name=ip
version1.0/version
diff --git a/rgmanager/src/resources/mysql.metadata
b/rgmanager/src/resources/mysql.metadata
index 4fa383b..d3ade15 100644
--- a/rgmanager/src/resources/mysql.metadata
+++ b/rgmanager/src/resources/mysql.metadata
@@ -1,4 +1,5 @@
?xml version=1.0?
+!DOCTYPE resource-agent SYSTEM
Re: [Cluster-devel] [PATCH] Fixed scripts for use with rgmanager
On Wed, Aug 10, 2011 at 01:13:12PM -0500, Chris Feist wrote: Patch to fix common rgmanager scripts for use with pacemaker. Oops... NACK 12 files changed, 53 insertions(+), 11 deletions(-) mode change 100644 = 100755 rgmanager/src/resources/apache.sh mode change 100644 = 100755 rgmanager/src/resources/clusterfs.sh mode change 100644 = 100755 rgmanager/src/resources/ip.sh mode change 100644 = 100755 rgmanager/src/resources/mysql.sh mode change 100644 = 100755 rgmanager/src/resources/netfs.sh mode change 100644 = 100755 rgmanager/src/resources/nfsclient.sh mode change 100644 = 100755 rgmanager/src/resources/nfsserver.sh mode change 100644 = 100755 rgmanager/src/resources/utils/httpd-parse-config.pl Modes didn't need to be changed. + clog_service_status $CLOG_FAILED $APAHCE_pid_file Typo ... APACHE status_check_pid $MYSQL_pid_file + case $? in + $OCF_NOT_RUNNING) + clog_service_status $CLOG_FAILED $MYSL_pid_file Typo ... MYSQL (happens twice in your patch) Otherwise, good by me. -- Lon Hohberger - Red Hat, Inc.
Re: [Cluster-devel] [PATCH] Fixed scripts for use with rgmanager
12 files changed, 53 insertions(+), 11 deletions(-) mode change 100644 = 100755 rgmanager/src/resources/apache.sh mode change 100644 = 100755 rgmanager/src/resources/clusterfs.sh mode change 100644 = 100755 rgmanager/src/resources/ip.sh mode change 100644 = 100755 rgmanager/src/resources/mysql.sh mode change 100644 = 100755 rgmanager/src/resources/netfs.sh mode change 100644 = 100755 rgmanager/src/resources/nfsclient.sh mode change 100644 = 100755 rgmanager/src/resources/nfsserver.sh mode change 100644 = 100755 rgmanager/src/resources/utils/httpd-parse-config.pl Modes didn't need to be changed. Modes need to be changed to pass ocf_tester (it's one of the tests), should we just skip this?
Re: [Cluster-devel] [PATCH] Fixed scripts for use with rgmanager
12 files changed, 53 insertions(+), 11 deletions(-) mode change 100644 = 100755 rgmanager/src/resources/apache.sh mode change 100644 = 100755 rgmanager/src/resources/clusterfs.sh mode change 100644 = 100755 rgmanager/src/resources/ip.sh mode change 100644 = 100755 rgmanager/src/resources/mysql.sh mode change 100644 = 100755 rgmanager/src/resources/netfs.sh mode change 100644 = 100755 rgmanager/src/resources/nfsclient.sh mode change 100644 = 100755 rgmanager/src/resources/nfsserver.sh mode change 100644 = 100755 rgmanager/src/resources/utils/httpd-parse-config.pl Modes didn't need to be changed. Modes need to be changed to pass ocf_tester (it's one of the tests), should we just skip this? Looking at the heartbeat agents they all are executable in the source, should we try to match that with the agents we've converted? Or should we just keep them as is? The only issue is that then we can't fully test the ocf_tester until after we install. Thanks, Chris
Re: [Cluster-devel] [PATCH] Fixed scripts for use with rgmanager
On 08/11/2011 04:28 AM, Chris Feist wrote: 12 files changed, 53 insertions(+), 11 deletions(-) mode change 100644 = 100755 rgmanager/src/resources/apache.sh mode change 100644 = 100755 rgmanager/src/resources/clusterfs.sh mode change 100644 = 100755 rgmanager/src/resources/ip.sh mode change 100644 = 100755 rgmanager/src/resources/mysql.sh mode change 100644 = 100755 rgmanager/src/resources/netfs.sh mode change 100644 = 100755 rgmanager/src/resources/nfsclient.sh mode change 100644 = 100755 rgmanager/src/resources/nfsserver.sh mode change 100644 = 100755 rgmanager/src/resources/utils/httpd-parse-config.pl Modes didn't need to be changed. Modes need to be changed to pass ocf_tester (it's one of the tests), should we just skip this? It makes sense to be able to test within the source tree too. At the time those files were set 0644, we had no test and no use case to keep them executable within the source. Now we do. ACK from me. The agents are installed 0755 in /usr/share/cluster by Makefile targets. Can you please cross check if also utils/httpd-parse-config.pl is 0755 once installed? If not we need to fix that in utils/Makefile.am. Fabio
