October 2009 - cluster-commits - Fedora mailing-lists

cluster: STABLE3 - fence_ipmilan: metadata should be in expected format
by Fabio M. Di Nitto 19 Oct '09

19 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=3b… Commit: 3b1984c84444bfe24d8e8253e91e3d4a9cbde05c Parent: d9abc5ed767c8dcd27136e5a3cb75fc322d24048 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 19 16:57:19 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue Oct 20 05:30:08 2009 +0200 fence_ipmilan: metadata should be in expected format Metadata format fixed, added information getopt/default/... We will have to add short/long description but we don't have it anywhere yet. --- fence/agents/ipmilan/ipmilan.c | 49 ++++++++++++++++++++++++++++++--------- 1 files changed, 37 insertions(+), 12 deletions(-) diff --git a/fence/agents/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c index a240bb3..b1a7149 100644 --- a/fence/agents/ipmilan/ipmilan.c +++ b/fence/agents/ipmilan/ipmilan.c @@ -147,21 +147,26 @@ static struct Etoken power_status[] = { /* Structure describing one xml metadata value*/ struct xml_parameter_s { const char *name; + const char *getopt; + const int required; + const char *content_type; + const char *default_value; const char *description; }; /* Array of xml metadatas*/ struct xml_parameter_s xml_parameters[]={ - {"auth","IPMI Lan Auth type (md5, password, or none)"}, - {"ipaddr","IPMI Lan IP to talk to"}, - {"passwd","Password (if required) to control power on IPMI device"}, - {"passwd_script","Script to retrieve password (if required)"}, - {"lanplus","Use Lanplus"}, - {"login","Username/Login (if required) to control power on IPMI device"}, - {"action","Operation to perform. Valid operations: on, off, reboot, status, list, monitor or metadata"}, - {"timeout","Timeout (sec) for IPMI operation"}, - {"cipher","Ciphersuite to use (same as ipmitool -C parameter)"}, - {"verbose","Verbose mode"}}; + {"auth","-A",0,"string",NULL,"IPMI Lan Auth type (md5, password, or none)"}, + {"ipaddr","-a",1,"string",NULL,"IPMI Lan IP to talk to"}, + {"passwd","-p",0,"string",NULL,"Password (if required) to control power on IPMI device"}, + {"passwd_script","-S",0,"string",NULL,"Script to retrieve password (if required)"}, + {"lanplus","-P",0,"boolean",NULL,"Use Lanplus"}, + {"login","-l",0,"string",NULL,"Username/Login (if required) to control power on IPMI device"}, + {"action","-o",0,"string","reboot","Operation to perform. Valid operations: on, off, reboot, status, list, monitor or metadata"}, + {"timeout","-t",0,"string",NULL,"Timeout (sec) for IPMI operation"}, + {"cipher","-C",0,"string",NULL,"Ciphersuite to use (same as ipmitool -C parameter)"}, + {"method","-M",0,"string",DEFAULT_METHOD,"Method to fence (onoff or cycle)"}, + {"verbose","-v",0,"boolean",NULL,"Verbose mode"}}; /* Search for ipmitool @@ -820,18 +825,38 @@ static void print_xml_metadata(char *pname) { int i; printf("%s\n","<?xml version=\"1.0\" ?>"); - printf("%s%s%s\n","<resource-agent name=\"",pname,"\" >"); + printf("%s%s%s\n","<resource-agent name=\"",pname,"\" shortdesc=\"\">"); + printf("<longdesc>\n"); + printf("</longdesc>\n"); printf("%s\n","<parameters>"); for (i=0;i<(sizeof(xml_parameters)/sizeof(struct xml_parameter_s));i++) { printf("\t<parameter name=\"%s\" unique=\"1\">\n",xml_parameters[i].name); - printf("\t\t<shortdesc lang=\"C\">"); + printf("\t\t<getopt mixed=\"%s\" />\n",xml_parameters[i].getopt); + if (xml_parameters[i].default_value == NULL) { + printf("\t\t<content type=\"%s\" />\n",xml_parameters[i].content_type); + } else { + printf("\t\t<content type=\"%s\" default=\"%s\"/>\n", \ + xml_parameters[i].content_type, \ + xml_parameters[i].default_value ); + } + + printf("\t\t<shortdesc lang=\"en\">"); printf("%s",xml_parameters[i].description); printf("</shortdesc>\n"); printf("\t</parameter>\n"); } printf("%s\n","</parameters>"); + printf("%s\n","<actions>"); + printf("\t<action name=\"%s\" />\n", "on"); + printf("\t<action name=\"%s\" />\n", "off"); + printf("\t<action name=\"%s\" />\n", "reboot"); + printf("\t<action name=\"%s\" />\n", "status"); + printf("\t<action name=\"%s\" />\n", "list"); + printf("\t<action name=\"%s\" />\n", "monitor"); + printf("\t<action name=\"%s\" />\n", "metadata"); + printf("%s\n","</actions>"); printf("%s\n","</resource-agent>"); }

1 0

cluster: STABLE3 - fence_ipmilan: allow metadata invocation without other parameters
by Fabio M. Di Nitto 19 Oct '09

19 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d9… Commit: d9abc5ed767c8dcd27136e5a3cb75fc322d24048 Parent: c5261f268d99c48d3e9a14c89f4cbef53e3ec57d Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Wed Oct 7 06:54:02 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue Oct 20 05:29:18 2009 +0200 fence_ipmilan: allow metadata invocation without other parameters --- fence/agents/ipmilan/ipmilan.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/fence/agents/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c index f6ed895..a240bb3 100644 --- a/fence/agents/ipmilan/ipmilan.c +++ b/fence/agents/ipmilan/ipmilan.c @@ -961,6 +961,14 @@ main(int argc, char **argv) } } + if (!strcasecmp(op, "metadata")) { + print_xml_metadata(pname); + translated_ret = ERR_OK; + ret=0; + print_final_status=0; + goto metaout; + } + /* Validate the operating parameters */ @@ -1069,11 +1077,6 @@ main(int argc, char **argv) ret=0; translated_ret = ERR_OK; print_final_status=0; - } else if (!strcasecmp(op, "metadata")) { - print_xml_metadata(pname); - ret=0; - translated_ret = ERR_OK; - print_final_status=0; } @@ -1081,6 +1084,7 @@ out: ipmi_destroy(i); free(i); +metaout: if (print_final_status) { if (ret == 0) printf("Done\n");

1 0

cluster: STABLE3 - fence_ilo: do not import unrequired modules
by Fabio M. Di Nitto 19 Oct '09

19 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c5… Commit: c5261f268d99c48d3e9a14c89f4cbef53e3ec57d Parent: 749649428f4ed4f57f21ecf4a886fb3b8ac11260 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue Oct 20 05:23:39 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue Oct 20 05:23:39 2009 +0200 fence_ilo: do not import unrequired modules Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- fence/agents/ilo/fence_ilo.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py index 0ff40d7..9905e2b 100755 --- a/fence/agents/ilo/fence_ilo.py +++ b/fence/agents/ilo/fence_ilo.py @@ -14,7 +14,6 @@ import sys, re, pexpect, socket sys.path.append("@FENCEAGENTSLIBDIR@") from fencing import * -from OpenSSL import SSL #BEGIN_VERSION_GENERATION RELEASE_VERSION="New ILO Agent - test release on steroids"

1 0

cluster: STABLE3 - fence agents automatic man page generation
by Fabio M. Di Nitto 19 Oct '09

19 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=74… Commit: 749649428f4ed4f57f21ecf4a886fb3b8ac11260 Parent: 400cda7587885f24f997f3e5754acc0d901f95f1 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue Oct 20 05:21:12 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue Oct 20 05:21:12 2009 +0200 fence agents automatic man page generation - use MANTARGET for man pages - remove make/man.mk and move install/uninstall targets to the right place - add fence2man.xsl Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/man/Makefile | 10 ++++++- config/man/Makefile | 9 +++++- config/tools/man/Makefile | 9 +++++- dlm/man/Makefile | 10 ++++++- fence/agents/Makefile | 2 +- fence/agents/alom/Makefile | 2 + fence/agents/apc/Makefile | 2 + fence/agents/apc_snmp/Makefile | 5 +++- fence/agents/baytech/Makefile | 3 +- fence/agents/bladecenter/Makefile | 2 + fence/agents/brocade/Makefile | 3 +- fence/agents/bullpap/Makefile | 3 +- fence/agents/cisco_mds/Makefile | 2 + fence/agents/cpint/Makefile | 3 +- fence/agents/drac5/Makefile | 2 + fence/agents/egenera/Makefile | 3 +- fence/agents/eps/Makefile | 2 + fence/agents/ibmblade/Makefile | 5 +++- fence/agents/ifmib/Makefile | 2 + fence/agents/ilo/Makefile | 2 + fence/agents/ilo_mp/Makefile | 2 + fence/agents/intelmodular/Makefile | 5 +++- fence/agents/ipmilan/Makefile | 10 ++++++- fence/agents/ldom/Makefile | 2 + fence/agents/lib/fence2man.xsl | 48 ++++++++++++++++++++++++++++++++++++ fence/agents/lpar/Makefile | 2 + fence/agents/mcdata/Makefile | 3 +- fence/agents/rsa/Makefile | 5 +++- fence/agents/rsb/Makefile | 3 +- fence/agents/sanbox2/Makefile | 3 +- fence/agents/virsh/Makefile | 2 + fence/agents/vixel/Makefile | 3 +- fence/agents/vmware/Makefile | 2 + fence/agents/wti/Makefile | 2 + fence/agents/xcat/Makefile | 3 +- fence/agents/xvm/Makefile | 10 ++++++- fence/agents/zvm/Makefile | 3 +- fence/man/Makefile | 11 ++++++-- gfs/man/Makefile | 10 ++++++- gfs2/man/Makefile | 10 ++++++- group/man/Makefile | 10 ++++++- make/fencebuild.mk | 9 ++++++- make/install.mk | 8 ++++++ make/man.mk | 18 ------------- make/uninstall.mk | 7 +++++ rgmanager/man/Makefile | 10 ++++++- 46 files changed, 226 insertions(+), 56 deletions(-) diff --git a/cman/man/Makefile b/cman/man/Makefile index 54d7c9a..9ed16e9 100644 --- a/cman/man/Makefile +++ b/cman/man/Makefile @@ -1,4 +1,5 @@ -TARGET= cman.5 \ +MANTARGET= \ + cman.5 \ qdisk.5 \ cman_tool.8 \ qdiskd.8 \ @@ -6,4 +7,9 @@ TARGET= cman.5 \ cmannotifyd.8 include ../../make/defines.mk -include $(OBJDIR)/make/man.mk +include $(OBJDIR)/make/install.mk +include $(OBJDIR)/make/uninstall.mk + +all: + +clean: diff --git a/config/man/Makefile b/config/man/Makefile index bf289e0..0c003af 100644 --- a/config/man/Makefile +++ b/config/man/Makefile @@ -1,4 +1,9 @@ -TARGET= cluster.conf.5 +MANTARGET= cluster.conf.5 include ../../make/defines.mk -include $(OBJDIR)/make/man.mk +include $(OBJDIR)/make/install.mk +include $(OBJDIR)/make/uninstall.mk + +all: + +clean: diff --git a/config/tools/man/Makefile b/config/tools/man/Makefile index e29dbf0..8674f66 100644 --- a/config/tools/man/Makefile +++ b/config/tools/man/Makefile @@ -1,8 +1,13 @@ -TARGET= ccs_config_dump.8 \ +MANTARGET= \ + ccs_config_dump.8 \ ccs_config_validate.8 \ ccs_tool.8 \ confdb2ldif.8 include ../../../make/defines.mk +include $(OBJDIR)/make/install.mk +include $(OBJDIR)/make/uninstall.mk -include $(OBJDIR)/make/man.mk +all: + +clean: diff --git a/dlm/man/Makefile b/dlm/man/Makefile index 9041a93..7cc2886 100644 --- a/dlm/man/Makefile +++ b/dlm/man/Makefile @@ -1,4 +1,5 @@ -TARGET= dlm_cleanup.3 \ +MANTARGET= \ + dlm_cleanup.3 \ dlm_close_lockspace.3 \ dlm_create_lockspace.3 \ dlm_dispatch.3 \ @@ -21,4 +22,9 @@ TARGET= dlm_cleanup.3 \ dlm_tool.8 include ../../make/defines.mk -include $(OBJDIR)/make/man.mk +include $(OBJDIR)/make/install.mk +include $(OBJDIR)/make/uninstall.mk + +all: + +clean: diff --git a/fence/agents/Makefile b/fence/agents/Makefile index e183b73..25ccfc0 100644 --- a/fence/agents/Makefile +++ b/fence/agents/Makefile @@ -2,5 +2,5 @@ include ../../make/defines.mk include $(OBJDIR)/make/passthrough.mk ifdef fence_agents -SUBDIRS = ${fence_agents} lib nss_wrapper +SUBDIRS = lib nss_wrapper ${fence_agents} endif diff --git a/fence/agents/alom/Makefile b/fence/agents/alom/Makefile index 6efc272..08d5843 100644 --- a/fence/agents/alom/Makefile +++ b/fence/agents/alom/Makefile @@ -2,4 +2,6 @@ include ../../../make/defines.mk TARGET= fence_alom +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/apc/Makefile b/fence/agents/apc/Makefile index 88cd004..53ef7f2 100644 --- a/fence/agents/apc/Makefile +++ b/fence/agents/apc/Makefile @@ -2,4 +2,6 @@ include ../../../make/defines.mk TARGET= fence_apc +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/apc_snmp/Makefile b/fence/agents/apc_snmp/Makefile index 9d2e498..733842e 100644 --- a/fence/agents/apc_snmp/Makefile +++ b/fence/agents/apc_snmp/Makefile @@ -1,4 +1,7 @@ +include ../../../make/defines.mk + TARGET= fence_apc_snmp -include ../../../make/defines.mk +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/baytech/Makefile b/fence/agents/baytech/Makefile index 2acfe58..23bfe58 100644 --- a/fence/agents/baytech/Makefile +++ b/fence/agents/baytech/Makefile @@ -1,4 +1,5 @@ +include ../../../make/defines.mk + TARGET= fence_baytech -include ../../../make/defines.mk include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/bladecenter/Makefile b/fence/agents/bladecenter/Makefile index a123a15..1425812 100644 --- a/fence/agents/bladecenter/Makefile +++ b/fence/agents/bladecenter/Makefile @@ -2,4 +2,6 @@ include ../../../make/defines.mk TARGET= fence_bladecenter +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/brocade/Makefile b/fence/agents/brocade/Makefile index 74e96cc..6ac510f 100644 --- a/fence/agents/brocade/Makefile +++ b/fence/agents/brocade/Makefile @@ -1,4 +1,5 @@ +include ../../../make/defines.mk + TARGET= fence_brocade -include ../../../make/defines.mk include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/bullpap/Makefile b/fence/agents/bullpap/Makefile index ac2754f..b84826a 100644 --- a/fence/agents/bullpap/Makefile +++ b/fence/agents/bullpap/Makefile @@ -1,4 +1,5 @@ +include ../../../make/defines.mk + TARGET= fence_bullpap -include ../../../make/defines.mk include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/cisco_mds/Makefile b/fence/agents/cisco_mds/Makefile index e4e8c9f..2154ec8 100644 --- a/fence/agents/cisco_mds/Makefile +++ b/fence/agents/cisco_mds/Makefile @@ -2,4 +2,6 @@ include ../../../make/defines.mk TARGET= fence_cisco_mds +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/cpint/Makefile b/fence/agents/cpint/Makefile index 0591ea8..637ce23 100644 --- a/fence/agents/cpint/Makefile +++ b/fence/agents/cpint/Makefile @@ -1,4 +1,5 @@ +include ../../../make/defines.mk + TARGET= fence_cpint -include ../../../make/defines.mk include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/drac5/Makefile b/fence/agents/drac5/Makefile index 5388cf8..5db5ad9 100644 --- a/fence/agents/drac5/Makefile +++ b/fence/agents/drac5/Makefile @@ -2,4 +2,6 @@ include ../../../make/defines.mk TARGET= fence_drac5 +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/egenera/Makefile b/fence/agents/egenera/Makefile index 655cc0c..3949482 100644 --- a/fence/agents/egenera/Makefile +++ b/fence/agents/egenera/Makefile @@ -1,4 +1,5 @@ +include ../../../make/defines.mk + TARGET= fence_egenera -include ../../../make/defines.mk include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/eps/Makefile b/fence/agents/eps/Makefile index fc665bc..0cdba17 100644 --- a/fence/agents/eps/Makefile +++ b/fence/agents/eps/Makefile @@ -2,4 +2,6 @@ include ../../../make/defines.mk TARGET= fence_eps +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/ibmblade/Makefile b/fence/agents/ibmblade/Makefile index 522a24a..23d49c1 100644 --- a/fence/agents/ibmblade/Makefile +++ b/fence/agents/ibmblade/Makefile @@ -1,4 +1,7 @@ +include ../../../make/defines.mk + TARGET= fence_ibmblade -include ../../../make/defines.mk +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/ifmib/Makefile b/fence/agents/ifmib/Makefile index 32a5657..d3745ad 100644 --- a/fence/agents/ifmib/Makefile +++ b/fence/agents/ifmib/Makefile @@ -2,4 +2,6 @@ include ../../../make/defines.mk TARGET= fence_ifmib +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/ilo/Makefile b/fence/agents/ilo/Makefile index 66420ab..fe4c712 100644 --- a/fence/agents/ilo/Makefile +++ b/fence/agents/ilo/Makefile @@ -2,4 +2,6 @@ include ../../../make/defines.mk TARGET= fence_ilo +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/ilo_mp/Makefile b/fence/agents/ilo_mp/Makefile index 6405a8f..b4bc456 100644 --- a/fence/agents/ilo_mp/Makefile +++ b/fence/agents/ilo_mp/Makefile @@ -2,4 +2,6 @@ include ../../../make/defines.mk TARGET= fence_ilo_mp +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/intelmodular/Makefile b/fence/agents/intelmodular/Makefile index ba22926..7ff7668 100644 --- a/fence/agents/intelmodular/Makefile +++ b/fence/agents/intelmodular/Makefile @@ -1,4 +1,7 @@ +include ../../../make/defines.mk + TARGET= fence_intelmodular -include ../../../make/defines.mk +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/ipmilan/Makefile b/fence/agents/ipmilan/Makefile index 1c2e9e9..e8790af 100644 --- a/fence/agents/ipmilan/Makefile +++ b/fence/agents/ipmilan/Makefile @@ -2,7 +2,9 @@ TARGET= fence_ipmilan SBINDIRT=$(TARGET) -all: ${TARGET} +MANTARGET=$(TARGET).8 + +all: ${TARGET} ${MANTARGET} include ../../../make/defines.mk include $(OBJDIR)/make/cobj.mk @@ -20,6 +22,12 @@ LDFLAGS += -L${libdir} ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS) +$(MANTARGET): $(TARGET) ${SRCDIR}/fence/agents/lib/fence2man.xsl + set -e && \ + ./$(TARGET) -o metadata > .$@.tmp && \ + xsltproc ${SRCDIR}/fence/agents/lib/fence2man.xsl .$@.tmp > $@ + clean: generalclean + rm -f $(MANTARGET) .$(MANTARGET).tmp -include $(OBJS:.o=.d) diff --git a/fence/agents/ldom/Makefile b/fence/agents/ldom/Makefile index a288025..821bc21 100644 --- a/fence/agents/ldom/Makefile +++ b/fence/agents/ldom/Makefile @@ -2,4 +2,6 @@ include ../../../make/defines.mk TARGET= fence_ldom +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/lib/fence2man.xsl b/fence/agents/lib/fence2man.xsl new file mode 100644 index 0000000..f8ff237 --- /dev/null +++ b/fence/agents/lib/fence2man.xsl @@ -0,0 +1,48 @@ +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> +<xsl:output method="text" indent="no"/> +<xsl:template match="parameter"> +<xsl:param name="show" /> +.TP +<xsl:if test="$show = 'getopt'">.B <xsl:value-of select="getopt/@mixed" /></xsl:if> +<xsl:if test="$show = 'stdin'">.B <xsl:value-of select="@name"/></xsl:if> +. +<xsl:value-of select="normalize-space(shortdesc)"/> +<xsl:if test="not(content/@default)"><xsl:if test="@required = 1"> This parameter is always required.</xsl:if></xsl:if> +<xsl:if test="content/@default"> (Default Value: <xsl:value-of select="content/@default"/>)</xsl:if> +</xsl:template> + +<xsl:template match="action"> +.TP +\fB<xsl:value-of select="@name"/> \fP +<xsl:choose> +<xsl:when test="@name = 'on'">Power on machine.</xsl:when> +<xsl:when test="@name = 'off'">Power off machine.</xsl:when> +<xsl:when test="@name = 'reboot'">Reboot machine.</xsl:when> +<xsl:when test="@name = 'monitor'">Check if fencing device is running. List available plugs/virtual machines or get status of machine (if it does not support more).</xsl:when> +<xsl:when test="@name = 'meta-data'">Display the XML metadata describing this resource.</xsl:when> +<xsl:when test="@name = 'list'">List available plugs with aliases/virtual machines if there is support for more then one device. Returns N/A otherwise.</xsl:when> +<xsl:when test="@name = 'status'">This returns the status of the plug/virtual machine.</xsl:when> + +<xsl:otherwise> The operational behavior of this is not known.</xsl:otherwise> +</xsl:choose> +</xsl:template> + +<xsl:template match="/resource-agent"> +.TH FENCE_AGENT 8 2009-01-20 "<xsl:value-of select="@name"/> (Fence Agent)" +.SH NAME +<xsl:value-of select="@name" /> - <xsl:value-of select="@shortdesc" /> +.SH DESCRIPTION +<xsl:value-of select="@name" /> accepts options on the command line as well +as from stdin. Fenced sends parameters through stdin when it execs the +agent. <xsl:value-of select="@name" /> can be run by itself with command +line options. This is useful for testing and for turning outlets on or off +from scripts. +<xsl:value-of select="normalize-space(longdesc)"/> +.SH PARAMETERS +<xsl:apply-templates select="parameters"><xsl:with-param name="show">getopt</xsl:with-param></xsl:apply-templates> +.SH ACTIONS +<xsl:apply-templates select="actions"/> +.SH STDIN PARAMETERS +<xsl:apply-templates select="parameters"><xsl:with-param name="show">stdin</xsl:with-param></xsl:apply-templates> +</xsl:template> +</xsl:stylesheet> diff --git a/fence/agents/lpar/Makefile b/fence/agents/lpar/Makefile index ef7d91a..fed1b2b 100644 --- a/fence/agents/lpar/Makefile +++ b/fence/agents/lpar/Makefile @@ -2,4 +2,6 @@ include ../../../make/defines.mk TARGET= fence_lpar +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/mcdata/Makefile b/fence/agents/mcdata/Makefile index ca2facf..437ae80 100644 --- a/fence/agents/mcdata/Makefile +++ b/fence/agents/mcdata/Makefile @@ -1,4 +1,5 @@ +include ../../../make/defines.mk + TARGET= fence_mcdata -include ../../../make/defines.mk include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/rsa/Makefile b/fence/agents/rsa/Makefile index e85ed97..b385197 100644 --- a/fence/agents/rsa/Makefile +++ b/fence/agents/rsa/Makefile @@ -1,4 +1,7 @@ +include ../../../make/defines.mk + TARGET= fence_rsa -include ../../../make/defines.mk +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/rsb/Makefile b/fence/agents/rsb/Makefile index 0f77de2..4022513 100644 --- a/fence/agents/rsb/Makefile +++ b/fence/agents/rsb/Makefile @@ -1,4 +1,5 @@ +include ../../../make/defines.mk + TARGET= fence_rsb -include ../../../make/defines.mk include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/sanbox2/Makefile b/fence/agents/sanbox2/Makefile index 7f3fc0c..bf46fd1 100644 --- a/fence/agents/sanbox2/Makefile +++ b/fence/agents/sanbox2/Makefile @@ -1,4 +1,5 @@ +include ../../../make/defines.mk + TARGET= fence_sanbox2 -include ../../../make/defines.mk include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/virsh/Makefile b/fence/agents/virsh/Makefile index bbea7b6..190d080 100644 --- a/fence/agents/virsh/Makefile +++ b/fence/agents/virsh/Makefile @@ -2,4 +2,6 @@ include ../../../make/defines.mk TARGET= fence_virsh +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/vixel/Makefile b/fence/agents/vixel/Makefile index 6760e14..386cb86 100644 --- a/fence/agents/vixel/Makefile +++ b/fence/agents/vixel/Makefile @@ -1,4 +1,5 @@ +include ../../../make/defines.mk + TARGET= fence_vixel -include ../../../make/defines.mk include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/vmware/Makefile b/fence/agents/vmware/Makefile index 6d812a5..0ec0b3d 100644 --- a/fence/agents/vmware/Makefile +++ b/fence/agents/vmware/Makefile @@ -2,4 +2,6 @@ include ../../../make/defines.mk TARGET= fence_vmware_helper fence_vmware +MANTARGET= fence_vmware.8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/wti/Makefile b/fence/agents/wti/Makefile index 2638d3f..5240559 100644 --- a/fence/agents/wti/Makefile +++ b/fence/agents/wti/Makefile @@ -2,4 +2,6 @@ include ../../../make/defines.mk TARGET= fence_wti +MANTARGET= $(TARGET).8 + include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/xcat/Makefile b/fence/agents/xcat/Makefile index 0c1fed0..13a954c 100644 --- a/fence/agents/xcat/Makefile +++ b/fence/agents/xcat/Makefile @@ -1,4 +1,5 @@ +include ../../../make/defines.mk + TARGET= fence_xcat -include ../../../make/defines.mk include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/agents/xvm/Makefile b/fence/agents/xvm/Makefile index 627e4dc..6215263 100644 --- a/fence/agents/xvm/Makefile +++ b/fence/agents/xvm/Makefile @@ -4,7 +4,9 @@ TARGET3= testprog SBINDIRT=$(TARGET1) $(TARGET2) -all: ${TARGET1} ${TARGET2} +MANTARGET= fence_xvm.8 + +all: ${TARGET1} ${TARGET2} ${MANTARGET} include ../../../make/defines.mk include $(OBJDIR)/make/cobj.mk @@ -57,7 +59,13 @@ ${TARGET2}: ${SHAREDOBJS} ${OBJS2} ${TARGET3}: ${OBJS3} $(CC) -o $@ $^ $(XML_LDFLAGS) +$(MANTARGET): $(TARGET1) ${SRCDIR}/fence/agents/lib/fence2man.xsl + set -e && \ + ./$(TARGET1) -o metadata > .$@.tmp && \ + xsltproc ${SRCDIR}/fence/agents/lib/fence2man.xsl .$@.tmp > $@ + clean: generalclean + rm -f $(MANTARGET) .$(MANTARGET).tmp -include $(OBJS1:.o=.d) -include $(OBJS2:.o=.d) diff --git a/fence/agents/zvm/Makefile b/fence/agents/zvm/Makefile index 7f32889..81f8889 100644 --- a/fence/agents/zvm/Makefile +++ b/fence/agents/zvm/Makefile @@ -1,4 +1,5 @@ +include ../../../make/defines.mk + TARGET= fence_zvm -include ../../../make/defines.mk include $(OBJDIR)/make/fencebuild.mk diff --git a/fence/man/Makefile b/fence/man/Makefile index 226e826..50b7bb4 100644 --- a/fence/man/Makefile +++ b/fence/man/Makefile @@ -1,9 +1,9 @@ include ../../make/defines.mk -TARGET = fence.8 fenced.8 fence_node.8 fence_tool.8 +MANTARGET = fence.8 fenced.8 fence_node.8 fence_tool.8 ifdef fence_agents -TARGET += \ +MANTARGET += \ fence_ack_manual.8 \ fence_alom.8 \ fence_apc.8 \ @@ -40,4 +40,9 @@ TARGET += \ fence_zvm.8 endif -include $(OBJDIR)/make/man.mk +include $(OBJDIR)/make/install.mk +include $(OBJDIR)/make/uninstall.mk + +all: + +clean: diff --git a/gfs/man/Makefile b/gfs/man/Makefile index 7688580..9047b36 100644 --- a/gfs/man/Makefile +++ b/gfs/man/Makefile @@ -1,4 +1,5 @@ -TARGET= gfs.8 \ +MANTARGET= \ + gfs.8 \ mount.gfs.8 \ gfs_edit.8 \ fsck.gfs.8 \ @@ -9,4 +10,9 @@ TARGET= gfs.8 \ gfs_tool.8 include ../../make/defines.mk -include $(OBJDIR)/make/man.mk +include $(OBJDIR)/make/install.mk +include $(OBJDIR)/make/uninstall.mk + +all: + +clean: diff --git a/gfs2/man/Makefile b/gfs2/man/Makefile index 2b81b70..8e8e4f1 100644 --- a/gfs2/man/Makefile +++ b/gfs2/man/Makefile @@ -1,4 +1,5 @@ -TARGET= gfs2.8 \ +MANTARGET= \ + gfs2.8 \ gfs2_convert.8 \ gfs2_edit.8 \ fsck.gfs2.8 \ @@ -10,4 +11,9 @@ TARGET= gfs2.8 \ mkfs.gfs2.8 include ../../make/defines.mk -include $(OBJDIR)/make/man.mk +include $(OBJDIR)/make/install.mk +include $(OBJDIR)/make/uninstall.mk + +all: + +clean: diff --git a/group/man/Makefile b/group/man/Makefile index 36f8b87..a317fba 100644 --- a/group/man/Makefile +++ b/group/man/Makefile @@ -1,7 +1,13 @@ -TARGET= dlm_controld.8 \ +MANTARGET= \ + dlm_controld.8 \ gfs_controld.8 \ group_tool.8 \ groupd.8 include ../../make/defines.mk -include $(OBJDIR)/make/man.mk +include $(OBJDIR)/make/install.mk +include $(OBJDIR)/make/uninstall.mk + +all: + +clean: diff --git a/make/fencebuild.mk b/make/fencebuild.mk index 48145b7..5f9915a 100644 --- a/make/fencebuild.mk +++ b/make/fencebuild.mk @@ -4,7 +4,7 @@ ifndef FENCEAGENTSLIB endif endif -all: $(TARGET) +all: $(TARGET) $(MANTARGET) include $(OBJDIR)/make/clean.mk include $(OBJDIR)/make/install.mk @@ -22,4 +22,11 @@ $(TARGET): -e 's#@SBINDIR@#${sbindir}#g' \ > $@ +$(MANTARGET): $(MANTARGET:.8=) ${SRCDIR}/fence/agents/lib/fence2man.xsl + set -e && \ + PYTHONPATH=${OBJDIR}/fence/agents/lib \ + python $^ -o metadata > .$@.tmp && \ + xsltproc ${SRCDIR}/fence/agents/lib/fence2man.xsl .$@.tmp > $@ + clean: generalclean + rm -f $(MANTARGET) .$(MANTARGET).tmp diff --git a/make/install.mk b/make/install.mk index 5bd30d6..8e1bcd6 100644 --- a/make/install.mk +++ b/make/install.mk @@ -82,3 +82,11 @@ ifdef SHAREDIRT install -d ${sharedir} install -m644 ${SHAREDIRT} ${sharedir} endif +ifdef MANTARGET + set -e; \ + for i in ${MANTARGET}; do \ + p=`echo $$i | sed -e 's#.*\.##g'`; \ + install -d ${mandir}/man$$p; \ + install -m644 $(S)/$$i ${mandir}/man$$p; \ + done +endif diff --git a/make/man.mk b/make/man.mk deleted file mode 100644 index 26f6401..0000000 --- a/make/man.mk +++ /dev/null @@ -1,18 +0,0 @@ -all: - -install: - set -e; \ - for i in ${TARGET}; do \ - p=`echo $$i | sed -e 's#.*\.##g'`; \ - install -d ${mandir}/man$$p; \ - install -m644 $(S)/$$i ${mandir}/man$$p; \ - done - -uninstall: - set -e; \ - for i in ${TARGET}; do \ - p=`echo $$i | sed -e 's#.*\.##g'`; \ - ${UNINSTALL} $$i ${mandir}/man$$p; \ - done - -clean: diff --git a/make/uninstall.mk b/make/uninstall.mk index 396e61f..786faca 100644 --- a/make/uninstall.mk +++ b/make/uninstall.mk @@ -50,3 +50,10 @@ endif ifdef SHAREDIRT ${UNINSTALL} ${SHAREDIRT} ${sharedir} endif +ifdef MANTARGET + set -e; \ + for i in ${MANTARGET}; do \ + p=`echo $$i | sed -e 's#.*\.##g'`; \ + ${UNINSTALL} $$i ${mandir}/man$$p; \ + done +endif diff --git a/rgmanager/man/Makefile b/rgmanager/man/Makefile index d965432..791c8a7 100644 --- a/rgmanager/man/Makefile +++ b/rgmanager/man/Makefile @@ -1,4 +1,5 @@ -TARGET= clubufflush.8 \ +MANTARGET= \ + clubufflush.8 \ clufindhostname.8 \ clulog.8 \ clurgmgrd.8 \ @@ -7,6 +8,11 @@ TARGET= clubufflush.8 \ clusvcadm.8 include ../../make/defines.mk -include $(OBJDIR)/make/man.mk +include $(OBJDIR)/make/install.mk +include $(OBJDIR)/make/uninstall.mk + +all: + +clean: check:

1 0

cluster: RHEL54 - CMAN: scsi_reserve init script correctly handles multipath devices
by rohara 19 Oct '09

19 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e7… Commit: e790e4b988f7f12a327a020244c40b5bf1969f6d Parent: 5f64f4eba4ee0bc415b7a98a4efd16c6e788d16b Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Fri Oct 9 16:35:19 2009 -0500 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Mon Oct 19 16:32:10 2009 -0500 CMAN: scsi_reserve init script correctly handles multipath devices This patch fixes scsi_reserve init script such that it identifies device-mapper-multipath devices, and if present, creates registrations on all underlying paths. rhbz#529712 --- fence/agents/scsi/scsi_reserve | 254 ++++++++++++++++++++++------------------ 1 files changed, 140 insertions(+), 114 deletions(-) diff --git a/fence/agents/scsi/scsi_reserve b/fence/agents/scsi/scsi_reserve index 34f25e5..3662b02 100755 --- a/fence/agents/scsi/scsi_reserve +++ b/fence/agents/scsi/scsi_reserve @@ -22,7 +22,7 @@ if ! fence_scsi_test -t fence ; then exit 1 fi -# check for nodeids in config file +# check for nodeid in config file # if ! fence_scsi_test -t nodes ; then logger -t scsi_reserve \ @@ -48,16 +48,49 @@ fi # get physical volumes (devices) that are part of cluster volumes # -scsi_devices=$( vgs --config 'global { locking_type = 0 }' \ - --noheadings -o vg_attr,pv_name 2> /dev/null \ - | awk ' $1 ~ /.*c$/ { print $2 } ' ) +pv_devices=$( vgs --noheadings --options vg_attr,pv_name \ + --config 'devices { preferred_names = [ "^/dev/dm" ] } + global { locking_type = 0 }' 2> /dev/null \ + | awk ' $1 ~ /.*c$/ { print $2 } ' ) -if [ -z "$scsi_devices" ] ; then +if [ -z "$pv_devices" ] ; then logger -t scsi_reserve \ "[error] did not find devices in cluster volumes" exit 1 fi +for pv_dev in $pv_devices +do + if [[ $pv_dev =~ "/dev/dm-[0-9]*" ]]; + then + # get major and minor numbers for device-mapper device + # + major=$( cat /sys/block/${pv_dev:5}/dev | awk -F':' '{ print $1 }' ) + minor=$( cat /sys/block/${pv_dev:5}/dev | awk -F':' '{ print $2 }' ) + + # get uuid for device-mapper device + # + dm_uuid=$( dmsetup info -c --noheadings -o uuid -j $major -m $minor ) + + # check if device-mapper device is multipath + # + if [[ $dm_uuid =~ "^mpath-*" ]]; then + dm_devices="$dm_devices $( ls /sys/block/${pv_dev:5}/slaves/ )" + else + logger -t scsi_reserve \ + "[error] $dev is not a multipath device" + exit 1 + fi + else + sg_devices="$sg_devices $pv_dev" + fi +done + +for dm_dev in $dm_devices +do + sg_devices="$sg_devices /dev/$dm_dev" +done + # get the cluster id from cman # cluster_id=$( cman_tool status | grep -i "Cluster ID" \ @@ -101,44 +134,42 @@ case $1 in echo -n "Starting scsi_reserve:" - for dev in $scsi_devices + for dev in $sg_devices do - # check if our key is already resgistered with this device - # - if sg_persist -n -d $dev -i -k | grep -qiE "^[[:space:]]*0x$key" ; then - logger -t scsi_reserve \ - "[info] already registered with $dev (key=0x$key)" - continue - fi - - # create the scsi registration - # - if ! sg_persist -n -d $dev -o -I -S $key &> /dev/null ; then - logger -t scsi_reserve \ - "[error] unable to register device $dev (key=0x$key)" - : $[ count = $count + 1 ] - error=1 - else - logger -t scsi_reserve \ - "[info] registered with device $dev (key=0x$key)" - fi - - # check to see if reservation already exists - # - if sg_persist -n -d $dev -i -r | grep -qiE "^[[:space:]]*Key=0x" ; then - logger -t scsi_reserve \ - "[info] reservation already exists on $dev" - continue - fi - - # create the scsi reservation - # - if ! sg_persist -n -d $dev -o -R -K $key -T 5 &> /dev/null ; then - logger -t scsi_reserver \ - "[error] unable to create reservation on $dev (key=0x$key)" - : $[ count = $count + 1 ] - error=1 - fi + # create the scsi registration + # + if ! sg_persist -n -d $dev -o -I -S $key &> /dev/null ; then + logger -t scsi_reserve \ + "[error] unable to register device $dev (key=0x$key)" + : $[ count = $count + 1 ] + error=1 + else + logger -t scsi_reserve \ + "[info] registered with device $dev (key=0x$key)" + fi + done + + for dev in $pv_devices + do + # check to see if reservation already exists + # + if sg_persist -n -d $dev -i -r | grep -qiE "^[[:space:]]*Key=0x" ; then + logger -t scsi_reserve \ + "[info] reservation already exists on $dev" + continue + fi + + # create the scsi reservation + # + if ! sg_persist -n -d $dev -o -R -K $key -T 5 &> /dev/null ; then + logger -t scsi_reserve \ + "[error] unable to create reservation on $dev (key=0x$key)" + : $[ count = $count + 1 ] + error=1 + else + logger -t scsi_reserve \ + "[info] reservation created on $dev (key=0x$key)" + fi done # leave fence domain if any errors occured during registration @@ -150,7 +181,7 @@ case $1 in "[info] $count errors during registration" logger -t scsi_reserve \ "[info] leaving the fence domain" - fence_tool leave + # fence_tool leave failure fi @@ -165,44 +196,31 @@ case $1 in echo -n "Stopping scsi_reserve:" - for dev in $scsi_devices + for dev in $sg_devices do - # get list of keys registered with this device - # - key_list=$( sg_persist -n -d $dev -i -k | grep -iE "^[[:space:]]*0x" ) - - # check that our key is registered with this device - # - if ! sg_persist -d $dev -i -k | grep -qiE "^[[:space:]]*0x$key" ; then - logger -t scsi_reserve \ - "[info] not registered with $dev (key=0x$key)" - continue - fi - - # check if our key is the reservation holder - # - if sg_persist -n -d $dev -i -r 2>/dev/null | grep -qiE "$key" ; then - if echo "$key_list" | grep -qivE "$key" ; then - logger -t scsi_reserve \ - "[error] unable to remove registration on $dev (key=0x$key)" - : $[ count = $count + 1 ] - error=1 - continue - fi - fi - - # remove registration for this device - # - if ! sg_persist -n -d $dev -o -G -K $key -S 0 &> /dev/null ; then - logger -t scsi_reserve \ - "[error] failed to remove registration on $dev (key=0x$key)" - : $[ count = $count + 1 ] - error=1 - else - logger -t scsi_reserve \ - "[info] removed registration on $dev (key=0x$key)" - fi - + # check if our key is the reservation holder + # + if sg_persist -n -d $dev -i -r 2>/dev/null | grep -qiE "$key" ; then + logger -t scsi_reserve \ + "[info] unable to remove registration on $dev (key=0x$key)" + continue + else + # check if our key is registered with the device + # + if ! sg_persist -n -d $dev -i -k 2>/dev/null | grep -qiE "$key" ; then + continue + else + if ! sg_persist -n -d $dev -o -G -K $key -S 0 &> /dev/null ; then + logger -t scsi_reserve \ + "[error] failed to remove registration on $dev (key=0x$key)" + : $[ count = $count + 1 ] + error=1 + else + logger -t scsi_reserve \ + "[info] removed registration on $dev (key=0x$key)" + fi + fi + fi done # report success or failure @@ -222,39 +240,46 @@ case $1 in restart) error=0 + count=0 echo -n "Retarting scsi_reserve:" - for dev in $scsi_devices + for dev in $sg_devices do - # recreate the scsi registration - # - if ! sg_persist -n -d $dev -o -I -S $key &> /dev/null ; then - logger -t scsi_reserve \ - "[error] unable to register device $dev (key=0x$key)" - : $[ count = $count + 1 ] - error=1 - else - logger -t scsi_reserve \ - "[info] registered with device $dev (key=0x$key)" - fi - - # check to see if reservation already exists - # - if sg_persist -n -d $dev -i -r | grep -qiE "^[[:space:]]*Key=0x" ; then - logger -t scsi_reserve \ - "[info] reservation already exists on $dev" - continue - fi - - # recreate the scsi reservation - # - if ! sg_persist -n -d $dev -o -R -K $key -T 5 &> /dev/null ; then - logger -t scsi_reserver \ - "[error] unable to create reservation on $dev (key=0x$key)" - : $[ count = $count + 1 ] - error=1 - fi + # create the scsi registration + # + if ! sg_persist -n -d $dev -o -I -S $key &> /dev/null ; then + logger -t scsi_reserve \ + "[error] unable to register device $dev (key=0x$key)" + : $[ count = $count + 1 ] + error=1 + else + logger -t scsi_reserve \ + "[info] registered with device $dev (key=0x$key)" + fi + done + + for dev in $pv_devices + do + # check to see if reservation already exists + # + if sg_persist -n -d $dev -i -r | grep -qiE "^[[:space:]]*Key=0x" ; then + logger -t scsi_reserve \ + "[info] reservation already exists on $dev" + continue + fi + + # create the scsi reservation + # + if ! sg_persist -n -d $dev -o -R -K $key -T 5 &> /dev/null ; then + logger -t scsi_reserve \ + "[error] unable to create reservation on $dev (key=0x$key)" + : $[ count = $count + 1 ] + error=1 + else + logger -t scsi_reserve \ + "[info] reservation created on $dev (key=0x$key)" + fi done # leave fence domain if any errors occured during registration @@ -266,7 +291,7 @@ case $1 in "[info] $count errors during registration" logger -t scsi_reserve \ "[info] leaving the fence domain" - fence_tool leave + # fence_tool leave failure fi @@ -277,12 +302,13 @@ case $1 in status) error=0 + count=0 - for dev in $scsi_devices + for dev in $pv_devices do - if sg_persist -n -d $dev -i -k | grep -qiE "$key" ; then - devices[${#devices[@]}]=$dev - fi + if sg_persist -n -d $dev -i -k | grep -qiE "$key" ; then + devices[${#devices[@]}]=$dev + fi done if [ -z "$devices" ] ; then

1 0

cluster: STABLE3 - rgmanager: Remove async migration semantics
by Lon Hohberger 19 Oct '09

19 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=40… Commit: 400cda7587885f24f997f3e5754acc0d901f95f1 Parent: 0bb947f3c9447879551eea0a79e61e026abc5972 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Mon Oct 19 13:18:54 2009 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Mon Oct 19 13:18:54 2009 -0400 rgmanager: Remove async migration semantics Migration is a synchronous operation on both Xen and KVM; we can rely on the return code. Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/rg_state.c | 65 ++++++++++--------------------------- 1 files changed, 18 insertions(+), 47 deletions(-) diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index d137f45..ab18202 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -803,7 +803,8 @@ svc_start(const char *svcName, int req) /** - * Migrate a service to another node. + * Migrate a service to another node. Relies on agent + * operating synchronously */ int svc_migrate(const char *svcName, int target) @@ -875,21 +876,8 @@ svc_migrate(const char *svcName, int target) rg_unlock(&lockp); return RG_EFROZEN; } - - /* LOCK HELD */ - svcStatus.rs_owner = target; - svcStatus.rs_last_owner = my_id(); - svcStatus.rs_state = RG_STATE_MIGRATE; - svcStatus.rs_transition = (uint64_t)time(NULL); - - if (set_rg_state(svcName, &svcStatus) != 0) { - logt_print(LOG_ERR, - "#75: Failed changing service status\n"); - rg_unlock(&lockp); - return RG_EFAIL; - } rg_unlock(&lockp); - + ret = group_migrate(svcName, target); switch(ret) { @@ -902,51 +890,34 @@ svc_migrate(const char *svcName, int target) the target node simply died; in this case, set status back to started */ return RG_EFAIL; - break; case OCF_RA_NOT_RUNNING: /* For these two, the VM was either not running or migration is simply impossible. */ /* Don't mark the service as failed; since it's either recoverable or still running. */ - ret = RG_EFAIL; - break; + return RG_EFAIL; case OCF_RA_NOT_CONFIGURED: - ret = RG_EINVAL; - break; + return RG_EINVAL; case 0: - return 0; - } - - /* Ok, we've hit a recoverable condition. Since VMs and migratory - services are ... well, migratable, we can just flip the state - back to 'started' and error checking will fix it later. */ - if (rg_lock(svcName, &lockp) < 0) { - logt_print(LOG_ERR, "#45: Unable to obtain cluster lock: %s\n", - strerror(errno)); - return ret; - } - - if (get_rg_state(svcName, &svcStatus) != 0) { - rg_unlock(&lockp); - logt_print(LOG_ERR, "#46: Failed getting status for RG %s\n", - svcName); - return ret; + break; } - if (svcStatus.rs_last_owner != (uint32_t)my_id() || - svcStatus.rs_owner != (uint32_t)target || - svcStatus.rs_state != RG_STATE_MIGRATE) { - rg_unlock(&lockp); - return ret; + /* Success - flip owner in state info */ + if (rg_lock(svcName, &lockp) < 0) { + logt_print(LOG_ERR, "#45b: Unable to obtain cluster lock: %s\n", + strerror(errno)); + return RG_EFAIL; } - - svcStatus.rs_owner = my_id(); + + /* No need for a 'get' here since the service is still STARTED */ + svcStatus.rs_last_owner = svcStatus.rs_owner; + svcStatus.rs_owner = target; svcStatus.rs_state = RG_STATE_STARTED; - + set_rg_state(svcName, &svcStatus); rg_unlock(&lockp); - - return ret; + + return 0; }

1 0

cluster: STABLE3 - fencing: New option '--missing-as-off' to return OFF is machine is missing
by Marek Grác 19 Oct '09

19 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0b… Commit: 0bb947f3c9447879551eea0a79e61e026abc5972 Parent: a7ef8c12f7b09769f03294b1f6d0df02aba96735 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 19 15:28:23 2009 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 19 15:28:23 2009 +0200 fencing: New option '--missing-as-off' to return OFF is machine is missing If a blade is not present (i.e. removed for maintenance), the fence_bladecenter cannot check the state as it is reported empty. Resolves: bz#248006 --- fence/agents/bladecenter/fence_bladecenter.py | 7 +++++-- fence/agents/lib/fencing.py.py | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index 0e4ea84..414c260 100644 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -30,7 +30,10 @@ def get_power_status(conn, options): i = conn.log_expect(options, [ node_cmd, "system>" ] , int(options["-Y"])) if i == 1: ## Given blade number does not exist - fail(EC_STATUS) + if options.has_key("-M"): + return "off" + else: + fail(EC_STATUS) conn.send("power -state\r\n") conn.log_expect(options, node_cmd, int(options["-Y"])) status = conn.before.splitlines()[-1] @@ -92,7 +95,7 @@ def main(): "action", "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", "secure", "port", "identity_file", "separator", "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "power_timeout", "shell_timeout", "login_timeout", "power_wait", "missing_as_off" ] atexit.register(atexit_handler) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 627e988..566cebf 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -342,7 +342,12 @@ all_opt = { "longopt" : "power-wait", "help" : "--power-wait <seconds> Wait X seconds after issuing ON/OFF", "default" : "0", - "order" : 200 } + "order" : 200 }, + "missing_as_off" : { + "getopt" : "M", + "longopt" : "missing-as-off", + "help" : "--missing-as-off Missing port returns OFF instead of failure", + "order" : 200} } class fspawn(pexpect.spawn):

1 0

fence-agents: master - fence_sanbox2: Update build system
by Marek Grác 19 Oct '09

19 Oct '09

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: cd8c9ee12db21f53586c60c58f35745b19f9d71c Parent: 19c01e65ffe8f0f190682c10347a62d4906f70b6 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 19 15:20:33 2009 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 19 15:20:33 2009 +0200 fence_sanbox2: Update build system Change from perl to python code needs change in Makefile. --- fence/agents/sanbox2/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fence/agents/sanbox2/Makefile.am b/fence/agents/sanbox2/Makefile.am index b0d1b7b..540511c 100644 --- a/fence/agents/sanbox2/Makefile.am +++ b/fence/agents/sanbox2/Makefile.am @@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_sanbox2 -EXTRA_DIST = $(TARGET).pl +EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET)

1 0

cluster: STABLE3 - fencing: Correct exit codes for status operation
by Marek Grác 19 Oct '09

19 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a7… Commit: a7ef8c12f7b09769f03294b1f6d0df02aba96735 Parent: a047a6ead0e095d96925997f92d3d224f00e9da8 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 19 15:05:13 2009 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 19 15:05:13 2009 +0200 fencing: Correct exit codes for status operation According to standard operation status should return 0 (if ON) and 2 (if OFF). In all other cases if operation was succesfull then agent return 0. --- fence/agents/alom/fence_alom.py | 4 ++- fence/agents/apc/fence_apc.py | 4 ++- fence/agents/apc_snmp/fence_apc_snmp.py | 3 +- fence/agents/baytech/fence_baytech.pl | 8 +++++- fence/agents/bladecenter/fence_bladecenter.py | 4 ++- fence/agents/bullpap/fence_bullpap.pl | 6 ++++- fence/agents/cisco_mds/fence_cisco_mds.py | 4 ++- fence/agents/drac/fence_drac.pl | 17 +++++++++---- fence/agents/drac5/fence_drac5.py | 4 ++- fence/agents/eps/fence_eps.py | 4 ++- fence/agents/ibmblade/fence_ibmblade.py | 3 +- fence/agents/ifmib/fence_ifmib.py | 4 ++- fence/agents/ilo/fence_ilo.py | 4 ++- fence/agents/ilo_mp/fence_ilo_mp.py | 4 ++- fence/agents/intelmodular/fence_intelmodular.py | 4 ++- fence/agents/ipmilan/ipmilan.c | 28 ++++++++++++++++++++-- fence/agents/ldom/fence_ldom.py | 6 +++- fence/agents/lib/fencing.py.py | 12 +++++++-- fence/agents/lpar/fence_lpar.py | 3 +- fence/agents/rsa/fence_rsa.py | 6 +++- fence/agents/rsb/fence_rsb.py | 8 ++++++ fence/agents/sanbox2/fence_sanbox2.py | 4 ++- fence/agents/virsh/fence_virsh.py | 3 +- fence/agents/vmware/fence_vmware.py | 4 ++- fence/agents/wti/fence_wti.py | 4 ++- 25 files changed, 121 insertions(+), 34 deletions(-) diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py index 4fffa0a..8793e92 100644 --- a/fence/agents/alom/fence_alom.py +++ b/fence/agents/alom/fence_alom.py @@ -64,7 +64,7 @@ def main(): # Operate the fencing device conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status,None) + result = fence_action(conn, options, set_power_status, get_power_status,None) # Logout from system try: @@ -75,5 +75,7 @@ def main(): except pexpect.ExceptionPexpect: pass + sys.exit(result) + if __name__ == "__main__": main() diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index 685a154..92b109c 100755 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -212,7 +212,7 @@ def main(): ## Operate the fencing device #### conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status, get_power_status) + result = fence_action(conn, options, set_power_status, get_power_status, get_power_status) ## ## Logout from system @@ -228,6 +228,8 @@ def main(): pass except pexpect.ExceptionPexpect: pass + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py index 7e8118e..0c36b66 100644 --- a/fence/agents/apc_snmp/fence_apc_snmp.py +++ b/fence/agents/apc_snmp/fence_apc_snmp.py @@ -192,7 +192,8 @@ def main(): show_docs(options) # Operate the fencing device - fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) + 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/baytech/fence_baytech.pl b/fence/agents/baytech/fence_baytech.pl index 7325ee6..b625968 100644 --- a/fence/agents/baytech/fence_baytech.pl +++ b/fence/agents/baytech/fence_baytech.pl @@ -570,7 +570,13 @@ elsif ($action =~ /status/i) { print "Outlet '$bt_name' is $bt_state and is ". (($bt_locked eq "")?"not ":"")."Locked\n"; - $exit=0; + + if ($bt_state =~ /on/i) + { + $exit=0; + } else { + $exit=2; + } } elsif ($bt_locked ne "") { diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index 87819e4..0e4ea84 100644 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -107,7 +107,7 @@ def main(): ## Operate the fencing device ###### conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status, get_blades_list) + result = fence_action(conn, options, set_power_status, get_power_status, get_blades_list) ## ## Logout from system @@ -119,6 +119,8 @@ def main(): pass except pexpect.ExceptionPexpect: pass + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/bullpap/fence_bullpap.pl b/fence/agents/bullpap/fence_bullpap.pl index 11382dc..6915f57 100644 --- a/fence/agents/bullpap/fence_bullpap.pl +++ b/fence/agents/bullpap/fence_bullpap.pl @@ -297,6 +297,7 @@ elsif (/^status$/i) { $action = "status"; } # $success=0; $_ = $action; +my $exit_code=0; if (/(on|off)/) { my $timeout = 120; # 120 = max of (60, 120). Max timeout for "on" @@ -341,6 +342,9 @@ elsif (/status/) get_power_state $host,$domain,$login,$passwd; $state=$_; $success = 1 if defined $state; + if ($state eq "OFF") { + $exit_code = 2; + } } else { @@ -351,7 +355,7 @@ if ($success) { print "success: domain $domain $action". ((defined $state) ? ": $state":"") ."\n" unless defined $quiet; - exit 0; + exit $exit_code; } else { diff --git a/fence/agents/cisco_mds/fence_cisco_mds.py b/fence/agents/cisco_mds/fence_cisco_mds.py index d007b72..bd8d858 100644 --- a/fence/agents/cisco_mds/fence_cisco_mds.py +++ b/fence/agents/cisco_mds/fence_cisco_mds.py @@ -113,7 +113,9 @@ def main(): port_oid=cisco_port2oid(options["-n"]) # Operate the fencing device - fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) + 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/drac/fence_drac.pl b/fence/agents/drac/fence_drac.pl index 78c4735..5cc1a52 100644 --- a/fence/agents/drac/fence_drac.pl +++ b/fence/agents/drac/fence_drac.pl @@ -445,7 +445,7 @@ sub do_action if ($status =~ /^on$/i) { msg "success: already on"; - return; + return 0; } set_power_status on; @@ -458,7 +458,7 @@ sub do_action if ($status =~ /^off$/i) { msg "success: already off"; - return; + return 0; } set_power_status off; @@ -482,12 +482,19 @@ sub do_action elsif ($action =~ /^status$/i) { msg "status: $status"; - return; + if ($status =~ /on/i) + { + return 0; + } else { + return 2; + } } else { fail "failed: unrecognised action: '$action'"; } + + return 0; } # @@ -651,10 +658,10 @@ elsif ($drac_version eq $DRAC_VERSION_MC) unless defined $modulename; } -do_action; +my $res = do_action; logout; -exit 0; +exit $res; diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py index d7fbdaa..ab5056b 100755 --- a/fence/agents/drac5/fence_drac5.py +++ b/fence/agents/drac5/fence_drac5.py @@ -115,7 +115,7 @@ def main(): ## Assume this is DRAC 5 by default as we don't want to break anything options["model"]="DRAC 5" - fence_action(conn, options, set_power_status, get_power_status, get_list_devices) + result = fence_action(conn, options, set_power_status, get_power_status, get_list_devices) ## ## Logout from system @@ -127,6 +127,8 @@ def main(): pass except pexpect.ExceptionPexpect: pass + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/eps/fence_eps.py b/fence/agents/eps/fence_eps.py index 604a481..d9118a7 100644 --- a/fence/agents/eps/fence_eps.py +++ b/fence/agents/eps/fence_eps.py @@ -110,7 +110,9 @@ def main(): show_docs(options) #Run fence action. Conn is None, beacause we always need open new http connection - fence_action(None, options, set_power_status, get_power_status,get_power_status) + result = fence_action(None, options, set_power_status, get_power_status,get_power_status) + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/ibmblade/fence_ibmblade.py b/fence/agents/ibmblade/fence_ibmblade.py index 4ff334e..4548a29 100644 --- a/fence/agents/ibmblade/fence_ibmblade.py +++ b/fence/agents/ibmblade/fence_ibmblade.py @@ -74,7 +74,8 @@ def main(): show_docs(options) # Operate the fencing device - fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) + 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/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py index 7645afa..159554e 100644 --- a/fence/agents/ifmib/fence_ifmib.py +++ b/fence/agents/ifmib/fence_ifmib.py @@ -131,7 +131,9 @@ def main(): show_docs(options) # Operate the fencing device - fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) + 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/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py index 574f944..0ff40d7 100755 --- a/fence/agents/ilo/fence_ilo.py +++ b/fence/agents/ilo/fence_ilo.py @@ -105,7 +105,9 @@ def main(): ## ## Fence operations #### - fence_action(conn, options, set_power_status, get_power_status, None) + result = fence_action(conn, options, set_power_status, get_power_status, None) + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/ilo_mp/fence_ilo_mp.py b/fence/agents/ilo_mp/fence_ilo_mp.py index a676fb8..dc9a878 100644 --- a/fence/agents/ilo_mp/fence_ilo_mp.py +++ b/fence/agents/ilo_mp/fence_ilo_mp.py @@ -49,7 +49,7 @@ def main(): ## ## Fence operations #### - fence_action(conn, options, set_power_status, get_power_status) + result = fence_action(conn, options, set_power_status, get_power_status) try: conn.send("exit\n") @@ -57,6 +57,8 @@ def main(): pass except pexpect.ExceptionPexpect: pass + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/intelmodular/fence_intelmodular.py b/fence/agents/intelmodular/fence_intelmodular.py index a03e4a6..c943c1e 100644 --- a/fence/agents/intelmodular/fence_intelmodular.py +++ b/fence/agents/intelmodular/fence_intelmodular.py @@ -80,7 +80,9 @@ def main(): show_docs(options) # Operate the fencing device - fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) + 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/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c index 51dd94c..f6ed895 100644 --- a/fence/agents/ipmilan/ipmilan.c +++ b/fence/agents/ipmilan/ipmilan.c @@ -31,6 +31,19 @@ #define DEFAULT_METHOD "onoff" +/* We should follow FenceAgentsAPI standard*/ +#define ERR_OFF_SUCCESSFUL 0 +#define ERR_OFF_FAIL 1 + +#define ERR_ON_SUCCESSFUL 0 +#define ERR_ON_FAIL 1 + +#define ERR_STATUS_ON 0 +#define ERR_STATUS_FAIL 1 +#define ERR_STATUS_OFF 2 + +#define ERR_OK 0 + #define log(lvl, fmt, args...) fprintf(stderr, fmt, ##args) #include <libgen.h> #include "copyright.cf" @@ -841,6 +854,7 @@ main(int argc, char **argv) int timeout=DEFAULT_TIMEOUT; int cipher=-1; int print_final_status=1; + int translated_ret = -1; memset(ip, 0, sizeof(ip)); memset(authtype, 0, sizeof(authtype)); @@ -1010,19 +1024,22 @@ main(int argc, char **argv) } else { /* Original onoff method */ ret = ipmi_off(i); - if (ret != 0) + translated_ret = (ret==0?ERR_OFF_SUCCESSFUL:ERR_OFF_FAIL); + if (ret != 0) { goto out; + } ret = ipmi_on(i); } } else if (!strcasecmp(op, "on")) { printf("Powering on machine @ IPMI:%s...", ip); fflush(stdout); ret = ipmi_on(i); - + translated_ret = (ret==0?ERR_ON_SUCCESSFUL:ERR_ON_FAIL); } else if (!strcasecmp(op, "off")) { printf("Powering off machine @ IPMI:%s...", ip); fflush(stdout); ret = ipmi_off(i); + translated_ret = (ret==0?ERR_ON_SUCCESSFUL:ERR_ON_FAIL); } else if (!strcasecmp(op, "status") || !strcasecmp(op, "monitor")) { printf("Getting status of IPMI:%s...",ip); fflush(stdout); @@ -1031,26 +1048,31 @@ main(int argc, char **argv) case STATE_ON: if (!strcasecmp(op, "status")) printf("Chassis power = On\n"); + translated_ret = ERR_STATUS_ON; ret = 0; break; case STATE_OFF: if (!strcasecmp(op, "status")) printf("Chassis power = Off\n"); + translated_ret = ERR_STATUS_OFF; ret = 0; break; default: if (!strcasecmp(op, "status")) printf("Chassis power = Unknown\n"); + translated_ret = ERR_STATUS_FAIL; ret = 1; break; } } else if (!strcasecmp(op, "list")) { printf("%s\n","N/A"); ret=0; + translated_ret = ERR_OK; print_final_status=0; } else if (!strcasecmp(op, "metadata")) { print_xml_metadata(pname); ret=0; + translated_ret = ERR_OK; print_final_status=0; } @@ -1065,5 +1087,5 @@ out: else printf("Failed\n"); } - return ret; + return translated_ret; } diff --git a/fence/agents/ldom/fence_ldom.py b/fence/agents/ldom/fence_ldom.py index 4806982..94d1429 100644 --- a/fence/agents/ldom/fence_ldom.py +++ b/fence/agents/ldom/fence_ldom.py @@ -105,7 +105,7 @@ def main(): ## Operate the fencing device #### conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status,get_power_status) + result = fence_action(conn, options, set_power_status, get_power_status,get_power_status) ## ## Logout from system @@ -116,7 +116,9 @@ def main(): except exceptions.OSError: pass except pexpect.ExceptionPexpect: - pass + pass + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 5e9b3cc..627e988 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -358,7 +358,7 @@ def atexit_handler(): os.close(1) except IOError: sys.stderr.write("%s failed to close standard output\n"%(sys.argv[0])) - sys.exit(1) + sys.exit(EC_GENERIC_ERROR) def version(command, release, build_date, copyright_notice): print command, " ", release, " ", build_date @@ -369,7 +369,7 @@ def fail_usage(message = ""): if len(message) > 0: sys.stderr.write(message+"\n") sys.stderr.write("Please use '-h' for usage\n") - sys.exit(EC_BAD_ARGS) + sys.exit(EC_GENERIC_ERROR) def fail(error_code): message = { @@ -382,7 +382,7 @@ def fail(error_code): EC_STATUS_HMC : "Failed: Either unable to obtaion correct plug status, partition is not available or incorrect HMC version used" }[error_code] + "\n" sys.stderr.write(message) - sys.exit(error_code) + sys.exit(EC_GENERIC_ERROR) def usage(avail_opt): global all_opt @@ -673,6 +673,8 @@ def show_docs(options, docs = None): sys.exit(0) def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None): + result = 0 + ## Process options that manipulate fencing device ##### if (options["-o"] == "list") and (0 == options["device_opt"].count("port")) and (0 == options["device_opt"].count("partition")): @@ -739,8 +741,12 @@ def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None print "Success: Rebooted" elif options["-o"] == "status": print "Status: " + status.upper() + if status.upper() == "OFF": + result = 2 elif options["-o"] == "monitor": 1 + + return result def fence_login(options): force_ipvx="" diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py index 8a88121..06498dc 100644 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -163,7 +163,7 @@ def main(): ## Operate the fencing device #### conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status, get_lpar_list) + result = fence_action(conn, options, set_power_status, get_power_status, get_lpar_list) ## ## Logout from system @@ -176,5 +176,6 @@ def main(): except pexpect.ExceptionPexpect: pass + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py index 91dd5fd..347e1f5 100644 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -63,7 +63,7 @@ def main(): ## Operate the fencing device ###### conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status, None) + result = fence_action(conn, options, set_power_status, get_power_status, None) ## ## Logout from system @@ -74,7 +74,9 @@ def main(): except exceptions.OSError: pass except pexpect.ExceptionPexpect: - pass + pass + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py index 1df0374..77ac26b 100644 --- a/fence/agents/rsb/fence_rsb.py +++ b/fence/agents/rsb/fence_rsb.py @@ -56,6 +56,9 @@ def main(): POWER_STATUS = 2 POWER_REBOOT = 3 + STATUS_ON = 0 + STATUS_OFF = 2 + power_command_issued = 0 address = "" @@ -69,6 +72,8 @@ def main(): standard_err = 2 + result = 0 + #set up regex list USERNAME = 0 PASSWORD = 1 @@ -368,8 +373,10 @@ def main(): print "Determining power state..." if power_state == 1: print "Server is On" + result = STATUS_ON elif power_state == 0: print "Server is Off" + result = STATUS_OFF else: os.write(standard_err, ("FENCE: Cannot determine power state: %s" % buf)) sys.exit(1) @@ -382,6 +389,7 @@ def main(): sock.write("\r") sock.close() + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/sanbox2/fence_sanbox2.py b/fence/agents/sanbox2/fence_sanbox2.py index d1e65cf..38adaa2 100644 --- a/fence/agents/sanbox2/fence_sanbox2.py +++ b/fence/agents/sanbox2/fence_sanbox2.py @@ -139,7 +139,7 @@ def main(): sys.stderr.write("Failed: Unable to switch to admin section\n") sys.exit(EC_GENERIC_ERROR) - fence_action(conn, options, set_power_status, get_power_status, get_list_devices) + result = fence_action(conn, options, set_power_status, get_power_status, get_list_devices) ## ## Logout from system @@ -153,5 +153,7 @@ def main(): except pexpect.ExceptionPexpect: pass + sys.exit(result) + if __name__ == "__main__": main() diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py index 7ef71a3..7d883dd 100644 --- a/fence/agents/virsh/fence_virsh.py +++ b/fence/agents/virsh/fence_virsh.py @@ -82,7 +82,7 @@ def main(): ## Operate the fencing device conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status, get_outlets_status) + result = fence_action(conn, options, set_power_status, get_power_status, get_outlets_status) ## Logout from system try: @@ -93,5 +93,6 @@ def main(): except pexpect.ExceptionPexpect: pass + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py index 63e9360..b7a8eeb 100644 --- a/fence/agents/vmware/fence_vmware.py +++ b/fence/agents/vmware/fence_vmware.py @@ -310,7 +310,9 @@ def main(): fail_usage("Unsupported version of vmrun command! You must use at least version %d!"%(VMRUN_MINIMUM_REQUIRED_VERSION)) # Operate the fencing device - fence_action(None, options, set_power_status, get_power_status, get_outlets_status) + result = fence_action(None, options, set_power_status, get_power_status, get_outlets_status) + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index 514bc9d..f5eb169 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -130,7 +130,7 @@ def main(): else: conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status, get_power_status) + result = fence_action(conn, options, set_power_status, get_power_status, get_power_status) ## ## Logout from system @@ -142,6 +142,8 @@ def main(): pass except pexpect.ExceptionPexpect: pass + + sys.exit(result) if __name__ == "__main__": main()

1 0

cluster: STABLE3 - fence_rackswitch: Accept unknown options without value
by Marek Grác 19 Oct '09

19 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a0… Commit: a047a6ead0e095d96925997f92d3d224f00e9da8 Parent: 3fdca6cd60c75ddccde21ae4c3298efd75f09455 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 19 15:04:08 2009 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 19 15:04:08 2009 +0200 fence_rackswitch: Accept unknown options without value --- fence/agents/rackswitch/do_rack.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fence/agents/rackswitch/do_rack.c b/fence/agents/rackswitch/do_rack.c index 2b5efe2..32037c1 100644 --- a/fence/agents/rackswitch/do_rack.c +++ b/fence/agents/rackswitch/do_rack.c @@ -237,9 +237,13 @@ static void get_options(int argc, char **argv) } *value = 0; if( (value = strchr(arg, '=')) == NULL){ + /* in this agent we can ignore options without value + * as we don't need any of them, here. But we should + * accept and ignore them. + */ fprintf(stderr, "invalid input: '%s'\n", arg); - exit(DID_FAILURE); - } + continue; + } *value = 0; value++; /* bahfuck. "agent" is not passed to us anyway

1 0

fence-agents: master - fencing: Correct exit codes for status operation
by Marek Grác 19 Oct '09

19 Oct '09

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 19c01e65ffe8f0f190682c10347a62d4906f70b6 Parent: e0fae3825aa2aff58cda631e77ea958c02cb1ce8 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 19 14:47:12 2009 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 19 14:47:12 2009 +0200 fencing: Correct exit codes for status operation According to standard operation status should return 0 (if ON) and 2 (if OFF). In all other cases if operation was succesfull then agent return 0. --- fence/agents/alom/fence_alom.py | 4 ++- fence/agents/apc/fence_apc.py | 4 ++- fence/agents/apc_snmp/fence_apc_snmp.py | 3 +- fence/agents/baytech/fence_baytech.pl | 8 +++++- fence/agents/bladecenter/fence_bladecenter.py | 4 ++- fence/agents/bullpap/fence_bullpap.pl | 6 ++++- fence/agents/cisco_mds/fence_cisco_mds.py | 4 ++- fence/agents/drac/fence_drac.pl | 17 +++++++++---- fence/agents/drac5/fence_drac5.py | 4 ++- fence/agents/eps/fence_eps.py | 4 ++- fence/agents/ibmblade/fence_ibmblade.py | 3 +- fence/agents/ifmib/fence_ifmib.py | 4 ++- fence/agents/ilo/fence_ilo.py | 4 ++- fence/agents/ilo_mp/fence_ilo_mp.py | 4 ++- fence/agents/intelmodular/fence_intelmodular.py | 4 ++- fence/agents/ipmilan/ipmilan.c | 28 ++++++++++++++++++++-- fence/agents/ldom/fence_ldom.py | 6 +++- fence/agents/lib/fencing.py.py | 12 +++++++-- fence/agents/lpar/fence_lpar.py | 3 +- fence/agents/rsa/fence_rsa.py | 6 +++- fence/agents/rsb/fence_rsb.py | 8 ++++++ fence/agents/sanbox2/fence_sanbox2.py | 4 ++- fence/agents/virsh/fence_virsh.py | 3 +- fence/agents/vmware/fence_vmware.py | 4 ++- fence/agents/wti/fence_wti.py | 4 ++- 25 files changed, 121 insertions(+), 34 deletions(-) diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py index 4fffa0a..8793e92 100644 --- a/fence/agents/alom/fence_alom.py +++ b/fence/agents/alom/fence_alom.py @@ -64,7 +64,7 @@ def main(): # Operate the fencing device conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status,None) + result = fence_action(conn, options, set_power_status, get_power_status,None) # Logout from system try: @@ -75,5 +75,7 @@ def main(): except pexpect.ExceptionPexpect: pass + sys.exit(result) + if __name__ == "__main__": main() diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index 685a154..92b109c 100755 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -212,7 +212,7 @@ def main(): ## Operate the fencing device #### conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status, get_power_status) + result = fence_action(conn, options, set_power_status, get_power_status, get_power_status) ## ## Logout from system @@ -228,6 +228,8 @@ def main(): pass except pexpect.ExceptionPexpect: pass + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py index 7e8118e..0c36b66 100644 --- a/fence/agents/apc_snmp/fence_apc_snmp.py +++ b/fence/agents/apc_snmp/fence_apc_snmp.py @@ -192,7 +192,8 @@ def main(): show_docs(options) # Operate the fencing device - fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) + 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/baytech/fence_baytech.pl b/fence/agents/baytech/fence_baytech.pl index 7325ee6..b625968 100644 --- a/fence/agents/baytech/fence_baytech.pl +++ b/fence/agents/baytech/fence_baytech.pl @@ -570,7 +570,13 @@ elsif ($action =~ /status/i) { print "Outlet '$bt_name' is $bt_state and is ". (($bt_locked eq "")?"not ":"")."Locked\n"; - $exit=0; + + if ($bt_state =~ /on/i) + { + $exit=0; + } else { + $exit=2; + } } elsif ($bt_locked ne "") { diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index d55f31a..414c260 100644 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -110,7 +110,7 @@ def main(): ## Operate the fencing device ###### conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status, get_blades_list) + result = fence_action(conn, options, set_power_status, get_power_status, get_blades_list) ## ## Logout from system @@ -122,6 +122,8 @@ def main(): pass except pexpect.ExceptionPexpect: pass + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/bullpap/fence_bullpap.pl b/fence/agents/bullpap/fence_bullpap.pl index 11382dc..6915f57 100644 --- a/fence/agents/bullpap/fence_bullpap.pl +++ b/fence/agents/bullpap/fence_bullpap.pl @@ -297,6 +297,7 @@ elsif (/^status$/i) { $action = "status"; } # $success=0; $_ = $action; +my $exit_code=0; if (/(on|off)/) { my $timeout = 120; # 120 = max of (60, 120). Max timeout for "on" @@ -341,6 +342,9 @@ elsif (/status/) get_power_state $host,$domain,$login,$passwd; $state=$_; $success = 1 if defined $state; + if ($state eq "OFF") { + $exit_code = 2; + } } else { @@ -351,7 +355,7 @@ if ($success) { print "success: domain $domain $action". ((defined $state) ? ": $state":"") ."\n" unless defined $quiet; - exit 0; + exit $exit_code; } else { diff --git a/fence/agents/cisco_mds/fence_cisco_mds.py b/fence/agents/cisco_mds/fence_cisco_mds.py index d007b72..bd8d858 100644 --- a/fence/agents/cisco_mds/fence_cisco_mds.py +++ b/fence/agents/cisco_mds/fence_cisco_mds.py @@ -113,7 +113,9 @@ def main(): port_oid=cisco_port2oid(options["-n"]) # Operate the fencing device - fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) + 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/drac/fence_drac.pl b/fence/agents/drac/fence_drac.pl index 78c4735..5cc1a52 100644 --- a/fence/agents/drac/fence_drac.pl +++ b/fence/agents/drac/fence_drac.pl @@ -445,7 +445,7 @@ sub do_action if ($status =~ /^on$/i) { msg "success: already on"; - return; + return 0; } set_power_status on; @@ -458,7 +458,7 @@ sub do_action if ($status =~ /^off$/i) { msg "success: already off"; - return; + return 0; } set_power_status off; @@ -482,12 +482,19 @@ sub do_action elsif ($action =~ /^status$/i) { msg "status: $status"; - return; + if ($status =~ /on/i) + { + return 0; + } else { + return 2; + } } else { fail "failed: unrecognised action: '$action'"; } + + return 0; } # @@ -651,10 +658,10 @@ elsif ($drac_version eq $DRAC_VERSION_MC) unless defined $modulename; } -do_action; +my $res = do_action; logout; -exit 0; +exit $res; diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py index d7fbdaa..ab5056b 100644 --- a/fence/agents/drac5/fence_drac5.py +++ b/fence/agents/drac5/fence_drac5.py @@ -115,7 +115,7 @@ def main(): ## Assume this is DRAC 5 by default as we don't want to break anything options["model"]="DRAC 5" - fence_action(conn, options, set_power_status, get_power_status, get_list_devices) + result = fence_action(conn, options, set_power_status, get_power_status, get_list_devices) ## ## Logout from system @@ -127,6 +127,8 @@ def main(): pass except pexpect.ExceptionPexpect: pass + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/eps/fence_eps.py b/fence/agents/eps/fence_eps.py index 604a481..d9118a7 100644 --- a/fence/agents/eps/fence_eps.py +++ b/fence/agents/eps/fence_eps.py @@ -110,7 +110,9 @@ def main(): show_docs(options) #Run fence action. Conn is None, beacause we always need open new http connection - fence_action(None, options, set_power_status, get_power_status,get_power_status) + result = fence_action(None, options, set_power_status, get_power_status,get_power_status) + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/ibmblade/fence_ibmblade.py b/fence/agents/ibmblade/fence_ibmblade.py index 4ff334e..4548a29 100644 --- a/fence/agents/ibmblade/fence_ibmblade.py +++ b/fence/agents/ibmblade/fence_ibmblade.py @@ -74,7 +74,8 @@ def main(): show_docs(options) # Operate the fencing device - fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) + 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/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py index 7645afa..159554e 100644 --- a/fence/agents/ifmib/fence_ifmib.py +++ b/fence/agents/ifmib/fence_ifmib.py @@ -131,7 +131,9 @@ def main(): show_docs(options) # Operate the fencing device - fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) + 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/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py index 574f944..0ff40d7 100755 --- a/fence/agents/ilo/fence_ilo.py +++ b/fence/agents/ilo/fence_ilo.py @@ -105,7 +105,9 @@ def main(): ## ## Fence operations #### - fence_action(conn, options, set_power_status, get_power_status, None) + result = fence_action(conn, options, set_power_status, get_power_status, None) + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/ilo_mp/fence_ilo_mp.py b/fence/agents/ilo_mp/fence_ilo_mp.py index dfd4c1e..2ddd733 100644 --- a/fence/agents/ilo_mp/fence_ilo_mp.py +++ b/fence/agents/ilo_mp/fence_ilo_mp.py @@ -65,7 +65,7 @@ def main(): ## ## Fence operations #### - fence_action(conn, options, set_power_status, get_power_status) + result = fence_action(conn, options, set_power_status, get_power_status) try: conn.send("exit\r\n") @@ -73,6 +73,8 @@ def main(): pass except pexpect.ExceptionPexpect: pass + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/intelmodular/fence_intelmodular.py b/fence/agents/intelmodular/fence_intelmodular.py index a03e4a6..c943c1e 100644 --- a/fence/agents/intelmodular/fence_intelmodular.py +++ b/fence/agents/intelmodular/fence_intelmodular.py @@ -80,7 +80,9 @@ def main(): show_docs(options) # Operate the fencing device - fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) + 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/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c index e001f3d..ad35001 100644 --- a/fence/agents/ipmilan/ipmilan.c +++ b/fence/agents/ipmilan/ipmilan.c @@ -34,6 +34,19 @@ #define DEFAULT_METHOD "onoff" +/* We should follow FenceAgentsAPI standard*/ +#define ERR_OFF_SUCCESSFUL 0 +#define ERR_OFF_FAIL 1 + +#define ERR_ON_SUCCESSFUL 0 +#define ERR_ON_FAIL 1 + +#define ERR_STATUS_ON 0 +#define ERR_STATUS_FAIL 1 +#define ERR_STATUS_OFF 2 + +#define ERR_OK 0 + #define log(lvl, fmt, args...) fprintf(stderr, fmt, ##args) #include <libgen.h> #include "copyright.cf" @@ -844,6 +857,7 @@ main(int argc, char **argv) int timeout=DEFAULT_TIMEOUT; int cipher=-1; int print_final_status=1; + int translated_ret = -1; memset(ip, 0, sizeof(ip)); memset(authtype, 0, sizeof(authtype)); @@ -1013,19 +1027,22 @@ main(int argc, char **argv) } else { /* Original onoff method */ ret = ipmi_off(i); - if (ret != 0) + translated_ret = (ret==0?ERR_OFF_SUCCESSFUL:ERR_OFF_FAIL); + if (ret != 0) { goto out; + } ret = ipmi_on(i); } } else if (!strcasecmp(op, "on")) { printf("Powering on machine @ IPMI:%s...", ip); fflush(stdout); ret = ipmi_on(i); - + translated_ret = (ret==0?ERR_ON_SUCCESSFUL:ERR_ON_FAIL); } else if (!strcasecmp(op, "off")) { printf("Powering off machine @ IPMI:%s...", ip); fflush(stdout); ret = ipmi_off(i); + translated_ret = (ret==0?ERR_ON_SUCCESSFUL:ERR_ON_FAIL); } else if (!strcasecmp(op, "status") || !strcasecmp(op, "monitor")) { printf("Getting status of IPMI:%s...",ip); fflush(stdout); @@ -1034,26 +1051,31 @@ main(int argc, char **argv) case STATE_ON: if (!strcasecmp(op, "status")) printf("Chassis power = On\n"); + translated_ret = ERR_STATUS_ON; ret = 0; break; case STATE_OFF: if (!strcasecmp(op, "status")) printf("Chassis power = Off\n"); + translated_ret = ERR_STATUS_OFF; ret = 0; break; default: if (!strcasecmp(op, "status")) printf("Chassis power = Unknown\n"); + translated_ret = ERR_STATUS_FAIL; ret = 1; break; } } else if (!strcasecmp(op, "list")) { printf("%s\n","N/A"); ret=0; + translated_ret = ERR_OK; print_final_status=0; } else if (!strcasecmp(op, "metadata")) { print_xml_metadata(pname); ret=0; + translated_ret = ERR_OK; print_final_status=0; } @@ -1068,5 +1090,5 @@ out: else printf("Failed\n"); } - return ret; + return translated_ret; } diff --git a/fence/agents/ldom/fence_ldom.py b/fence/agents/ldom/fence_ldom.py index 4806982..94d1429 100644 --- a/fence/agents/ldom/fence_ldom.py +++ b/fence/agents/ldom/fence_ldom.py @@ -105,7 +105,7 @@ def main(): ## Operate the fencing device #### conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status,get_power_status) + result = fence_action(conn, options, set_power_status, get_power_status,get_power_status) ## ## Logout from system @@ -116,7 +116,9 @@ def main(): except exceptions.OSError: pass except pexpect.ExceptionPexpect: - pass + pass + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index a099a0a..566cebf 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -363,7 +363,7 @@ def atexit_handler(): os.close(1) except IOError: sys.stderr.write("%s failed to close standard output\n"%(sys.argv[0])) - sys.exit(1) + sys.exit(EC_GENERIC_ERROR) def version(command, release, build_date, copyright_notice): print command, " ", release, " ", build_date @@ -374,7 +374,7 @@ def fail_usage(message = ""): if len(message) > 0: sys.stderr.write(message+"\n") sys.stderr.write("Please use '-h' for usage\n") - sys.exit(EC_BAD_ARGS) + sys.exit(EC_GENERIC_ERROR) def fail(error_code): message = { @@ -387,7 +387,7 @@ def fail(error_code): EC_STATUS_HMC : "Failed: Either unable to obtaion correct plug status, partition is not available or incorrect HMC version used" }[error_code] + "\n" sys.stderr.write(message) - sys.exit(error_code) + sys.exit(EC_GENERIC_ERROR) def usage(avail_opt): global all_opt @@ -678,6 +678,8 @@ def show_docs(options, docs = None): sys.exit(0) def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None): + result = 0 + ## Process options that manipulate fencing device ##### if (options["-o"] == "list") and (0 == options["device_opt"].count("port")) and (0 == options["device_opt"].count("partition")): @@ -744,8 +746,12 @@ def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None print "Success: Rebooted" elif options["-o"] == "status": print "Status: " + status.upper() + if status.upper() == "OFF": + result = 2 elif options["-o"] == "monitor": 1 + + return result def fence_login(options): force_ipvx="" diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py index 451ca93..37ff2b4 100644 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -161,7 +161,7 @@ def main(): ## Operate the fencing device #### conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status, get_lpar_list) + result = fence_action(conn, options, set_power_status, get_power_status, get_lpar_list) ## ## Logout from system @@ -174,5 +174,6 @@ def main(): except pexpect.ExceptionPexpect: pass + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py index 16457a9..583a84a 100644 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -62,7 +62,7 @@ def main(): ## Operate the fencing device ###### conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status, None) + result = fence_action(conn, options, set_power_status, get_power_status, None) ## ## Logout from system @@ -73,7 +73,9 @@ def main(): except exceptions.OSError: pass except pexpect.ExceptionPexpect: - pass + pass + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py index 1df0374..77ac26b 100644 --- a/fence/agents/rsb/fence_rsb.py +++ b/fence/agents/rsb/fence_rsb.py @@ -56,6 +56,9 @@ def main(): POWER_STATUS = 2 POWER_REBOOT = 3 + STATUS_ON = 0 + STATUS_OFF = 2 + power_command_issued = 0 address = "" @@ -69,6 +72,8 @@ def main(): standard_err = 2 + result = 0 + #set up regex list USERNAME = 0 PASSWORD = 1 @@ -368,8 +373,10 @@ def main(): print "Determining power state..." if power_state == 1: print "Server is On" + result = STATUS_ON elif power_state == 0: print "Server is Off" + result = STATUS_OFF else: os.write(standard_err, ("FENCE: Cannot determine power state: %s" % buf)) sys.exit(1) @@ -382,6 +389,7 @@ def main(): sock.write("\r") sock.close() + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/sanbox2/fence_sanbox2.py b/fence/agents/sanbox2/fence_sanbox2.py index d1e65cf..38adaa2 100644 --- a/fence/agents/sanbox2/fence_sanbox2.py +++ b/fence/agents/sanbox2/fence_sanbox2.py @@ -139,7 +139,7 @@ def main(): sys.stderr.write("Failed: Unable to switch to admin section\n") sys.exit(EC_GENERIC_ERROR) - fence_action(conn, options, set_power_status, get_power_status, get_list_devices) + result = fence_action(conn, options, set_power_status, get_power_status, get_list_devices) ## ## Logout from system @@ -153,5 +153,7 @@ def main(): except pexpect.ExceptionPexpect: pass + sys.exit(result) + if __name__ == "__main__": main() diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py index 7ef71a3..7d883dd 100644 --- a/fence/agents/virsh/fence_virsh.py +++ b/fence/agents/virsh/fence_virsh.py @@ -82,7 +82,7 @@ def main(): ## Operate the fencing device conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status, get_outlets_status) + result = fence_action(conn, options, set_power_status, get_power_status, get_outlets_status) ## Logout from system try: @@ -93,5 +93,6 @@ def main(): except pexpect.ExceptionPexpect: pass + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py index 63e9360..b7a8eeb 100644 --- a/fence/agents/vmware/fence_vmware.py +++ b/fence/agents/vmware/fence_vmware.py @@ -310,7 +310,9 @@ def main(): fail_usage("Unsupported version of vmrun command! You must use at least version %d!"%(VMRUN_MINIMUM_REQUIRED_VERSION)) # Operate the fencing device - fence_action(None, options, set_power_status, get_power_status, get_outlets_status) + result = fence_action(None, options, set_power_status, get_power_status, get_outlets_status) + + sys.exit(result) if __name__ == "__main__": main() diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index 514bc9d..f5eb169 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -130,7 +130,7 @@ def main(): else: conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status, get_power_status) + result = fence_action(conn, options, set_power_status, get_power_status, get_power_status) ## ## Logout from system @@ -142,6 +142,8 @@ def main(): pass except pexpect.ExceptionPexpect: pass + + sys.exit(result) if __name__ == "__main__": main()

1 0

fence-agents: master - fence_rackswich: Accept unknown options without value
by Marek Grác 19 Oct '09

19 Oct '09

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: e0fae3825aa2aff58cda631e77ea958c02cb1ce8 Parent: 744df71768fc561693bee28e635501cf641d8d29 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 19 14:03:19 2009 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 19 14:03:19 2009 +0200 fence_rackswich: Accept unknown options without value --- fence/agents/rackswitch/do_rack.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fence/agents/rackswitch/do_rack.c b/fence/agents/rackswitch/do_rack.c index a4bad8d..854b475 100644 --- a/fence/agents/rackswitch/do_rack.c +++ b/fence/agents/rackswitch/do_rack.c @@ -239,9 +239,13 @@ static void get_options(int argc, char **argv) } *value = 0; if( (value = strchr(arg, '=')) == NULL){ + /* in this agent we can ignore options without value + * as we don't need any of them, here. But we should + * accept and ignore them. + */ fprintf(stderr, "invalid input: '%s'\n", arg); - exit(DID_FAILURE); - } + continue; + } *value = 0; value++; /* bahfuck. "agent" is not passed to us anyway

1 0

cluster: STABLE3 - cman init: fix another set_networking_params check
by Fabio M. Di Nitto 19 Oct '09

19 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=3f… Commit: 3fdca6cd60c75ddccde21ae4c3298efd75f09455 Parent: 1ece3abed41a6debf4175201c4061108e9034e68 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Mon Oct 19 10:15:44 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Mon Oct 19 10:15:44 2009 +0200 cman init: fix another set_networking_params check Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/init.d/cman.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index b5b6192..d03e33d 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -508,7 +508,7 @@ set_networking_params() if [ "$(cat $rmemmax)" -lt $NET_RMEM_MAX ]; then echo $NET_RMEM_MAX > /proc/sys/net/core/rmem_max - [ "$(cat $rmemmax)" -lt $NET_RMEM_MAX ] && return 1 + [ "$(cat $rmemmax)" != $NET_RMEM_MAX ] && return 1 fi return 0

1 0

cluster: STABLE3 - cman init: fix set_networking_params
by Fabio M. Di Nitto 18 Oct '09

18 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=1e… Commit: 1ece3abed41a6debf4175201c4061108e9034e68 Parent: 9fe781d4070527ea89acd848a5d50f3d24302f90 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Mon Oct 19 06:46:36 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Mon Oct 19 06:46:36 2009 +0200 cman init: fix set_networking_params Do not fail if the current value of rmem_default or rmem_max are already higher than the minimum required. rhbz#529498 Check that the requested value is active. Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/init.d/cman.in | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index 055abda..b5b6192 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -499,15 +499,19 @@ set_networking_params() [ ! -f $rmemdefault ] && return 0 - value="$(cat $rmemdefault)" - - [ $value -le $NET_RMEM_DEFAULT ] && \ + if [ "$(cat $rmemdefault)" -lt $NET_RMEM_DEFAULT ]; then echo $NET_RMEM_DEFAULT > $rmemdefault + [ "$(cat $rmemdefault)" != $NET_RMEM_DEFAULT ] && return 1 + fi - value="$(cat /proc/sys/net/core/rmem_max)" + rmemmax="/proc/sys/net/core/rmem_max" - [ $value -le $NET_RMEM_MAX ] && \ + if [ "$(cat $rmemmax)" -lt $NET_RMEM_MAX ]; then echo $NET_RMEM_MAX > /proc/sys/net/core/rmem_max + [ "$(cat $rmemmax)" -lt $NET_RMEM_MAX ] && return 1 + fi + + return 0 } start_cman()

1 0

cluster: STABLE3 - fencing: Accept unknown options from standard input
by Marek Grác 16 Oct '09

16 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=9f… Commit: 9fe781d4070527ea89acd848a5d50f3d24302f90 Parent: 622002d75df7bb067bca51f46731b89f2104b65a Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Fri Oct 16 17:31:10 2009 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Fri Oct 16 17:31:10 2009 +0200 fencing: Accept unknown options from standard input libefence added new option 'nodename' to every query, as most of the agents does not need such feature, we will ignore it. Unknown options from STDIN where handled differently before. New policy: fence agent should accept unknown args from STDIN. It can print on STDERR warning that it is ignoring that option. --- fence/agents/bullpap/fence_bullpap.pl | 4 ---- fence/agents/drac/fence_drac.pl | 5 ----- fence/agents/egenera/fence_egenera.pl | 7 ------- fence/agents/lib/fencing.py.py | 3 ++- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/fence/agents/bullpap/fence_bullpap.pl b/fence/agents/bullpap/fence_bullpap.pl index b643413..11382dc 100644 --- a/fence/agents/bullpap/fence_bullpap.pl +++ b/fence/agents/bullpap/fence_bullpap.pl @@ -148,10 +148,6 @@ sub get_options_stdin { $verbose = $val; } - else - { - fail "parse error: unknown option \"$opt\""; - } } } diff --git a/fence/agents/drac/fence_drac.pl b/fence/agents/drac/fence_drac.pl index e743aae..78c4735 100644 --- a/fence/agents/drac/fence_drac.pl +++ b/fence/agents/drac/fence_drac.pl @@ -560,11 +560,6 @@ sub get_options_stdin { $cmd_prompt = $val; } - # Excess name/vals will fail - else - { - fail "parse error: unknown option \"$opt\""; - } } } diff --git a/fence/agents/egenera/fence_egenera.pl b/fence/agents/egenera/fence_egenera.pl index a193fb0..8df0029 100644 --- a/fence/agents/egenera/fence_egenera.pl +++ b/fence/agents/egenera/fence_egenera.pl @@ -164,13 +164,6 @@ sub get_options_stdin { $user = $val; } - - # FIXME should we do more error checking? - # Excess name/vals will be eaten for now - else - { - fail "parse error: unknown option \"$opt\""; - } } } diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index fe83a3f..5e9b3cc 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -538,7 +538,8 @@ def process_input(avail_opt): ## ###### if avail_opt.count(name) == 0: - fail_usage("Parse error: Unknown option '"+line+"'") + sys.stderr.write("Parse error: Ignoring unknown option '"+line+"'\n") + continue if all_opt[name]["getopt"].endswith(":"): opt["-"+all_opt[name]["getopt"].rstrip(":")] = value

1 0

fence-agents: master - fencing: Accept unknown options from standard input
by Marek Grác 16 Oct '09

16 Oct '09

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 744df71768fc561693bee28e635501cf641d8d29 Parent: 460609f46485cd39f1ea158a00e1ca8fa3dd809f Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Fri Oct 16 17:23:21 2009 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Fri Oct 16 17:28:40 2009 +0200 fencing: Accept unknown options from standard input libefence added new option 'nodename' to every query, as most of the agents does not need such feature, we will ignore it. Unknown options from STDIN where handled differently before. New policy: fence agent should accept unknown args from STDIN. It can print on STDERR warning that it is ignoring that option. --- fence/agents/bullpap/fence_bullpap.pl | 4 ---- fence/agents/drac/fence_drac.pl | 5 ----- fence/agents/egenera/fence_egenera.pl | 7 ------- fence/agents/lib/fencing.py.py | 3 ++- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/fence/agents/bullpap/fence_bullpap.pl b/fence/agents/bullpap/fence_bullpap.pl index b643413..11382dc 100644 --- a/fence/agents/bullpap/fence_bullpap.pl +++ b/fence/agents/bullpap/fence_bullpap.pl @@ -148,10 +148,6 @@ sub get_options_stdin { $verbose = $val; } - else - { - fail "parse error: unknown option \"$opt\""; - } } } diff --git a/fence/agents/drac/fence_drac.pl b/fence/agents/drac/fence_drac.pl index e743aae..78c4735 100644 --- a/fence/agents/drac/fence_drac.pl +++ b/fence/agents/drac/fence_drac.pl @@ -560,11 +560,6 @@ sub get_options_stdin { $cmd_prompt = $val; } - # Excess name/vals will fail - else - { - fail "parse error: unknown option \"$opt\""; - } } } diff --git a/fence/agents/egenera/fence_egenera.pl b/fence/agents/egenera/fence_egenera.pl index a193fb0..8df0029 100644 --- a/fence/agents/egenera/fence_egenera.pl +++ b/fence/agents/egenera/fence_egenera.pl @@ -164,13 +164,6 @@ sub get_options_stdin { $user = $val; } - - # FIXME should we do more error checking? - # Excess name/vals will be eaten for now - else - { - fail "parse error: unknown option \"$opt\""; - } } } diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 9df1190..a099a0a 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -543,7 +543,8 @@ def process_input(avail_opt): ## ###### if avail_opt.count(name) == 0: - fail_usage("Parse error: Unknown option '"+line+"'") + sys.stderr.write("Parse error: Ignoring unknown option '"+line+"'\n") + continue if all_opt[name]["getopt"].endswith(":"): opt["-"+all_opt[name]["getopt"].rstrip(":")] = value

1 0

gfs2-utils: master - build: check for libquorum
by Fabio M. Di Nitto 16 Oct '09

16 Oct '09

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: 9a8c4736e28903aacd14589c6c13b6efdaebb52f Parent: c87787214e61794d55fb424bf6b35a206c5f410a Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Fri Oct 16 09:25:16 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Fri Oct 16 09:25:16 2009 +0200 build: check for libquorum Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- configure.ac | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 6b537d4..be55a79 100644 --- a/configure.ac +++ b/configure.ac @@ -118,6 +118,7 @@ PKG_CHECK_MODULES([ccs],[libccs]) PKG_CHECK_MODULES([cfg],[libcfg]) PKG_CHECK_MODULES([fenced],[libfenced]) PKG_CHECK_MODULES([dlmcontrol],[libdlmcontrol]) +PKG_CHECK_MODULES([quorum],[libquorum]) # old versions of ncurses don't ship pkg-config files PKG_CHECK_MODULES([ncurses],[ncurses],,

1 0

gfs2-utils: master - gfs_controld: watch cluster membership
by David Teigland 15 Oct '09

15 Oct '09

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: c87787214e61794d55fb424bf6b35a206c5f410a Parent: 8428fc6366ab3948099258548a325c7d34f182fb Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Oct 15 12:56:34 2009 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Oct 15 12:56:34 2009 -0500 gfs_controld: watch cluster membership Keep track of cluster membership changes so we can call the recently added node_history_cluster_{add,remove}. Copied from dlm_controld. Signed-off-by: David Teigland <teigland(a)redhat.com> --- group/gfs_controld/Makefile.am | 4 +- group/gfs_controld/gfs_daemon.h | 4 + group/gfs_controld/main.c | 8 ++ group/gfs_controld/member_cman.c | 131 +++++++++++++++++++++++++++++++++++--- 4 files changed, 136 insertions(+), 11 deletions(-) diff --git a/group/gfs_controld/Makefile.am b/group/gfs_controld/Makefile.am index 6e20244..f8d646d 100644 --- a/group/gfs_controld/Makefile.am +++ b/group/gfs_controld/Makefile.am @@ -17,8 +17,8 @@ gfs_controld_CPPFLAGS = -I$(top_srcdir)/group/libgfscontrol \ gfs_controld_CFLAGS = $(ccs_CFLAGS) $(logt_CFLAGS) $(dlmcontrol_CFLAGS) \ $(fenced_CFLAGS) $(sackpt_CFLAGS) $(cpg_CFLAGS) \ - $(cfg_CFLAGS) + $(cfg_CFLAGS) $(quorum_CFLAGS) gfs_controld_LDFLAGS = $(ccs_LIBS) $(logt_LIBS) $(dlmcontrol_LIBS) \ $(cpg_LIBS) $(cfg_LIBS) $(sackpt_LIBS) \ - $(fenced_LIBS) -lpthread + $(fenced_LIBS) $(quorum_LIBS) -lpthread diff --git a/group/gfs_controld/gfs_daemon.h b/group/gfs_controld/gfs_daemon.h index 1d89497..fdfc603 100644 --- a/group/gfs_controld/gfs_daemon.h +++ b/group/gfs_controld/gfs_daemon.h @@ -212,6 +212,10 @@ void process_connection(int ci); void cluster_dead(int ci); /* member_cman.c */ +int setup_cluster(void); +void close_cluster(void); +void process_cluster(int ci); +void update_cluster(void); int setup_cluster_cfg(void); void close_cluster_cfg(void); void process_cluster_cfg(int ci); diff --git a/group/gfs_controld/main.c b/group/gfs_controld/main.c index 2b5a87e..e52f04b 100644 --- a/group/gfs_controld/main.c +++ b/group/gfs_controld/main.c @@ -1049,6 +1049,13 @@ static void loop(void) goto out; client_add(rv, process_cluster_cfg, cluster_dead); + rv = setup_cluster(); + if (rv < 0) + goto out; + client_add(rv, process_cluster, cluster_dead); + + update_cluster(); + rv = setup_ccs(); if (rv < 0) goto out; @@ -1135,6 +1142,7 @@ static void loop(void) close_cpg_daemon(); close_logging(); close_ccs(); + close_cluster(); close_cluster_cfg(); if (!list_empty(&mountgroups)) diff --git a/group/gfs_controld/member_cman.c b/group/gfs_controld/member_cman.c index 16631d3..1c377f8 100644 --- a/group/gfs_controld/member_cman.c +++ b/group/gfs_controld/member_cman.c @@ -2,8 +2,129 @@ #include "config.h" #include <corosync/corotypes.h> #include <corosync/cfg.h> +#include <corosync/quorum.h> -static corosync_cfg_handle_t ch; +static corosync_cfg_handle_t ch; +static quorum_handle_t qh; +static uint32_t old_nodes[MAX_NODES]; +static int old_node_count; +static uint32_t quorum_nodes[MAX_NODES]; +static int quorum_node_count; + +static int is_member(uint32_t *node_list, int count, uint32_t nodeid) +{ + int i; + + for (i = 0; i < count; i++) { + if (node_list[i] == nodeid) + return 1; + } + return 0; +} + +static int is_old_member(uint32_t nodeid) +{ + return is_member(old_nodes, old_node_count, nodeid); +} + +int is_cluster_member(uint32_t nodeid) +{ + return is_member(quorum_nodes, quorum_node_count, nodeid); +} + +static void quorum_callback(quorum_handle_t h, uint32_t quorate, + uint64_t ring_seq, uint32_t node_list_entries, + uint32_t *node_list) +{ + int i; + + old_node_count = quorum_node_count; + memcpy(&old_nodes, &quorum_nodes, sizeof(old_nodes)); + + quorum_node_count = 0; + memset(&quorum_nodes, 0, sizeof(quorum_nodes)); + + for (i = 0; i < node_list_entries; i++) + quorum_nodes[quorum_node_count++] = node_list[i]; + + for (i = 0; i < old_node_count; i++) { + if (!is_cluster_member(old_nodes[i])) { + log_debug("cluster node %u removed", old_nodes[i]); + node_history_cluster_remove(old_nodes[i]); + } + } + + for (i = 0; i < quorum_node_count; i++) { + if (!is_old_member(quorum_nodes[i])) { + log_debug("cluster node %u added", quorum_nodes[i]); + node_history_cluster_add(quorum_nodes[i]); + } + } +} + +static quorum_callbacks_t quorum_callbacks = +{ + .quorum_notify_fn = quorum_callback, +}; + +void process_cluster(int ci) +{ + cs_error_t err; + + err = quorum_dispatch(qh, CS_DISPATCH_ALL); + if (err != CS_OK) + cluster_dead(0); +} + +/* Force re-read of quorum nodes */ +void update_cluster(void) +{ + cs_error_t err; + + err = quorum_dispatch(qh, CS_DISPATCH_ONE); + if (err != CS_OK) + cluster_dead(0); +} + +int setup_cluster(void) +{ + cs_error_t err; + int fd; + + err = quorum_initialize(&qh, &quorum_callbacks); + if (err != CS_OK) { + log_error("quorum init error %d", err); + return -1; + } + + err = quorum_fd_get(qh, &fd); + if (err != CS_OK) { + log_error("quorum fd_get error %d", err); + goto fail; + } + + err = quorum_trackstart(qh, CS_TRACK_CURRENT); + if (err != CS_OK) { + log_error("quorum trackstart error %d", err); + goto fail; + } + + old_node_count = 0; + memset(&old_nodes, 0, sizeof(old_nodes)); + quorum_node_count = 0; + memset(&quorum_nodes, 0, sizeof(quorum_nodes)); + + return fd; + fail: + quorum_finalize(qh); + return -1; +} + +void close_cluster(void) +{ + quorum_trackstop(qh); + quorum_finalize(qh); +} void kick_node_from_cluster(int nodeid) { @@ -84,11 +205,3 @@ void close_cluster_cfg(void) corosync_cfg_finalize(ch); } -/* what's the replacement for this? - * case CMAN_REASON_CONFIG_UPDATE: - * setup_logging(); - * setup_ccs(); - * break; - * } - */ -

1 0

gfs2-utils: master - Revert "gfs_controld: Remove three unused functions"
by David Teigland 15 Oct '09

15 Oct '09

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: 8428fc6366ab3948099258548a325c7d34f182fb Parent: b5c970dd8facb2b78aefc1b91ecd90bca192044e Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Oct 15 11:42:41 2009 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Oct 15 11:42:41 2009 -0500 Revert "gfs_controld: Remove three unused functions" This reverts commit b5c970dd8facb2b78aefc1b91ecd90bca192044e. --- group/gfs_controld/cpg-new.c | 36 ++++++++++++++++++++++++++++++++++++ group/gfs_controld/gfs_daemon.h | 3 +++ group/gfs_controld/main.c | 11 +++++++++++ 3 files changed, 50 insertions(+), 0 deletions(-) diff --git a/group/gfs_controld/cpg-new.c b/group/gfs_controld/cpg-new.c index e355590..23b7a86 100644 --- a/group/gfs_controld/cpg-new.c +++ b/group/gfs_controld/cpg-new.c @@ -530,6 +530,42 @@ static void node_history_init(struct mountgroup *mg, int nodeid, node->added_seq = cg->seq; /* for queries */ } +void node_history_cluster_add(int nodeid) +{ + struct mountgroup *mg; + struct node *node; + + list_for_each_entry(mg, &mountgroups, list) { + node_history_init(mg, nodeid, NULL); + + node = get_node_history(mg, nodeid); + if (!node) { + log_error("node_history_cluster_add no nodeid %d", + nodeid); + return; + } + + node->cluster_add_time = time(NULL); + } +} + +void node_history_cluster_remove(int nodeid) +{ + struct mountgroup *mg; + struct node *node; + + list_for_each_entry(mg, &mountgroups, list) { + node = get_node_history(mg, nodeid); + if (!node) { + log_error("node_history_cluster_remove no nodeid %d", + nodeid); + return; + } + + node->cluster_remove_time = time(NULL); + } +} + static void node_history_start(struct mountgroup *mg, int nodeid) { struct node *node; diff --git a/group/gfs_controld/gfs_daemon.h b/group/gfs_controld/gfs_daemon.h index 7199c00..1d89497 100644 --- a/group/gfs_controld/gfs_daemon.h +++ b/group/gfs_controld/gfs_daemon.h @@ -189,6 +189,8 @@ int set_mountgroups(int *count, struct gfsc_mountgroup **mgs_out); int set_mountgroup_nodes(struct mountgroup *mg, int option, int *node_count, struct gfsc_node **nodes_out); void free_mg(struct mountgroup *mg); +void node_history_cluster_add(int nodeid); +void node_history_cluster_remove(int nodeid); /* main.c */ int do_read(int fd, void *buf, size_t count); @@ -200,6 +202,7 @@ void client_ignore(int ci, int fd); void client_back(int ci, int fd); struct mountgroup *create_mg(char *name); struct mountgroup *find_mg(char *name); +struct mountgroup *find_mg_id(uint32_t id); void client_reply_remount(struct mountgroup *mg, int ci, int result); void client_reply_join(int ci, struct gfsc_mount_args *ma, int result); void client_reply_join_full(struct mountgroup *mg, int result); diff --git a/group/gfs_controld/main.c b/group/gfs_controld/main.c index 959954c..2b5a87e 100644 --- a/group/gfs_controld/main.c +++ b/group/gfs_controld/main.c @@ -178,6 +178,17 @@ struct mountgroup *find_mg(char *name) return NULL; } +struct mountgroup *find_mg_id(uint32_t id) +{ + struct mountgroup *mg; + + list_for_each_entry(mg, &mountgroups, list) { + if (mg->id == id) + return mg; + } + return NULL; +} + enum { Env_ACTION = 0, Env_SUBSYSTEM,

1 0

dlm: master - dlm_controld: tidy cman code
by David Teigland 15 Oct '09

15 Oct '09

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=3fe2f1f087… Commit: 3fe2f1f087d64c52a4bdf7b86cc68699a2ac2a10 Parent: e0a214768b9b91e4b466405f0d24c4c634e6cfb2 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Oct 15 12:55:15 2009 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Oct 15 12:55:15 2009 -0500 dlm_controld: tidy cman code To match the same code in gfs_controld. Signed-off-by: David Teigland <teigland(a)redhat.com> --- group/dlm_controld/main.c | 2 +- group/dlm_controld/member_cman.c | 40 ++++++++++++------------------------- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c index fe5be04..f90cd21 100644 --- a/group/dlm_controld/main.c +++ b/group/dlm_controld/main.c @@ -881,7 +881,7 @@ static void loop(void) setup_monitor(); - rv = setup_configfs(); + rv = setup_configfs(); /* calls update_cluster() */ if (rv < 0) goto out; diff --git a/group/dlm_controld/member_cman.c b/group/dlm_controld/member_cman.c index 880e3c1..b7fa8c3 100644 --- a/group/dlm_controld/member_cman.c +++ b/group/dlm_controld/member_cman.c @@ -12,19 +12,6 @@ static int old_node_count; static uint32_t quorum_nodes[MAX_NODES]; static int quorum_node_count; -void kick_node_from_cluster(int nodeid) -{ - if (!nodeid) { - log_error("telling corosync to shut down cluster locally"); - corosync_cfg_try_shutdown(ch, - COROSYNC_CFG_SHUTDOWN_FLAG_IMMEDIATE); - } else { - log_error("telling corosync to remove nodeid %d from cluster", - nodeid); - corosync_cfg_kill_node(ch, nodeid, "dlm_controld"); - } -} - static int is_member(uint32_t *node_list, int count, uint32_t nodeid) { int i; @@ -46,20 +33,6 @@ int is_cluster_member(uint32_t nodeid) return is_member(quorum_nodes, quorum_node_count, nodeid); } -/* what's the replacement for this? */ -#if 0 -static void cman_callback(cman_handle_t h, void *private, int reason, int arg) -{ - case CMAN_REASON_CONFIG_UPDATE: - setup_logging(); - setup_ccs(); - break; -} -#endif - -/* add a configfs dir for cluster members that don't have one, - del the configfs dir for cluster members that are now gone */ - static void quorum_callback(quorum_handle_t h, uint32_t quorate, uint64_t ring_seq, uint32_t node_list_entries, uint32_t *node_list) @@ -177,6 +150,19 @@ void close_cluster(void) quorum_finalize(qh); } +void kick_node_from_cluster(int nodeid) +{ + if (!nodeid) { + log_error("telling corosync to shut down cluster locally"); + corosync_cfg_try_shutdown(ch, + COROSYNC_CFG_SHUTDOWN_FLAG_IMMEDIATE); + } else { + log_error("telling corosync to remove nodeid %d from cluster", + nodeid); + corosync_cfg_kill_node(ch, nodeid, "dlm_controld"); + } +} + static void shutdown_callback(corosync_cfg_handle_t h, corosync_cfg_shutdown_flags_t flags) {

1 0

cluster: STABLE3 - gfs_controld: watch cluster membership
by David Teigland 15 Oct '09

15 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=62… Commit: 622002d75df7bb067bca51f46731b89f2104b65a Parent: f9ac100b614db85cab250d395d8999eba650438e Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Oct 15 12:52:51 2009 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Oct 15 12:52:51 2009 -0500 gfs_controld: watch cluster membership Keep track of cluster membership changes so we can call the recently added node_history_cluster_{add,remove}. Copied from dlm_controld. Signed-off-by: David Teigland <teigland(a)redhat.com> --- group/dlm_controld/main.c | 2 +- group/gfs_controld/gfs_daemon.h | 2 +- group/gfs_controld/main.c | 3 +- group/gfs_controld/member_cman.c | 91 ++++++++++++++++++++++++++++++++++++- group/gfs_controld/member_pcmk.c | 6 ++- 5 files changed, 97 insertions(+), 7 deletions(-) diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c index 12e2592..712bed6 100644 --- a/group/dlm_controld/main.c +++ b/group/dlm_controld/main.c @@ -902,7 +902,7 @@ static void loop(void) setup_monitor(); - rv = setup_configfs(); + rv = setup_configfs(); /* calls update_cluster() */ if (rv < 0) goto out; diff --git a/group/gfs_controld/gfs_daemon.h b/group/gfs_controld/gfs_daemon.h index a69385b..af7ed45 100644 --- a/group/gfs_controld/gfs_daemon.h +++ b/group/gfs_controld/gfs_daemon.h @@ -70,7 +70,6 @@ extern int poll_ignore_plock; extern int plock_fd; extern int plock_ci; extern struct list_head mountgroups; -extern int cluster_quorate; extern int our_nodeid; extern char *clustername; extern char daemon_debug_buf[256]; @@ -299,6 +298,7 @@ void cluster_dead(int ci); int setup_cluster(void); void close_cluster(void); void process_cluster(int ci); +void update_cluster(void); void kick_node_from_cluster(int nodeid); /* plock.c */ diff --git a/group/gfs_controld/main.c b/group/gfs_controld/main.c index 30f44eb..1ca45de 100644 --- a/group/gfs_controld/main.c +++ b/group/gfs_controld/main.c @@ -1136,6 +1136,8 @@ static void loop(void) goto out; client_add(rv, process_cluster, cluster_dead); + update_cluster(); + rv = setup_ccs(); if (rv < 0) goto out; @@ -1565,7 +1567,6 @@ int poll_dlm; int plock_fd; int plock_ci; struct list_head mountgroups; -int cluster_quorate; int our_nodeid; char *clustername; char daemon_debug_buf[256]; diff --git a/group/gfs_controld/member_cman.c b/group/gfs_controld/member_cman.c index 0f78097..277a11e 100644 --- a/group/gfs_controld/member_cman.c +++ b/group/gfs_controld/member_cman.c @@ -2,9 +2,13 @@ #include "config.h" #include <libcman.h> -static cman_handle_t ch; -static cman_handle_t ch_admin; -static cman_cluster_t cluster; +static cman_handle_t ch; +static cman_handle_t ch_admin; +static cman_cluster_t cluster; +static cman_node_t old_nodes[MAX_NODES]; +static int old_node_count; +static cman_node_t cman_nodes[MAX_NODES]; +static int cman_node_count; void kick_node_from_cluster(int nodeid) { @@ -18,6 +22,73 @@ void kick_node_from_cluster(int nodeid) } } +static int is_member(cman_node_t *node_list, int count, int nodeid) +{ + int i; + + for (i = 0; i < count; i++) { + if (node_list[i].cn_nodeid == nodeid) + return node_list[i].cn_member; + } + return 0; +} + +static int is_old_member(int nodeid) +{ + return is_member(old_nodes, old_node_count, nodeid); +} + +static int is_cluster_member(int nodeid) +{ + return is_member(cman_nodes, cman_node_count, nodeid); +} + +static void statechange(void) +{ + int i, rv; + + old_node_count = cman_node_count; + memcpy(&old_nodes, &cman_nodes, sizeof(old_nodes)); + + cman_node_count = 0; + memset(&cman_nodes, 0, sizeof(cman_nodes)); + rv = cman_get_nodes(ch, MAX_NODES, &cman_node_count, cman_nodes); + if (rv < 0) { + log_debug("cman_get_nodes error %d %d", rv, errno); + return; + } + + /* Never allow node ID 0 to be considered a member #315711 */ + for (i = 0; i < cman_node_count; i++) { + if (cman_nodes[i].cn_nodeid == 0) { + cman_nodes[i].cn_member = 0; + break; + } + } + + for (i = 0; i < old_node_count; i++) { + if (old_nodes[i].cn_member && + !is_cluster_member(old_nodes[i].cn_nodeid)) { + + log_debug("cluster node %d removed", + old_nodes[i].cn_nodeid); + + node_history_cluster_remove(old_nodes[i].cn_nodeid); + } + } + + for (i = 0; i < cman_node_count; i++) { + if (cman_nodes[i].cn_member && + !is_old_member(cman_nodes[i].cn_nodeid)) { + + log_debug("cluster node %d added", + cman_nodes[i].cn_nodeid); + + node_history_cluster_add(cman_nodes[i].cn_nodeid); + } + } +} + static void cman_callback(cman_handle_t h, void *private, int reason, int arg) { switch (reason) { @@ -29,6 +100,9 @@ static void cman_callback(cman_handle_t h, void *private, int reason, int arg) cman_replyto_shutdown(ch, 0); } break; + case CMAN_REASON_STATECHANGE: + statechange(); + break; case CMAN_REASON_CONFIG_UPDATE: setup_logging(); setup_ccs(); @@ -115,6 +189,11 @@ int setup_cluster(void) goto out; } our_nodeid = node.cn_nodeid; + + old_node_count = 0; + memset(&old_nodes, 0, sizeof(old_nodes)); + cman_node_count = 0; + memset(&cman_nodes, 0, sizeof(cman_nodes)); out: return fd; } @@ -125,3 +204,9 @@ void close_cluster(void) cman_finish(ch_admin); } +/* Force re-read of cman nodes */ +void update_cluster(void) +{ + statechange(); +} + diff --git a/group/gfs_controld/member_pcmk.c b/group/gfs_controld/member_pcmk.c index 88e5528..580e137 100644 --- a/group/gfs_controld/member_pcmk.c +++ b/group/gfs_controld/member_pcmk.c @@ -59,7 +59,11 @@ void kick_node_from_cluster(int nodeid) void process_cluster(int ci) { ais_dispatch(ais_fd_async, NULL); - cluster_quorate = crm_have_quorum; + /* cluster_quorate = crm_have_quorum; */ +} + +void update_cluster(void) +{ } int setup_cluster(void)

1 0

cluster: RHEL55 - fence_scsi_test: add debug information
by rohara 15 Oct '09

15 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5c… Commit: 5c328396a61fd828c939fa3eea25b763093d0ba1 Parent: 5fb3efb518b2be4e7f3cd141e1643cb449b8a9c5 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Thu Oct 15 09:29:06 2009 -0500 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Thu Oct 15 09:29:06 2009 -0500 fence_scsi_test: add debug information When using the debug (-d) option, print out extra information such as the actual sg_persist command being invoked to register and unregister a key/device. rhbz#516763 --- fence/agents/scsi/fence_scsi_test.pl | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/fence/agents/scsi/fence_scsi_test.pl b/fence/agents/scsi/fence_scsi_test.pl index 59e65f9..65e0c30 100755 --- a/fence/agents/scsi/fence_scsi_test.pl +++ b/fence/agents/scsi/fence_scsi_test.pl @@ -16,6 +16,8 @@ $BUILD_DATE=""; sub get_scsi_block_devices { + print "[debug] get_scsi_block_devices\n" if ($opt_d); + my $block_dir = "/sys/block"; opendir(DIR, $block_dir) or die "$!\n"; @@ -26,12 +28,16 @@ sub get_scsi_block_devices for $block_dev (@block_devices) { + print "[debug] \t device = $block_dev\n" if ($opt_d); + push(@devices, "/dev/" . $block_dev); } } sub get_cluster_vol_devices { + print "[debug] get_cluster_vol_devices\n" if ($opt_d); + my ($in, $out, $err); my $cmd = "vgs --config 'global { locking_type = 0 }'" . @@ -51,8 +57,7 @@ sub get_cluster_vol_devices if ($vg_attr =~ /.*c$/) { - ###### DEBUG ###### - print "DEBUG: pv_name = $pv_name\n"; + print "[debug] \t device = $pv_name\n" if ($opt_d); push(@devices, $pv_name); } @@ -68,7 +73,12 @@ sub register_device my ($dev, $key) = @_; my ($in, $out, $err); + print "[debug] register_device (device=$dev, key=$key)\n" if ($opt_d); + my $cmd = "sg_persist -n -d $dev -o -G -S $key"; + + print "[debug] \t cmd = $cmd\n" if ($opt_d); + my $pid = open3($in, $out, $err, $cmd) or die "$!\n"; waitpid($pid, 0); @@ -85,7 +95,12 @@ sub unregister_device my ($dev, $key) = @_; my ($in, $out, $err); + print "[debug] unregister_device (device=$dev, key=$key)\n" if ($opt_d); + my $cmd = "sg_persist -n -d $dev -o -G -K $key -S 0"; + + print "[debug] \t cmd = $cmd\n" if ($opt_d); + my $pid = open3($in, $out, $err, $cmd) or die "$!\n"; waitpid($pid, 0); @@ -99,7 +114,7 @@ sub unregister_device sub test_devices { - my $key = "0xDEADBEEF"; + my $key = "0x1"; foreach $dev (@devices) {

1 0

cluster: RHEL55 - cman: make cman_tool leave remove work even when no services are running.
by Christine Caulfield 15 Oct '09

15 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5f… Commit: 5fb3efb518b2be4e7f3cd141e1643cb449b8a9c5 Parent: 7d9a687e70599b6473d75e7868480b6e9e9d9210 Author: Christine Caulfield <ccaulfie(a)redhat.com> AuthorDate: Tue Jul 28 08:46:36 2009 +0100 Committer: Christine Caulfield <ccaulfie(a)redhat.com> CommitterDate: Thu Oct 15 08:18:07 2009 +0100 cman: make cman_tool leave remove work even when no services are running. cman_tool leave takes a shortcut internally if no services are listening for shutdown events. Unfortunately, a bug in this shortcut means that the leave flags gets lost, so quorum is not adjusted downwards. This patch fixes that shortcut. I should make it clear that 'leave remove' works fine if any cluster services are running. Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com> --- cman/daemon/commands.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c index 402efbb..29a9f1f 100644 --- a/cman/daemon/commands.c +++ b/cman/daemon/commands.c @@ -948,6 +948,13 @@ static int do_cmd_try_shutdown(struct connection *con, char *cmdbuf) /* If no-one is listening for events then we can just go down now */ if (shutdown_expected == 0) { send_leave(CLUSTER_LEAVEFLAG_DOWN); + int leaveflags = CLUSTER_LEAVEFLAG_DOWN; + + quit_threads = 1; + if (shutdown_flags & SHUTDOWN_REMOVE) + leaveflags |= CLUSTER_LEAVEFLAG_REMOVED; + + send_leave(leaveflags); return 0; } else {

1 0

resource-agents: master - rgmanager: Fix path evaluation during force unmount
by Lon Hohberger 14 Oct '09

14 Oct '09

Gitweb: http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a… Commit: 4a40540b1fb78e831d78443b40ea591c8ff581e6 Parent: 4bc3bf746808a36bf852f2bdceec9103abbe8abe Author: Marc Milgram <mmilgram(a)redhat.com> AuthorDate: Wed Oct 14 17:15:47 2009 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Wed Oct 14 17:21:02 2009 -0400 rgmanager: Fix path evaluation during force unmount Resolves: rhbz514040 Signed-off-by: Marc Milgram <mmilgram(a)redhat.com> Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/fs.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/fs.sh.in b/rgmanager/src/resources/fs.sh.in index aa2f398..1cf8668 100644 --- a/rgmanager/src/resources/fs.sh.in +++ b/rgmanager/src/resources/fs.sh.in @@ -727,7 +727,7 @@ killMountProcesses() kill -TERM $pid fi done < <(lsof -bn 2>/dev/null | \ - grep -E "$mp(/.*|)\$" | \ + grep -E " $mp(/| |$)" | \ awk '{print $1,$2,$3}' | \ sort -u -k 1,3) elif [ -n "$have_fuser" ]; then

1 0

cluster: STABLE3 - rgmanager: Fix path evaluation during force unmount
by Lon Hohberger 14 Oct '09

14 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f9… Commit: f9ac100b614db85cab250d395d8999eba650438e Parent: 0caea07f1f8fb197b8c7a2d3b2b49aed65371a79 Author: Marc Milgram <mmilgram(a)redhat.com> AuthorDate: Wed Oct 14 17:15:47 2009 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Wed Oct 14 17:19:16 2009 -0400 rgmanager: Fix path evaluation during force unmount Resolves: rhbz514040 Signed-off-by: Marc Milgram <mmilgram(a)redhat.com> Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/fs.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/fs.sh.in b/rgmanager/src/resources/fs.sh.in index aa2f398..1cf8668 100644 --- a/rgmanager/src/resources/fs.sh.in +++ b/rgmanager/src/resources/fs.sh.in @@ -727,7 +727,7 @@ killMountProcesses() kill -TERM $pid fi done < <(lsof -bn 2>/dev/null | \ - grep -E "$mp(/.*|)\$" | \ + grep -E " $mp(/| |$)" | \ awk '{print $1,$2,$3}' | \ sort -u -k 1,3) elif [ -n "$have_fuser" ]; then

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits October 2009