Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
List overview
Download
cluster-commits
July 2010
----- 2024 -----
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
cluster-commits@lists.fedorahosted.org
9 participants
175 discussions
Start a n
N
ew thread
cluster: RHEL6 - fence_rsb: Raise exceptions not strings
by Fabio M. Di Nitto
21 Jul '10
21 Jul '10
Gitweb:
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d2…
Commit: d2a6476f69fedd569b61e1a790cba3ce9ceb9f15 Parent: c5832316e3ae6baa1f50f5871deaa1dde36a2129 Author: Guido Günther <agx(a)sigxcpu.org> AuthorDate: Fri Jul 2 13:42:57 2010 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Wed Jul 21 09:16:08 2010 +0200 fence_rsb: Raise exceptions not strings otherwise we'll see in python 2.6 Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: exceptions must be old-style classes or derived from BaseException, not str Signed-off-by: Marek 'marx' Grac <mgrac(a)redhat.com> Resolves: rhbz#612941 --- fence/agents/rsb/fence_rsb.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py index 8397f36..759ae2d 100644 --- a/fence/agents/rsb/fence_rsb.py +++ b/fence/agents/rsb/fence_rsb.py @@ -167,7 +167,7 @@ def main(): if 'passwd_script' in params: passwd_script = params['passwd_script'] if passwd == "" and passwd_script == "": - raise "missing password" + raise Exception, "missing password" except KeyError, e: os.write(standard_err, "FENCE: Missing passwd param for fence_rsb...exiting") sys.exit(1) @@ -197,11 +197,11 @@ def main(): if len(passwd_script): try: if not os.access(passwd_script, os.X_OK): - raise 'script not executable' + raise Exception, 'script not executable' p = os.popen(passwd_script, 'r', 1024) passwd_scr = p.readline().strip() if p.close() != None: - raise 'script failed' + raise Exception, 'script failed' except: sys.stderr.write('password-script "%s" failed\n' % passwd_script) passwd_scr = ''
1
0
0
0
cluster: STABLE3 - fence agents: add compatibility symlink for ibmblade / bladecenter_snmp
by Fabio M. Di Nitto
21 Jul '10
21 Jul '10
Gitweb:
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=68…
Commit: 6859554b766ba192a10b7fd456f47a3ed957feb9 Parent: bbb9d85c59bd7595d090a966b7ef9511f9497738 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Wed Jul 21 09:11:44 2010 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Wed Jul 21 09:11:44 2010 +0200 fence agents: add compatibility symlink for ibmblade / bladecenter_snmp Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- fence/agents/ibmblade/Makefile | 16 ++++++++++++++++ fence/agents/ibmblade/fence_ibmblade.8 | 1 + 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/fence/agents/ibmblade/Makefile b/fence/agents/ibmblade/Makefile new file mode 100644 index 0000000..208ee4b --- /dev/null +++ b/fence/agents/ibmblade/Makefile @@ -0,0 +1,16 @@ +include ../../../make/defines.mk + +TARGET = fence_ibmblade +MANTARGET = $(TARGET).8 +SBINSYMT = $(TARGET) + +all: $(TARGET) + +include $(OBJDIR)/make/install.mk +include $(OBJDIR)/make/uninstall.mk +include $(OBJDIR)/make/clean.mk + +$(TARGET): + ln -sf fence_bladecenter_snmp $@ + +clean: generalclean diff --git a/fence/agents/ibmblade/fence_ibmblade.8 b/fence/agents/ibmblade/fence_ibmblade.8 new file mode 100644 index 0000000..f6f7888 --- /dev/null +++ b/fence/agents/ibmblade/fence_ibmblade.8 @@ -0,0 +1 @@ +.so man8/fence_bladecenter_snmp.8
1
0
0
0
cluster: STABLE3 - fence: rename ibmblade to bladecenter_snmp
by Fabio M. Di Nitto
20 Jul '10
20 Jul '10
Gitweb:
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=bb…
Commit: bbb9d85c59bd7595d090a966b7ef9511f9497738 Parent: 0b5ff8a551837179cdddc64abcce12f3fd0f8554 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue Jul 20 21:10:22 2010 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue Jul 20 21:10:22 2010 +0200 fence: rename ibmblade to bladecenter_snmp be consistent with other agents similar to apc and apc_snmp Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- fence/agents/bladecenter_snmp/Makefile | 7 ++ .../bladecenter_snmp/fence_bladecenter_snmp.py | 88 ++++++++++++++++++++ fence/agents/ibmblade/Makefile | 7 -- fence/agents/ibmblade/fence_ibmblade.py | 88 -------------------- 4 files changed, 95 insertions(+), 95 deletions(-) diff --git a/fence/agents/bladecenter_snmp/Makefile b/fence/agents/bladecenter_snmp/Makefile new file mode 100644 index 0000000..d98cfa6 --- /dev/null +++ b/fence/agents/bladecenter_snmp/Makefile @@ -0,0 +1,7 @@ +include ../../../make/defines.mk + +TARGET= fence_bladecenter_snmp + +MAKEMAN = 1 + +include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/bladecenter_snmp/fence_bladecenter_snmp.py b/fence/agents/bladecenter_snmp/fence_bladecenter_snmp.py new file mode 100644 index 0000000..deceada --- /dev/null +++ b/fence/agents/bladecenter_snmp/fence_bladecenter_snmp.py @@ -0,0 +1,88 @@ +#!/usr/bin/python + +import sys, re, pexpect +sys.path.append("@FENCEAGENTSLIBDIR@") +from fencing import * +from fencing_snmp import * + +#BEGIN_VERSION_GENERATION +RELEASE_VERSION="IBM BladeCenter SNMP fence agent" +REDHAT_COPYRIGHT="" +BUILD_DATE="" +#END_VERSION_GENERATION + +### CONSTANTS ### +# From fence_ibmblade.pl +STATUSES_OID=".1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.4" # remoteControlBladePowerState +CONTROL_OID=".1.3.6.1.4.1.2.3.51.2.22.1.6.1.1.7" # powerOnOffBlade + +# Status constants returned as value from SNMP +STATUS_DOWN=0 +STATUS_UP=1 + +# Status constants to set as value to SNMP +STATUS_SET_OFF=0 +STATUS_SET_ON=1 + +### FUNCTIONS ### + +def get_power_status(conn,options): + (oid,status)=conn.get("%s.%s"%(STATUSES_OID,options["-n"])) + return (status==str(STATUS_UP) and "on" or "off") + +def set_power_status(conn, options): + conn.set("%s.%s"%(CONTROL_OID,options["-n"]),(options["-o"]=="on" and STATUS_SET_ON or STATUS_SET_OFF)) + +def get_outlets_status(conn, options): + result={} + + res_blades=conn.walk(STATUSES_OID,30) + + for x in res_blades: + port_num=x[0].split('.')[-1] + + port_alias="" + port_status=(x[1]==str(STATUS_UP) and "on" or "off") + + result[port_num]=(port_alias,port_status) + + return result + +# Define new options +def ibmblade_define_defaults(): + all_opt["snmp_version"]["default"]="1" + +# Main agent method +def main(): + global port_oid + + device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", + "action", "ipaddr", "login", "passwd", "passwd_script", + "test", "port", "separator", "no_login", "no_password", + "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", + "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", + "udpport","inet4_only","inet6_only", + "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + + atexit.register(atexit_handler) + + snmp_define_defaults () + ibmblade_define_defaults() + + options=check_input(device_opt,process_input(device_opt)) + + docs = { } + docs["shortdesc"] = "Fence agent for IBM BladeCenter over SNMP" + docs["longdesc"] = "fence_bladecenter_snmp is an I/O Fencing agent \ +which can be used with IBM BladeCenter chassis. It issues SNMP Set \ +request to BladeCenter chassis, rebooting, powering up or down \ +the specified Blade Server." + docs["vendorurl"] = "
http://www.ibm.com
" + show_docs(options, docs) + + # Operate the fencing device + result = fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) + + sys.exit(result) +if __name__ == "__main__": + main() diff --git a/fence/agents/ibmblade/Makefile b/fence/agents/ibmblade/Makefile deleted file mode 100644 index 91f3e2a..0000000 --- a/fence/agents/ibmblade/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -include ../../../make/defines.mk - -TARGET= fence_ibmblade - -MAKEMAN = 1 - -include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/ibmblade/fence_ibmblade.py b/fence/agents/ibmblade/fence_ibmblade.py deleted file mode 100644 index 323a4ad..0000000 --- a/fence/agents/ibmblade/fence_ibmblade.py +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/python - -import sys, re, pexpect -sys.path.append("@FENCEAGENTSLIBDIR@") -from fencing import * -from fencing_snmp import * - -#BEGIN_VERSION_GENERATION -RELEASE_VERSION="IBM Blade SNMP fence agent" -REDHAT_COPYRIGHT="" -BUILD_DATE="" -#END_VERSION_GENERATION - -### CONSTANTS ### -# From fence_ibmblade.pl -STATUSES_OID=".1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.4" # remoteControlBladePowerState -CONTROL_OID=".1.3.6.1.4.1.2.3.51.2.22.1.6.1.1.7" # powerOnOffBlade - -# Status constants returned as value from SNMP -STATUS_DOWN=0 -STATUS_UP=1 - -# Status constants to set as value to SNMP -STATUS_SET_OFF=0 -STATUS_SET_ON=1 - -### FUNCTIONS ### - -def get_power_status(conn,options): - (oid,status)=conn.get("%s.%s"%(STATUSES_OID,options["-n"])) - return (status==str(STATUS_UP) and "on" or "off") - -def set_power_status(conn, options): - conn.set("%s.%s"%(CONTROL_OID,options["-n"]),(options["-o"]=="on" and STATUS_SET_ON or STATUS_SET_OFF)) - -def get_outlets_status(conn, options): - result={} - - res_blades=conn.walk(STATUSES_OID,30) - - for x in res_blades: - port_num=x[0].split('.')[-1] - - port_alias="" - port_status=(x[1]==str(STATUS_UP) and "on" or "off") - - result[port_num]=(port_alias,port_status) - - return result - -# Define new options -def ibmblade_define_defaults(): - all_opt["snmp_version"]["default"]="1" - -# Main agent method -def main(): - global port_oid - - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", - "test", "port", "separator", "no_login", "no_password", - "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", - "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport","inet4_only","inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] - - atexit.register(atexit_handler) - - snmp_define_defaults () - ibmblade_define_defaults() - - options=check_input(device_opt,process_input(device_opt)) - - docs = { } - docs["shortdesc"] = "Fence agent for IBM BladeCenter over SNMP" - docs["longdesc"] = "fence_ibmblade is an I/O Fencing agent \ -which can be used with IBM BladeCenter chassis. It issues SNMP Set \ -request to BladeCenter chassis, rebooting, powering up or down \ -the specified Blade Server." - docs["vendorurl"] = "
http://www.ibm.com
" - show_docs(options, docs) - - # Operate the fencing device - result = fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) - - sys.exit(result) -if __name__ == "__main__": - main()
1
0
0
0
cluster: RHEL6 - resource-agents: Drop tomcat-5 from build
by Lon Hohberger
20 Jul '10
20 Jul '10
Gitweb:
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c5…
Commit: c5832316e3ae6baa1f50f5871deaa1dde36a2129 Parent: df78623ff098681a3e9b9154f4d6e270bf38f121 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Tue Jul 20 13:39:05 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Jul 20 13:39:05 2010 -0400 resource-agents: Drop tomcat-5 from build Resolves: rhbz#593721 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/Makefile b/rgmanager/src/resources/Makefile index 8feab83..687dd0b 100644 --- a/rgmanager/src/resources/Makefile +++ b/rgmanager/src/resources/Makefile @@ -10,7 +10,7 @@ include $(OBJDIR)/make/clean.mk RESOURCES=service.sh ip.sh nfsclient.sh nfsexport.sh \ script.sh netfs.sh clusterfs.sh \ apache.sh openldap.sh samba.sh mysql.sh \ - postgres-8.sh tomcat-5.sh tomcat-6.sh lvm.sh \ + postgres-8.sh tomcat-6.sh lvm.sh \ vm.sh SAPInstance SAPDatabase named.sh \ ASEHAagent.sh nfsserver.sh
1
0
0
0
resource-agents: master - resource-agents: RA for psql does not work correctly with netmask
by Lon Hohberger
20 Jul '10
20 Jul '10
Gitweb:
http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a…
Commit: 1ff1ba755ba4b22d050673521fbff6cdc38e0404 Parent: 3eb441fbe9e76d7b57dbe60a6c7817b641040e55 Author: Hirotaka Igarashi <hiro(a)csrl.jp> AuthorDate: Wed Jul 14 15:40:01 2010 +0200 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Jul 20 11:59:06 2010 -0400 resource-agents: RA for psql does not work correctly with netmask Resolves: rhbz#614457 Signed-off-by: Marek 'marx' Grac <mgrac(a)redhat.com> --- rgmanager/src/resources/postgres-8.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/rgmanager/src/resources/postgres-8.sh b/rgmanager/src/resources/postgres-8.sh index 689c6e2..b0b59c7 100644 --- a/rgmanager/src/resources/postgres-8.sh +++ b/rgmanager/src/resources/postgres-8.sh @@ -71,6 +71,7 @@ generate_config_file() declare x=1 for i in $ip_addressess; do + i=`echo $i | sed -e 's/\/.*$//'` if [ $x -eq 1 ]; then x=0 ip_comma=$i
1
0
0
0
resource-agents: master - resource-agents: Allow other values for "yes"
by Lon Hohberger
20 Jul '10
20 Jul '10
Gitweb:
http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a…
Commit: 3eb441fbe9e76d7b57dbe60a6c7817b641040e55 Parent: b78fa7f2e798b8bb0a4d1e1f1aa985ce4d24b3fa Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Jul 14 10:20:43 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Jul 20 11:58:17 2010 -0400 resource-agents: Allow other values for "yes" Resolves: rhbz#614421 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/utils/fs-lib.sh | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/rgmanager/src/resources/utils/fs-lib.sh b/rgmanager/src/resources/utils/fs-lib.sh index 32667ed..4f242f7 100644 --- a/rgmanager/src/resources/utils/fs-lib.sh +++ b/rgmanager/src/resources/utils/fs-lib.sh @@ -717,12 +717,16 @@ stop: Could not match $OCF_RESKEY_device with a real device" # case ${OCF_RESKEY_force_unmount} in $YES_STR) force_umount=$YES ;; + on) force_umount=$YES ;; + true) force_umount=$YES ;; 1) force_umount=$YES ;; *) force_umount="" ;; esac case ${OCF_RESKEY_self_fence} in $YES_STR) self_fence=$YES ;; + on) self_fence=$YES ;; + true) self_fence=$YES ;; 1) self_fence=$YES ;; *) self_fence="" ;; esac
1
0
0
0
resource-agents: master - resource-agents: change build system to include tomcat6 RA
by Lon Hohberger
20 Jul '10
20 Jul '10
Gitweb:
http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a…
Commit: b78fa7f2e798b8bb0a4d1e1f1aa985ce4d24b3fa Parent: 5fa84b73375fa5dca14abe06146a63fc0de409ca Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Wed Jul 14 09:20:07 2010 +0200 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Jul 20 11:57:58 2010 -0400 resource-agents: change build system to include tomcat6 RA Resolves: rhbz#593721 --- rgmanager/src/resources/Makefile.am | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/resources/Makefile.am b/rgmanager/src/resources/Makefile.am index e4f5c28..6ed2a57 100644 --- a/rgmanager/src/resources/Makefile.am +++ b/rgmanager/src/resources/Makefile.am @@ -9,12 +9,13 @@ RESOURCES = service.sh ip.sh nfsclient.sh nfsexport.sh \ apache.sh openldap.sh samba.sh mysql.sh \ postgres-8.sh tomcat-5.sh lvm.sh \ vm.sh SAPInstance SAPDatabase named.sh \ - ASEHAagent.sh drbd.sh nfsserver.sh + ASEHAagent.sh drbd.sh nfsserver.sh \ + tomcat-6.sh METADATA = apache.metadata openldap.metadata samba.metadata \ mysql.metadata postgres-8.metadata \ tomcat-5.metadata named.metadata lvm.metadata \ - drbd.metadata + drbd.metadata tomcat-6.metadata EVENT_TARGETS = default_event_script.sl follow-service.sl
1
0
0
0
resource-agents: master - resource-agents: new agent for tomcat 6
by Lon Hohberger
20 Jul '10
20 Jul '10
Gitweb:
http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a…
Commit: 5fa84b73375fa5dca14abe06146a63fc0de409ca Parent: 88c1fdbead957fa1036af3ca5c2eeb48f9da1177 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Wed Jul 14 08:47:41 2010 +0200 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Jul 20 11:57:13 2010 -0400 resource-agents: new agent for tomcat 6 Resolves: rhbz#591003 --- rgmanager/src/resources/tomcat-6.metadata | 74 +++++++ rgmanager/src/resources/tomcat-6.sh | 222 ++++++++++++++++++++++ rgmanager/src/resources/utils/config-utils.sh.in | 2 +- 3 files changed, 297 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/tomcat-6.metadata b/rgmanager/src/resources/tomcat-6.metadata new file mode 100644 index 0000000..493e0d5 --- /dev/null +++ b/rgmanager/src/resources/tomcat-6.metadata @@ -0,0 +1,74 @@ +<?xml version="1.0"?> +<resource-agent version="rgmanager 2.0" name="tomcat-6"> + <version>1.0</version> + + <longdesc lang="en"> + This defines an instance of Tomcat server + </longdesc> + <shortdesc lang="en"> + Defines a Tomcat server + </shortdesc> + + <parameters> + <parameter name="name" primary="1"> + <longdesc lang="en"> + Specifies a service name for logging and other purposes + </longdesc> + <shortdesc lang="en"> + Name + </shortdesc> + <content type="string"/> + </parameter> + + <parameter name="config_file"> + <longdesc lang="en"> + Define absolute path to configuration file + </longdesc> + <shortdesc lang="en"> + Config File + </shortdesc> + <content type="string" default="/etc/tomcat6/tomcat6.conf"/> + </parameter> + + <parameter name="shutdown_wait"> + <longdesc lang="en"> + Wait X seconds for correct end of service shutdown + </longdesc> + <shortdesc lang="en"> + Wait X seconds for correct end of service shutdown + </shortdesc> + <content type="integer" default="30" /> + </parameter> + + <parameter name="service_name" inherit="service%name"> + <longdesc lang="en"> + Inherit the service name. We need to know + the service name in order to determine file + systems and IPs for this service. + </longdesc> + <shortdesc lang="en"> + Inherit the service name. + </shortdesc> + <content type="string"/> + </parameter> + </parameters> + + <actions> + <action name="start" timeout="0"/> + <action name="stop" timeout="0"/> + + <!-- Checks to see if it''s mounted in the right place --> + <action name="status" interval="1m" timeout="10"/> + <action name="monitor" interval="1m" timeout="10"/> + + <!-- Checks to see if we can read from the mountpoint --> + <action name="status" depth="10" timeout="30" interval="5m"/> + <action name="monitor" depth="10" timeout="30" interval="5m"/> + + <action name="meta-data" timeout="0"/> + <action name="validate-all" timeout="0"/> + </actions> + + <special tag="rgmanager"> + </special> +</resource-agent> diff --git a/rgmanager/src/resources/tomcat-6.sh b/rgmanager/src/resources/tomcat-6.sh new file mode 100644 index 0000000..3371ea5 --- /dev/null +++ b/rgmanager/src/resources/tomcat-6.sh @@ -0,0 +1,222 @@ +#!/bin/bash + +export LC_ALL=C +export LANG=C +export PATH=/bin:/sbin:/usr/bin:/usr/sbin + +. $(dirname $0)/ocf-shellfuncs +. $(dirname $0)/utils/config-utils.sh +. $(dirname $0)/utils/messages.sh +. $(dirname $0)/utils/ra-skelet.sh + +declare TOMCAT_pid_file="`generate_name_for_pid_file`" +declare TOMCAT_conf_dir="`generate_name_for_conf_dir`/conf" +declare TOMCAT_gen_config_file="$TOMCAT_conf_dir/server.xml" +declare TOMCAT_gen_catalina_base="`generate_name_for_conf_dir`" + +declare CATALINA_HOME +declare CATALINA_BASE +declare CATALINA_TMPDIR +declare CLASSPATH +declare TOMCAT_USER +## + +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_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_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 + + . "$OCF_RESKEY_config_file" + + if [ $? -ne 0 ]; then + clog_service_verify $CLOG_FAILED "Error In The File \"$OCF_RESKEY_config_file\"" + return $OCF_ERR_ARGS + fi + + if [ -z "$CATALINA_HOME" ]; then + clog_service_verify $CLOG_FAILED "CATALINA_HOME Not Specified In ${OCF_RESKEY_config_file}" + return $OCF_ERR_ARGS; + fi + + if [ ! -d "$CATALINA_HOME" ]; then + clog_service_verify $CLOG_FAILED "CATALINA_HOME Does Not Exist" + return $OCF_ERR_ARGS; + fi + + if [ -z "$CATALINA_TMPDIR" ]; then + clog_service_verify $CLOG_FAILED "CATALINA_TMPDIR Not Specified In ${OCF_RESKEY_config_file}" + return $OCF_ERR_ARGS; + fi + + if [ ! -d "$CATALINA_TMPDIR" ]; then + clog_service_verify $CLOG_FAILED "CATALINA_TMPDIR Does Not Exist" + return $OCF_ERR_ARGS; + fi + + if [ -z "$TOMCAT_USER" ]; then + clog_service_verify $CLOG_FAILED "TOMCAT_USER Does Not Exist" + return $OCF_ERR_ARGS; + fi + + clog_service_verify $CLOG_SUCCEED + + return 0 +} + +generate_config_file() +{ + declare original_file="$1" + declare generated_file="$2" + declare ip_addresses="$3" + + if [ -f "$generated_file" ]; then + sha1_verify "$generated_file" + if [ $? -ne 0 ]; then + clog_check_sha1 $CLOG_FAILED + return 0 + fi + fi + + clog_generate_config $CLOG_INIT "$original_file" "$generated_file" + + $(dirname $0)/utils/tomcat-parse-config.pl $ip_addresses < "$original_file" > "$generated_file" + + sha1_addToFile "$generated_file" + clog_generate_config $CLOG_SUCCEED "$original_file" "$generated_file" + + return 0; +} + +start() +{ + clog_service_start $CLOG_INIT + + create_pid_directory + create_conf_directory "$TOMCAT_conf_dir" + check_pid_file "$TOMCAT_pid_file" + + if [ $? -ne 0 ]; then + clog_check_pid $CLOG_FAILED "$TOMCAT_pid_file" + clog_service_start $CLOG_FAILED + return $OCF_ERR_GENERIC + fi + clog_looking_for $CLOG_INIT "IP Addresses" + + get_service_ip_keys "$OCF_RESKEY_service_name" + ip_addresses=`build_ip_list` + + if [ -z "$ip_addresses" ]; then + clog_looking_for $CLOG_FAILED_NOT_FOUND "IP Addresses" + return $OCF_ERR_GENERIC + fi + + clog_looking_for $CLOG_SUCCEED "IP Addresses" + + . "$OCF_RESKEY_config_file" + + generate_config_file "$CATALINA_BASE/conf/server.xml" "$TOMCAT_gen_config_file" "$ip_addresses" + rm -f "$TOMCAT_gen_catalina_base/conf/tomcat6.conf" + ( cat $OCF_RESKEY_config_file | grep -v 'CATALINA_PID=' | grep -v 'CATALINA_BASE='; echo CATALINA_BASE="$TOMCAT_gen_catalina_base"; echo CATALINA_PID="$TOMCAT_pid_file") > "$TOMCAT_gen_catalina_base/conf/tomcat6.conf" + ln -s "$CATALINA_BASE"/* "$TOMCAT_gen_catalina_base" &> /dev/null + ln -s "$CATALINA_BASE"/conf/* "$TOMCAT_gen_catalina_base"/conf &> /dev/null + + export TOMCAT_CFG="$TOMCAT_gen_catalina_base/conf/tomcat6.conf" + /usr/sbin/tomcat6 start + + if [ $? -ne 0 ]; then + clog_service_start $CLOG_FAILED + return $OCF_ERR_GENERIC + fi + + clog_service_start $CLOG_SUCCEED + + return 0; +} + +stop() +{ + clog_service_stop $CLOG_INIT + + stop_generic "$TOMCAT_pid_file" "$OCF_RESKEY_shutdown_wait" + + if [ $? -ne 0 ]; then + clog_service_stop $CLOG_FAILED + return $OCF_ERR_GENERIC + fi + + if [ -e "$TOMCAT_pid_file" ]; then + rm -f "$TOMCAT_pid_file" + fi + + clog_service_stop $CLOG_SUCCEED + return 0; +} + +status() +{ + clog_service_status $CLOG_INIT + + status_check_pid "$TOMCAT_pid_file" + if [ $? -ne 0 ]; then + clog_service_status $CLOG_FAILED "$TOMCAT_pid_file" + return $OCF_ERR_GENERIC + fi + + clog_service_status $CLOG_SUCCEED + return 0 +} + +case $1 in + meta-data) + cat `echo $0 | sed 's/^\(.*\)\.sh$/\1.metadata/'` + exit 0 + ;; + validate-all) + verify_all + exit $? + ;; + start) + verify_all && start + exit $? + ;; + stop) + verify_all && stop + exit $? + ;; + status|monitor) + verify_all + status + exit $? + ;; + restart) + verify_all + stop + start + exit $? + ;; + *) + echo "Usage: $0 {start|stop|status|monitor|restart|meta-data|validate-all}" + exit $OCF_ERR_UNIMPLEMENTED + ;; +esac diff --git a/rgmanager/src/resources/utils/config-utils.sh.in b/rgmanager/src/resources/utils/config-utils.sh.in index 1d343ac..05b04fa 100644 --- a/rgmanager/src/resources/utils/config-utils.sh.in +++ b/rgmanager/src/resources/utils/config-utils.sh.in @@ -37,7 +37,7 @@ sha1_verify() sha1_new=`cat $oldFile | grep -v "# rgmanager-sha1" | sha1sum | sed 's/^\([a-z0-9]\+\) .*$/\1/'` sha1_old=`tail -n 1 $oldFile | sed 's/^# rgmanager-sha1 \(.*\)$/\1/' | sed 's/^\([a-z0-9]\+\) .*$/\1/'` - if [ $sha1_new = $sha1_old ]; then + if [ "$sha1_new" = "$sha1_old" ]; then ocf_log debug "Checking: SHA1 checksum > succeed" return 0; else
1
0
0
0
resource-agents: master - resource-agents: Use SIGQUIT if SIGTERM was not fast enough
by Lon Hohberger
20 Jul '10
20 Jul '10
Gitweb:
http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a…
Commit: 88c1fdbead957fa1036af3ca5c2eeb48f9da1177 Parent: 3e5e5dee523e0394096d9368976f2e2447f0f19a Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Tue Jul 13 15:20:07 2010 +0200 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Jul 20 11:57:05 2010 -0400 resource-agents: Use SIGQUIT if SIGTERM was not fast enough There are applications (like psql) that are not closed with SIGTERM if there are open connections. New function stop_generic_sigkill() was introduced to handle such case and disable service correctly. Based on patch proposed in bz by Shane Bradley Resolves: rhbz#612165 --- rgmanager/src/resources/postgres-8.sh | 3 +- rgmanager/src/resources/utils/config-utils.sh.in | 2 +- rgmanager/src/resources/utils/messages.sh | 8 ++++ rgmanager/src/resources/utils/ra-skelet.sh | 40 +++++++++++++++++++--- 4 files changed, 46 insertions(+), 7 deletions(-) diff --git a/rgmanager/src/resources/postgres-8.sh b/rgmanager/src/resources/postgres-8.sh index 563c700..689c6e2 100644 --- a/rgmanager/src/resources/postgres-8.sh +++ b/rgmanager/src/resources/postgres-8.sh @@ -13,6 +13,7 @@ declare PSQL_POSTMASTER="/usr/bin/postmaster" declare PSQL_pid_file="`generate_name_for_pid_file`" declare PSQL_conf_dir="`generate_name_for_conf_dir`" declare PSQL_gen_config_file="$PSQL_conf_dir/postgresql.conf" +declare PSQL_kill_timeout="5" verify_all() { @@ -145,7 +146,7 @@ stop() { clog_service_stop $CLOG_INIT - stop_generic "$PSQL_pid_file" "$OCF_RESKEY_shutdown_wait" + stop_generic_sigkill "$PSQL_pid_file" "$OCF_RESKEY_shutdown_wait" "$PSQL_kill_timeout" if [ $? -ne 0 ]; then clog_service_stop $CLOG_FAILED return $OCF_ERR_GENERIC diff --git a/rgmanager/src/resources/utils/config-utils.sh.in b/rgmanager/src/resources/utils/config-utils.sh.in index 4ee083f..1d343ac 100644 --- a/rgmanager/src/resources/utils/config-utils.sh.in +++ b/rgmanager/src/resources/utils/config-utils.sh.in @@ -3,7 +3,7 @@ declare RA_COMMON_pid_dir=/var/run/cluster declare RA_COMMON_conf_dir=@CONFDIR@ -declare -i FAIL=-1 +declare -i FAIL=255 declare -a ip_keys generate_configTemplate() diff --git a/rgmanager/src/resources/utils/messages.sh b/rgmanager/src/resources/utils/messages.sh index 6148fa6..9381f1f 100644 --- a/rgmanager/src/resources/utils/messages.sh +++ b/rgmanager/src/resources/utils/messages.sh @@ -2,12 +2,14 @@ declare CLOG_INIT=100 declare CLOG_SUCCEED=200 +declare CLOG_SUCCEED_KILL=201 declare CLOG_FAILED=400 declare CLOG_FAILED_TIMEOUT=401 declare CLOG_FAILED_NOT_FOUND=403 declare CLOG_FAILED_INVALID=404 declare CLOG_FAILED_NOT_READABLE=405 +declare CLOG_FAILED_KILL=406 ## ## Usage: @@ -45,12 +47,18 @@ clog_service_stop() $CLOG_SUCCEED) ocf_log info "Stopping Service $OCF_RESOURCE_INSTANCE > Succeed" ;; + $CLOG_SUCCEED_KILL) + ocf_log info "Killing Service $OCF_RESOURCE_INSTANCE > Succeed" + ;; $CLOG_FAILED) ocf_log error "Stopping Service $OCF_RESOURCE_INSTANCE > Failed" ;; $CLOG_FAILED_NOT_STOPPED) ocf_log error "Stopping Service $OCF_RESOURCE_INSTANCE > Failed - Application Is Still Running" ;; + $CLOG_FAILED_KILL) + ocf_log error "Killing Service $OCF_RESOURCE_INSTANCE > Failed" + ;; esac return 0 } diff --git a/rgmanager/src/resources/utils/ra-skelet.sh b/rgmanager/src/resources/utils/ra-skelet.sh index 5baaaa9..5de7bb2 100644 --- a/rgmanager/src/resources/utils/ra-skelet.sh +++ b/rgmanager/src/resources/utils/ra-skelet.sh @@ -30,7 +30,7 @@ status_check_pid() stop_generic() { declare pid_file="$1" - declare kill_timeout="$2" + declare stop_timeout="$2" declare pid; declare count=0; @@ -42,8 +42,8 @@ stop_generic() return 0 fi - if [ -z "$kill_timeout" ]; then - kill_timeout=20 + if [ -z "$stop_timeout" ]; then + stop_timeout=20 fi read pid < "$pid_file" @@ -64,16 +64,46 @@ stop_generic() return $OCF_ERR_GENERIC fi - until [ `ps --pid "$pid" &> /dev/null; echo $?` = '1' ] || [ $count -gt $kill_timeout ] + until [ `ps --pid "$pid" &> /dev/null; echo $?` = '1' ] || [ $count -gt $stop_timeout ] do sleep 1 let count=$count+1 done - if [ $count -gt $kill_timeout ]; then + if [ $count -gt $stop_timeout ]; then clog_service_stop $CLOG_FAILED_NOT_STOPPED return $OCF_ERR_GENERIC fi return 0; } + +stop_generic_sigkill() { + # Use stop_generic (kill -TERM) and if application did not stop + # correctly then use kill -QUIT and check if it was killed + declare pid_file="$1" + declare stop_timeout="$2" + declare kill_timeout="$3" + declare pid + + stop_generic "$pid_file" "$stop_timeout" + if [ $? -eq 0 ]; then + return 0; + fi + + read pid < "$pid_file" + kill -QUIT "$pid" + if [ $? -ne 0 ]; then + return $OCF_GENERIC_ERROR + fi + + sleep "$kill_timeout" + ps --pid "$psql_pid" &> /dev/null + if [ $? -eq 0 ]; then + clog_service_stop $CLOG_FAILED_KILL + return $OCF_ERR_GENERIC + fi + + clog_service_stop $CLOG_SUCCEED_KILL + return 0 +}
1
0
0
0
resource-agents: master - resource-agents: Add resource type to logging
by Lon Hohberger
20 Jul '10
20 Jul '10
Gitweb:
http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a…
Commit: 3e5e5dee523e0394096d9368976f2e2447f0f19a Parent: 9d2da4d53fc6c8cbb22359b6961ade3afb3e721c Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Mon Jul 12 13:51:57 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Jul 20 11:56:56 2010 -0400 resource-agents: Add resource type to logging Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/ocf-shellfuncs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/ocf-shellfuncs b/rgmanager/src/resources/ocf-shellfuncs index f8226cb..3f7051a 100644 --- a/rgmanager/src/resources/ocf-shellfuncs +++ b/rgmanager/src/resources/ocf-shellfuncs @@ -159,7 +159,7 @@ ocf_log() { if [ -z "`which clulog 2> /dev/null`" ]; then return 0 fi - clulog -s $__OCF_PRIO_N "$__OCF_MSG" + clulog -m "$OCF_RESOURCE_TYPE" -s $__OCF_PRIO_N "$__OCF_MSG" } __ocf_set_defaults "$@"
1
0
0
0
← Newer
1
...
5
6
7
8
9
10
11
...
18
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
Results per page:
10
25
50
100
200