Fixed scripts for use with rgmanager

PATCH New Chris Feist 3 participants 6 messages Aug 10, 2011 – Aug 12, 2011

Share & tools

Chris Feist

author

2011-08-10 18:13 UTC #0 lore raw

PATCH 1/1 Fixed scripts for use with rgmanager

Patch to fix common rgmanager scripts for use with pacemaker.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 0001-Fixed-scripts-for-use-with-rgmanager.patch
URL: <http://listman.redhat.com/archives/cluster-devel/attachments/20110810/c7e29732/attachment.ksh>

Lon Hohberger

2011-08-11 00:44 UTC #1 lore raw

PATCH 1/1 Fixed scripts for use with rgmanager

Quoted 1 line · Chris Feist

Patch to fix common rgmanager scripts for use with pacemaker.

Oops... NACK

Quoted 9 lines

 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.

Review

Quoted 1 line

(quoted diff) +1 -0

+			clog_service_status $CLOG_FAILED "$APAHCE_pid_file"

Typo ... APACHE

Review

Quoted 4 lines

(quoted diff) +3 -0

 	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.

Signature · 1 line

Lon Hohberger - Red Hat, Inc.

Chris Feist

author

2011-08-11 02:28 UTC #2 lore raw

PATCH 1/1 Fixed scripts for use with rgmanager

Quoted 12 lines

Quoted 11 lines

 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

Quoted 1 line

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?

Chris Feist

author

2011-08-11 02:56 UTC #3 lore raw

PATCH 1/1 Fixed scripts for use with rgmanager

Quoted 11 lines

Quoted 10 lines

 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

Quoted 4 lines

Quoted 1 line
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

Lon Hohberger

2011-08-12 01:18 UTC #4 lore raw

PATCH 1/1 Fixed scripts for use with rgmanager

Quoted 11 lines · Chris Feist

Quoted 11 lines

Quoted 10 lines

 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

Quoted 7 lines

Quoted 4 lines
Quoted 1 line
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.

Signature · 1 line

Lon Hohberger - Red Hat, Inc.

Fabio M. Di Nitto

2011-08-11 03:57 UTC #5 lore raw

PATCH 1/1 Fixed scripts for use with rgmanager

In reply to Chris Feist

Quoted 12 lines · Chris Feist

Quoted 12 lines

Quoted 11 lines

 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

Quoted 4 lines

Quoted 1 line
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