February 2011 - cluster-commits - Fedora mailing-lists

fence-agents: master - build: fix build dependecy
by Fabio M. Di Nitto 28 Feb '11

28 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: e6c003fa751eeb958642fcf4c14d088c820a57e4 Parent: 375c5a7a4bfd5bc22152e2fe7de007997c63d0c9 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Mon Feb 28 21:52:05 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Mon Feb 28 21:52:05 2011 +0100 build: fix build dependecy when editing a file, the corresponding agent was not being regenerated because the make dependency was missing. Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- fence/agents/alom/Makefile.am | 4 +++- fence/agents/apc/Makefile.am | 4 +++- fence/agents/apc_snmp/Makefile.am | 4 +++- fence/agents/baytech/Makefile.am | 4 +++- fence/agents/bladecenter/Makefile.am | 4 +++- fence/agents/brocade/Makefile.am | 4 +++- fence/agents/bullpap/Makefile.am | 4 +++- fence/agents/cisco_mds/Makefile.am | 4 +++- fence/agents/cisco_ucs/Makefile.am | 4 +++- fence/agents/cpint/Makefile.am | 4 +++- fence/agents/drac/Makefile.am | 4 +++- fence/agents/drac5/Makefile.am | 4 +++- fence/agents/eaton_snmp/Makefile.am | 4 +++- fence/agents/egenera/Makefile.am | 4 +++- fence/agents/eps/Makefile.am | 4 +++- fence/agents/ibmblade/Makefile.am | 4 +++- fence/agents/ifmib/Makefile.am | 5 ++++- fence/agents/ilo/Makefile.am | 4 +++- fence/agents/ilo_mp/Makefile.am | 4 +++- fence/agents/intelmodular/Makefile.am | 4 +++- fence/agents/ldom/Makefile.am | 4 +++- fence/agents/lib/Makefile.am | 4 +++- fence/agents/lpar/Makefile.am | 4 +++- fence/agents/mcdata/Makefile.am | 4 +++- fence/agents/rhevm/Makefile.am | 4 +++- fence/agents/rsa/Makefile.am | 4 +++- fence/agents/rsb/Makefile.am | 4 +++- fence/agents/sanbox2/Makefile.am | 4 +++- fence/agents/scsi/Makefile.am | 4 +++- fence/agents/virsh/Makefile.am | 4 +++- fence/agents/vixel/Makefile.am | 4 +++- fence/agents/vmware/Makefile.am | 4 +++- fence/agents/wti/Makefile.am | 4 +++- fence/agents/xcat/Makefile.am | 4 +++- fence/agents/zvm/Makefile.am | 4 +++- make/fencebuild.mk | 2 +- 36 files changed, 107 insertions(+), 36 deletions(-) diff --git a/fence/agents/alom/Makefile.am b/fence/agents/alom/Makefile.am index f8781cd..972f8a9 100644 --- a/fence/agents/alom/Makefile.am +++ b/fence/agents/alom/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_alom -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/apc/Makefile.am b/fence/agents/apc/Makefile.am index e02de1e..355c873 100644 --- a/fence/agents/apc/Makefile.am +++ b/fence/agents/apc/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_apc -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/apc_snmp/Makefile.am b/fence/agents/apc_snmp/Makefile.am index ca75b75..65c24fd 100644 --- a/fence/agents/apc_snmp/Makefile.am +++ b/fence/agents/apc_snmp/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_apc_snmp -EXTRA_DIST = $(TARGET).py \ +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) \ powernet369.mib \ README diff --git a/fence/agents/baytech/Makefile.am b/fence/agents/baytech/Makefile.am index afd0be6..9ad50ec 100644 --- a/fence/agents/baytech/Makefile.am +++ b/fence/agents/baytech/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_baytech -EXTRA_DIST = $(TARGET).pl +SRC = $(TARGET).pl + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/bladecenter/Makefile.am b/fence/agents/bladecenter/Makefile.am index 6fef8a8..d910196 100644 --- a/fence/agents/bladecenter/Makefile.am +++ b/fence/agents/bladecenter/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_bladecenter -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/brocade/Makefile.am b/fence/agents/brocade/Makefile.am index 5ec24ef..f4281ab 100644 --- a/fence/agents/brocade/Makefile.am +++ b/fence/agents/brocade/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_brocade -EXTRA_DIST = $(TARGET).pl +SRC = $(TARGET).pl + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/bullpap/Makefile.am b/fence/agents/bullpap/Makefile.am index bd06cbf..a708d4f 100644 --- a/fence/agents/bullpap/Makefile.am +++ b/fence/agents/bullpap/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_bullpap -EXTRA_DIST = $(TARGET).pl +SRC = $(TARGET).pl + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/cisco_mds/Makefile.am b/fence/agents/cisco_mds/Makefile.am index ce1d67c..3d262f6 100644 --- a/fence/agents/cisco_mds/Makefile.am +++ b/fence/agents/cisco_mds/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_cisco_mds -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/cisco_ucs/Makefile.am b/fence/agents/cisco_ucs/Makefile.am index 9d8ec54..c12e5ef 100644 --- a/fence/agents/cisco_ucs/Makefile.am +++ b/fence/agents/cisco_ucs/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_cisco_ucs -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/cpint/Makefile.am b/fence/agents/cpint/Makefile.am index 9e86293..c02480a 100644 --- a/fence/agents/cpint/Makefile.am +++ b/fence/agents/cpint/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_cpint -EXTRA_DIST = $(TARGET).pl +SRC = $(TARGET).pl + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/drac/Makefile.am b/fence/agents/drac/Makefile.am index 504a329..0a7de40 100644 --- a/fence/agents/drac/Makefile.am +++ b/fence/agents/drac/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_drac -EXTRA_DIST = $(TARGET).pl +SRC = $(TARGET).pl + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/drac5/Makefile.am b/fence/agents/drac5/Makefile.am index 80d523c..2654360 100644 --- a/fence/agents/drac5/Makefile.am +++ b/fence/agents/drac5/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_drac5 -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/eaton_snmp/Makefile.am b/fence/agents/eaton_snmp/Makefile.am index 3c0ed3b..0390800 100644 --- a/fence/agents/eaton_snmp/Makefile.am +++ b/fence/agents/eaton_snmp/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_eaton_snmp -EXTRA_DIST = $(TARGET).py \ +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) \ README sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/egenera/Makefile.am b/fence/agents/egenera/Makefile.am index 74b27a8..5cbb555 100644 --- a/fence/agents/egenera/Makefile.am +++ b/fence/agents/egenera/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_egenera -EXTRA_DIST = $(TARGET).pl +SRC = $(TARGET).pl + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/eps/Makefile.am b/fence/agents/eps/Makefile.am index 288dab9..59fdd07 100644 --- a/fence/agents/eps/Makefile.am +++ b/fence/agents/eps/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_eps -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/ibmblade/Makefile.am b/fence/agents/ibmblade/Makefile.am index 83131b7..f1c94de 100644 --- a/fence/agents/ibmblade/Makefile.am +++ b/fence/agents/ibmblade/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_ibmblade -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/ifmib/Makefile.am b/fence/agents/ifmib/Makefile.am index d188e31..a07f264 100644 --- a/fence/agents/ifmib/Makefile.am +++ b/fence/agents/ifmib/Makefile.am @@ -2,7 +2,10 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_ifmib -EXTRA_DIST = $(TARGET).py README +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) \ + README sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/ilo/Makefile.am b/fence/agents/ilo/Makefile.am index 3808112..7b44f59 100644 --- a/fence/agents/ilo/Makefile.am +++ b/fence/agents/ilo/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_ilo -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/ilo_mp/Makefile.am b/fence/agents/ilo_mp/Makefile.am index 854ebc8..4e8b18e 100644 --- a/fence/agents/ilo_mp/Makefile.am +++ b/fence/agents/ilo_mp/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_ilo_mp -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/intelmodular/Makefile.am b/fence/agents/intelmodular/Makefile.am index 14c56c6..f1e4690 100644 --- a/fence/agents/intelmodular/Makefile.am +++ b/fence/agents/intelmodular/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_intelmodular -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/ldom/Makefile.am b/fence/agents/ldom/Makefile.am index a127da4..a229934 100644 --- a/fence/agents/ldom/Makefile.am +++ b/fence/agents/ldom/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_ldom -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/lib/Makefile.am b/fence/agents/lib/Makefile.am index ba25f6b..b42fc12 100644 --- a/fence/agents/lib/Makefile.am +++ b/fence/agents/lib/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fencing.py fencing_snmp.py -EXTRA_DIST = fencing.py.py fencing_snmp.py.py fence2man.xsl +SRC = fencing.py.py fencing_snmp.py.py + +EXTRA_DIST = $(SRC) fence2man.xsl fencelibdir = ${FENCEAGENTSLIBDIR} diff --git a/fence/agents/lpar/Makefile.am b/fence/agents/lpar/Makefile.am index 1f72461..2af387c 100644 --- a/fence/agents/lpar/Makefile.am +++ b/fence/agents/lpar/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_lpar -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/mcdata/Makefile.am b/fence/agents/mcdata/Makefile.am index e87f26d..f9953f5 100644 --- a/fence/agents/mcdata/Makefile.am +++ b/fence/agents/mcdata/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_mcdata -EXTRA_DIST = $(TARGET).pl +SRC = $(TARGET).pl + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/rhevm/Makefile.am b/fence/agents/rhevm/Makefile.am index cd6222f..9552181 100644 --- a/fence/agents/rhevm/Makefile.am +++ b/fence/agents/rhevm/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_rhevm -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/rsa/Makefile.am b/fence/agents/rsa/Makefile.am index 7280c45..4bf1f1f 100644 --- a/fence/agents/rsa/Makefile.am +++ b/fence/agents/rsa/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_rsa -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/rsb/Makefile.am b/fence/agents/rsb/Makefile.am index c52b8d4..e8193be 100644 --- a/fence/agents/rsb/Makefile.am +++ b/fence/agents/rsb/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_rsb -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/sanbox2/Makefile.am b/fence/agents/sanbox2/Makefile.am index 5399d9f..9564bc8 100644 --- a/fence/agents/sanbox2/Makefile.am +++ b/fence/agents/sanbox2/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_sanbox2 -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/scsi/Makefile.am b/fence/agents/scsi/Makefile.am index ca87492..ea4d6c1 100644 --- a/fence/agents/scsi/Makefile.am +++ b/fence/agents/scsi/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_scsi -EXTRA_DIST = $(TARGET).pl +SRC = $(TARGET).pl + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/virsh/Makefile.am b/fence/agents/virsh/Makefile.am index 8d4327c..0f12744 100644 --- a/fence/agents/virsh/Makefile.am +++ b/fence/agents/virsh/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_virsh -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/vixel/Makefile.am b/fence/agents/vixel/Makefile.am index 91d7277..f3e1339 100644 --- a/fence/agents/vixel/Makefile.am +++ b/fence/agents/vixel/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_vixel -EXTRA_DIST = $(TARGET).pl +SRC = $(TARGET).pl + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/vmware/Makefile.am b/fence/agents/vmware/Makefile.am index c8c3ff8..9f41c0d 100644 --- a/fence/agents/vmware/Makefile.am +++ b/fence/agents/vmware/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_vmware fence_vmware_helper -EXTRA_DIST = fence_vmware.py fence_vmware_helper.pl +SRC = fence_vmware.py fence_vmware_helper.pl + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/wti/Makefile.am b/fence/agents/wti/Makefile.am index 60699c4..04f556c 100644 --- a/fence/agents/wti/Makefile.am +++ b/fence/agents/wti/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_wti -EXTRA_DIST = $(TARGET).py +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/xcat/Makefile.am b/fence/agents/xcat/Makefile.am index 2f7f446..de54526 100644 --- a/fence/agents/xcat/Makefile.am +++ b/fence/agents/xcat/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_xcat -EXTRA_DIST = $(TARGET).pl +SRC = $(TARGET).pl + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/fence/agents/zvm/Makefile.am b/fence/agents/zvm/Makefile.am index dfbeb35..a75cf66 100644 --- a/fence/agents/zvm/Makefile.am +++ b/fence/agents/zvm/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_zvm -EXTRA_DIST = $(TARGET).pl +SRC = $(TARGET).pl + +EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) diff --git a/make/fencebuild.mk b/make/fencebuild.mk index 5da3128..4a75366 100644 --- a/make/fencebuild.mk +++ b/make/fencebuild.mk @@ -1,4 +1,4 @@ -$(TARGET): +$(TARGET): $(SRC) bash $(top_srcdir)/scripts/fenceparse \ $(top_srcdir)/make/copyright.cf REDHAT_COPYRIGHT \ $(VERSION) \

1 0

fence-agents: master - build: fence_ipmilan does not need PYTHONPATH to generate manpage
by Fabio M. Di Nitto 28 Feb '11

28 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 375c5a7a4bfd5bc22152e2fe7de007997c63d0c9 Parent: b3bc050b5f80153363d6f765cd6fd17af527bdc0 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Mon Feb 28 21:51:38 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Mon Feb 28 21:51:38 2011 +0100 build: fence_ipmilan does not need PYTHONPATH to generate manpage Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- fence/agents/ipmilan/Makefile.am | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/fence/agents/ipmilan/Makefile.am b/fence/agents/ipmilan/Makefile.am index e2785e2..4868dc6 100644 --- a/fence/agents/ipmilan/Makefile.am +++ b/fence/agents/ipmilan/Makefile.am @@ -10,7 +10,6 @@ man_MANS = fence_ipmilan.8 fence_ipmilan.8: fence_ipmilan $(top_srcdir)/fence/agents/lib/fence2man.xsl set -e && \ - PYTHONPATH=$(top_srcdir)/fence/agents/lib:$(top_builddir)/fence/agents/lib \ ./$^ -o metadata > .$@.tmp && \ xsltproc $(top_srcdir)/fence/agents/lib/fence2man.xsl .$@.tmp > $@

1 0

fence-agents: master - build: make ready for watchdog integration script
by Fabio M. Di Nitto 28 Feb '11

28 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: b3bc050b5f80153363d6f765cd6fd17af527bdc0 Parent: 5bee71f95ec9f1c6a1486fe7f16ddeda32865b1d Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Mon Feb 28 21:51:08 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Mon Feb 28 21:51:08 2011 +0100 build: make ready for watchdog integration script Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- configure.ac | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index f1ad0ef..9b13a98 100644 --- a/configure.ac +++ b/configure.ac @@ -133,6 +133,7 @@ AC_ARG_WITH([default-config-file], LOGDIR=${localstatedir}/log/cluster CLUSTERVARRUN=${localstatedir}/run/cluster +CLUSTERDATA=${datadir}/cluster ## do subst @@ -152,6 +153,7 @@ AC_SUBST([CLUSTERVARRUN]) AC_DEFINE_UNQUOTED([CLUSTERVARRUN], "$(eval echo ${CLUSTERVARRUN})", [Default cluster var/run directory]) +AC_SUBST([CLUSTERDATA]) AC_SUBST([FENCEAGENTSLIBDIR]) AC_SUBST([SNMPBIN])

1 0

cluster: RHEL6 - config: stop leaking memory on config reload
by Fabio M. Di Nitto 28 Feb '11

28 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=67… Commit: 678661a05b1c5bb1ab81515ea97e3102d9e3f18c Parent: 4eb20ad9f8e62d0739c7897d79bc1bccb94e5250 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Thu Feb 24 15:04:31 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Mon Feb 28 12:49:31 2011 +0100 config: stop leaking memory on config reload Resolves: rhbz#680155 Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- config/plugins/xml/config.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/config/plugins/xml/config.c b/config/plugins/xml/config.c index 1db23da..7dcf8ba 100644 --- a/config/plugins/xml/config.c +++ b/config/plugins/xml/config.c @@ -142,7 +142,5 @@ fail: if (doc) xmlFreeDoc(doc); - xmlCleanupParser(); - return err; }

1 0

cluster: RHEL57 - fence_wti: Unable to parse output when splitted into several screens
by Marek Grác 25 Feb '11

25 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b1… Commit: b1dc0488fadd12866edd79433e52be33e8b7fd80 Parent: f71c978b9e467b40abf4cf692a636956c827e60f Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Feb 21 19:42:18 2011 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Fri Feb 25 10:13:02 2011 +0100 fence_wti: Unable to parse output when splitted into several screens Parsing of listing that consists of several screens added. Resolves: rhbz#679160 --- fence/agents/wti/fence_wti.py | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index 5749f76..b980d41 100755 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -23,9 +23,26 @@ BUILD_DATE="" #END_VERSION_GENERATION def get_power_status(conn, options): - try: + listing = "" + + try: + conn.send("/S"+"\r\n") + + if isinstance(options["-c"], list): + re_all = options["-c"] + else: + re_all = [options["-c"]] + re_next = re.compile("Enter: ", re.IGNORECASE) + re_all.append(re_next) + conn.send("/S"+"\r\n") - conn.log_expect(options, options["-c"], int(options["-Y"])) + result = conn.log_expect(options, re_all, int(options["-Y"])) + listing = conn.before + if result == (len(re_all) - 1): + conn.send("\r\n") + conn.log_expect(options, options["-c"], int(options["-Y"])) + listing += conn.before + except pexpect.EOF: fail(EC_CONNECTION_LOST) except pexpect.TIMEOUT: @@ -33,8 +50,8 @@ def get_power_status(conn, options): plug_section = 0 outlets = {} - for line in conn.before.splitlines(): - if (plug_section == 2) and line.find("|") >= 0: + for line in listing.splitlines(): + if (plug_section == 2) and line.find("|") >= 0 and line.startswith("PLUG") == False: plug_line = [x.strip().lower() for x in line.split("|")] if len(plug_line) < len(plug_header): plug_section = -1 @@ -43,7 +60,8 @@ def get_power_status(conn, options): return plug_line[status_index] else: ## We already believe that first column contains plug number - outlets[plug_line[0]] = (plug_line[name_index], plug_line[status_index]) + if len(plug_line[0]) != 0: + outlets[plug_line[0]] = (plug_line[name_index], plug_line[status_index]) elif (plug_section == 1): plug_section = 2 pass

1 0

cluster: RHEL57 - fence_ipmilan: Add "diag" option to support "ipmitool chassis power diag"
by Marek Grác 25 Feb '11

25 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f7… Commit: f71c978b9e467b40abf4cf692a636956c827e60f Parent: 2d4b69c5caab8afe96d35506da9829a6f921cb94 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Thu Jan 13 14:07:50 2011 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Fri Feb 25 10:11:16 2011 +0100 fence_ipmilan: Add "diag" option to support "ipmitool chassis power diag" Resolves: rhbz#678061 --- fence/agents/ipmilan/ipmilan.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/fence/agents/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c index 2f46078..4371143 100644 --- a/fence/agents/ipmilan/ipmilan.c +++ b/fence/agents/ipmilan/ipmilan.c @@ -52,6 +52,7 @@ do { \ #define ST_POWEROFF 2 #define ST_GENERIC_RESET 3 #define ST_CYCLE 4 +#define ST_DIAG 5 #define DEFAULT_TIMEOUT 20 #define DEFAULT_POWER_WAIT 2 @@ -198,7 +199,7 @@ struct xml_parameter_s xml_parameters[]={ {"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"}, + {"action","-o",0,"string","reboot","Operation to perform. Valid operations: on, off, reboot, status, list, diag, 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)"}, @@ -337,6 +338,10 @@ build_cmd(char *command, size_t cmdlen, struct ipmi *ipmi, int op) snprintf(arg, sizeof(arg), "%s chassis power cycle", cmd); break; + case ST_DIAG: + snprintf(arg, sizeof(arg), + "%s chassis power diag", cmd); + break; } strncpy(command, arg, cmdlen); @@ -554,6 +559,16 @@ ipmi_cycle(struct ipmi *ipmi) return ret; } +static int +ipmi_diag(struct ipmi *ipmi) +{ + int ret; + + ret = ipmi_op(ipmi, ST_DIAG, power_off_complete); + + return ret; +} + /** Squash all our private data @@ -1068,7 +1083,8 @@ printf(" -S <path> Script to retrieve password (if required)\n"); printf(" -l <login> Username/Login (if required) to control power\n" " on IPMI device\n"); printf(" -o <op> Operation to perform.\n"); -printf(" Valid operations: on, off, reboot, status, list or monitor\n"); +printf(" Valid operations: on, off, reboot, status,\n"); +printf(" diag, list or monitor\n"); printf(" -t <timeout> Timeout (sec) for IPMI operation (default %d)\n",DEFAULT_TIMEOUT); printf(" -T <timeout> Wait X seconds after on/off operation\n"); printf(" -f <timeout> Wait X seconds before fencing is started\n"); @@ -1136,6 +1152,7 @@ void print_xml_metadata(char *pname) { 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", "diag"); printf("\t<action name=\"%s\" />\n", "list"); printf("\t<action name=\"%s\" />\n", "monitor"); printf("\t<action name=\"%s\" />\n", "metadata"); @@ -1308,9 +1325,9 @@ main(int argc, char **argv) if (strcasecmp(op, "off") && strcasecmp(op, "on") && strcasecmp(op, "status") && strcasecmp(op, "reboot") && strcasecmp(op, "monitor") && strcasecmp(op, "list") && - strcasecmp(op, "metadata")) { + strcasecmp(op, "metadata") && strcasecmp(op, "diag")) { fail_exit("operation must be 'on', 'off', 'status', " - "'reboot', 'list', 'monitor' or 'metadata'"); + "'reboot', 'diag', 'list', 'monitor' or 'metadata'"); } if (strlen(authtype) && @@ -1408,6 +1425,12 @@ main(int argc, char **argv) ret=0; translated_ret = ERR_OK; print_final_status=0; + } else if (!strcasecmp(op, "diag")) { + printf("Pulsing diagnostic interrupt to machine @ IPMI:%s...", ip); + fflush(stdout); + ret = ipmi_diag(i); + translated_ret = (ret==0?ERR_ON_SUCCESSFUL:ERR_ON_FAIL); + ret = 0; }

1 0

cluster: RHEL57 - fence agents: add XSLT template
by Marek Grác 25 Feb '11

25 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=2d… Commit: 2d4b69c5caab8afe96d35506da9829a6f921cb94 Parent: 53fce21aa1b568e3ae65393f1fbce826a3d5c7ef Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Wed Feb 16 18:18:31 2011 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Fri Feb 25 10:04:59 2011 +0100 fence agents: add XSLT template --- fence/agents/lib/fence2man.xsl | 53 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/fence/agents/lib/fence2man.xsl b/fence/agents/lib/fence2man.xsl new file mode 100644 index 0000000..563b3a4 --- /dev/null +++ b/fence/agents/lib/fence2man.xsl @@ -0,0 +1,53 @@ +<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-10-20 "<xsl:value-of select="@name"/> (Fence Agent)" +.SH NAME +<xsl:value-of select="@name" /> - <xsl:value-of select="@shortdesc" /> +.SH DESCRIPTION +.P +<xsl:value-of select="longdesc"/> +.P +<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:if test="vendor-url"> +Vendor URL: <xsl:value-of select="vendor-url" /> +</xsl:if> +.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>

1 0

cluster: RHEL57 - library: Metadata are not correct if agent does not support on/off
by Marek Grác 25 Feb '11

25 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=53… Commit: 53fce21aa1b568e3ae65393f1fbce826a3d5c7ef Parent: ae7be075867909d08ec2bfbae8a7847a1a838580 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 25 16:57:00 2010 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Fri Feb 25 10:04:48 2011 +0100 library: Metadata are not correct if agent does not support on/off Metadata actions are generated according to option io_fencing. Currently only fence_sanbox is affected as fence_ifmib accepts both enable/disable and on/off (so io_fencing is not used) Resolves: rhbz#488959 --- fence/agents/lib/fencing.py.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index be2a44e..de8bd90 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -487,9 +487,14 @@ def metadata(avail_opt, options, docs): print "\t</parameter>" print "</parameters>" print "<actions>" - print "\t<action name=\"on\" />" - print "\t<action name=\"off\" />" - print "\t<action name=\"reboot\" />" + if avail_opt.count("io_fencing") == 0: + print "\t<action name=\"on\" />" + print "\t<action name=\"off\" />" + print "\t<action name=\"reboot\" />" + else: + print "\t<action name=\"enable\" />" + print "\t<action name=\"disable\" />" + print "\t<action name=\"status\" />" print "\t<action name=\"list\" />" print "\t<action name=\"monitor\" />"

1 0

cluster: RHEL57 - fence-agents: Automatic generation of manual pages
by Marek Grác 25 Feb '11

25 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ae… Commit: ae7be075867909d08ec2bfbae8a7847a1a838580 Parent: 56b618c99947d457579c6bc9f0a1de4aae329595 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Wed Feb 16 17:04:51 2011 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Fri Feb 25 10:04:19 2011 +0100 fence-agents: Automatic generation of manual pages Change build system to create manual pages directly from fence agents. Resolves: rhbz#488959 --- fence/agents/apc/Makefile | 10 +- fence/agents/apc_snmp/Makefile | 10 +- fence/agents/bladecenter/Makefile | 10 +- fence/agents/cisco_mds/Makefile | 10 +- fence/agents/cisco_ucs/Makefile | 10 +- fence/agents/drac/Makefile | 10 +- fence/agents/eps/Makefile | 10 +- fence/agents/ibmblade/Makefile | 18 ++- fence/agents/ifmib/Makefile | 10 +- fence/agents/ilo/Makefile | 10 +- fence/agents/ilo_mp/Makefile | 10 +- fence/agents/ipmilan/Makefile | 15 ++- fence/agents/lpar/Makefile | 11 +- fence/agents/rhevm/Makefile | 10 +- fence/agents/rsa/Makefile | 10 +- fence/agents/sanbox2/Makefile | 10 +- fence/agents/virsh/Makefile | 10 +- fence/agents/vmware/Makefile | 10 +- fence/agents/wti/Makefile | 10 +- fence/make/defines.mk.input | 7 + fence/man/Makefile | 14 -- fence/man/fence_apc.8 | 99 ----------- fence/man/fence_bladecenter.8 | 96 ----------- fence/man/fence_cisco_mds.8 | 132 --------------- fence/man/fence_cisco_ucs.8 | 251 ---------------------------- fence/man/fence_eps.8 | 106 ------------ fence/man/fence_ibmblade.8 | 68 -------- fence/man/fence_ifmib.8 | 323 ------------------------------------- fence/man/fence_ilo.8 | 95 ----------- fence/man/fence_ipmilan.8 | 111 ------------- fence/man/fence_lpar.8 | 116 ------------- fence/man/fence_rsa.8 | 69 -------- fence/man/fence_sanbox2.8 | 83 ---------- fence/man/fence_vmware.8 | 137 ---------------- fence/man/fence_wti.8 | 84 ---------- 35 files changed, 168 insertions(+), 1827 deletions(-) diff --git a/fence/agents/apc/Makefile b/fence/agents/apc/Makefile index c33350a..a1f1570 100644 --- a/fence/agents/apc/Makefile +++ b/fence/agents/apc/Makefile @@ -13,11 +13,12 @@ SOURCE= fence_apc.py TARGET= fence_apc +MANTARGET= $(TARGET).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) +all: $(TARGET) $(MANTARGET) fence_apc: fence_apc.py : > $(TARGET) @@ -34,5 +35,10 @@ install: all fi install -m755 ${TARGET} ${sbindir} + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 + clean: - rm -f $(TARGET) + rm -f $(TARGET) $(MANTARGET) diff --git a/fence/agents/apc_snmp/Makefile b/fence/agents/apc_snmp/Makefile index 29a0df7..b10a9ab 100644 --- a/fence/agents/apc_snmp/Makefile +++ b/fence/agents/apc_snmp/Makefile @@ -14,11 +14,12 @@ SOURCE= fence_apc_snmp.py TARGET= fence_apc_snmp RESOURCE= powernet369.mib +MANTARGET= $(TARGET).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) +all: $(TARGET) $(MANTARGET) fence_apc_snmp: fence_apc_snmp.py : > $(TARGET) @@ -40,5 +41,10 @@ install: all fi install -m755 ${RESOURCE} ${mibdir} + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 + clean: - rm -f $(TARGET) + rm -f $(TARGET) $(MANTARGET) diff --git a/fence/agents/bladecenter/Makefile b/fence/agents/bladecenter/Makefile index 34dd24d..55f0164 100644 --- a/fence/agents/bladecenter/Makefile +++ b/fence/agents/bladecenter/Makefile @@ -13,11 +13,12 @@ SOURCE= fence_bladecenter.py TARGET= fence_bladecenter +MANTARGET= $(TARGET).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) +all: $(TARGET) $(MANTARGET) fence_bladecenter: fence_bladecenter.py : > $(TARGET) @@ -33,6 +34,11 @@ install: all install -d ${sbindir}; \ fi install -m755 ${TARGET} ${sbindir} + + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 clean: - rm -f $(TARGET) + rm -f $(TARGET) $(MANTARGET) diff --git a/fence/agents/cisco_mds/Makefile b/fence/agents/cisco_mds/Makefile index f61b83b..d53bbe4 100644 --- a/fence/agents/cisco_mds/Makefile +++ b/fence/agents/cisco_mds/Makefile @@ -13,11 +13,12 @@ SOURCE= fence_cisco_mds.py TARGET= fence_cisco_mds +MANTARGET= $(TARGET).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) +all: $(TARGET) $(MANTARGET) fence_cisco_mds: fence_cisco_mds.py : > $(TARGET) @@ -34,5 +35,10 @@ install: all fi install -m755 ${TARGET} ${sbindir} + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 + clean: - rm -f $(TARGET) + rm -f $(TARGET) $(MANTARGET) diff --git a/fence/agents/cisco_ucs/Makefile b/fence/agents/cisco_ucs/Makefile index 5875ba0..016a009 100644 --- a/fence/agents/cisco_ucs/Makefile +++ b/fence/agents/cisco_ucs/Makefile @@ -13,11 +13,12 @@ SOURCE= fence_cisco_ucs.py TARGET= fence_cisco_ucs +MANTARGET= $(TARGET).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) +all: $(TARGET) $(MANTARGET) fence_cisco_ucs: fence_cisco_ucs.py : > $(TARGET) @@ -34,5 +35,10 @@ install: all fi install -m755 ${TARGET} ${sbindir} + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 + clean: - rm -f $(TARGET) + rm -f $(TARGET) $(MANTARGET) diff --git a/fence/agents/drac/Makefile b/fence/agents/drac/Makefile index ce84f20..208748c 100644 --- a/fence/agents/drac/Makefile +++ b/fence/agents/drac/Makefile @@ -16,11 +16,12 @@ TARGET1= fence_drac SOURCE2= fence_drac5.py TARGET2= fence_drac5 +MANTARGET= $(TARGET2).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET1) $(TARGET2) +all: $(TARGET1) $(TARGET2) $(MANTARGET) fence_drac: fence_drac.pl : > $(TARGET1) @@ -46,5 +47,10 @@ install: all fi install -m755 ${TARGET1} ${TARGET2} ${sbindir} + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 + clean: - rm -f $(TARGET1) $(TARGET2) + rm -f $(TARGET1) $(TARGET2) $(MANTARGET) diff --git a/fence/agents/eps/Makefile b/fence/agents/eps/Makefile index 3e086c9..244f24c 100644 --- a/fence/agents/eps/Makefile +++ b/fence/agents/eps/Makefile @@ -13,11 +13,12 @@ SOURCE= fence_eps.py TARGET= fence_eps +MANTARGET= $(TARGET).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) +all: $(TARGET) $(MANTARGET) fence_eps: fence_eps.py : > $(TARGET) @@ -34,5 +35,10 @@ install: all fi install -m755 ${TARGET} ${sbindir} + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 + clean: - rm -f $(TARGET) + rm -f $(TARGET) $(MANTARGET) diff --git a/fence/agents/ibmblade/Makefile b/fence/agents/ibmblade/Makefile index ec8e62b..1f8b3de 100644 --- a/fence/agents/ibmblade/Makefile +++ b/fence/agents/ibmblade/Makefile @@ -13,18 +13,19 @@ SOURCE= fence_ibmblade.py TARGET= fence_ibmblade +MANTARGET= $(TARGET).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) +all: $(TARGET) $(MANTARGET) $(TARGET): $(SOURCE) : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) - ${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) - echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) + echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + ${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh REDHAT_COPYRIGHT >> $(TARGET) + echo "BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET) chmod +x $(TARGET) @@ -33,8 +34,11 @@ install: all install -d ${sbindir}; \ fi install -m755 ${TARGET} ${sbindir} + + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 clean: - rm -f $(TARGET) - - + rm -f $(TARGET) $(MANTARGET) diff --git a/fence/agents/ifmib/Makefile b/fence/agents/ifmib/Makefile index e564689..7a6a643 100644 --- a/fence/agents/ifmib/Makefile +++ b/fence/agents/ifmib/Makefile @@ -13,11 +13,12 @@ SOURCE= fence_ifmib.py TARGET= fence_ifmib +MANTARGET= $(TARGET).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) +all: $(TARGET) $(MANTARGET) fence_ifmib: $(SOURCE) : > $(TARGET) @@ -34,5 +35,10 @@ install: all fi install -m755 ${TARGET} ${sbindir} + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 + clean: - rm -f $(TARGET) + rm -f $(TARGET) $(MANTARGET) diff --git a/fence/agents/ilo/Makefile b/fence/agents/ilo/Makefile index 089266e..4e2f408 100644 --- a/fence/agents/ilo/Makefile +++ b/fence/agents/ilo/Makefile @@ -13,11 +13,12 @@ SOURCE= fence_ilo.py TARGET= fence_ilo +MANTARGET= $(TARGET).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) +all: $(TARGET) $(MANTARGET) fence_ilo: $(SOURCE) : > $(TARGET) @@ -33,6 +34,11 @@ install: all install -d ${sbindir}; \ fi install -m755 ${TARGET} ${sbindir} + + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 clean: - rm -f $(TARGET) + rm -f $(TARGET) $(MANTARGET) diff --git a/fence/agents/ilo_mp/Makefile b/fence/agents/ilo_mp/Makefile index f6e1ddf..aadf954 100644 --- a/fence/agents/ilo_mp/Makefile +++ b/fence/agents/ilo_mp/Makefile @@ -13,11 +13,12 @@ SOURCE= fence_ilo_mp.py TARGET= fence_ilo_mp +MANTARGET= $(TARGET).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) +all: $(TARGET) $(MANTARGET) fence_ilo_mp: $(SOURCE) : > $(TARGET) @@ -34,5 +35,10 @@ install: all fi install -m755 ${TARGET} ${sbindir} + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 + clean: - rm -f $(TARGET) + rm -f $(TARGET) $(MANTARGET) diff --git a/fence/agents/ipmilan/Makefile b/fence/agents/ipmilan/Makefile index 70b9f84..1c84ea3 100644 --- a/fence/agents/ipmilan/Makefile +++ b/fence/agents/ipmilan/Makefile @@ -12,6 +12,7 @@ ############################################################################### TARGET= fence_ipmilan +MANTARGETX= $(TARGET).8 fence_ipmilan_SOURCE= expect.c ipmilan.c @@ -25,16 +26,26 @@ include ${top_srcdir}/make/defines.mk CFLAGS+= -DFENCE_RELEASE_NAME=\"${RELEASE}\" -DFENCE -all: ${TARGET} +all: ${TARGET} $(MANTARGETX) fence_ipmilan: ${fence_ipmilan_SOURCE:.c=.o} ${CC} ${CFLAGS} ${LDFLAGS} ${fence_ipmilan_SOURCE:.c=.o} -o $@ +$(MANTARGETX): $(MANTARGETX:.8=) $(top_srcdir)/agents/lib/fence2man.xsl + set -e && \ + ./fence_ipmilan -o metadata > .$@.tmp && \ + xsltproc $(top_srcdir)/agents/lib/fence2man.xsl .$@.tmp > $@ + install: all if [ ! -d ${sbindir} ]; then \ install -d ${sbindir}; \ fi install -m755 ${TARGET} ${sbindir} + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGETX} ${mandir}/man8 + clean: - rm -f *.o ${TARGET} + rm -f *.o ${TARGET} $(MANTARGETX) diff --git a/fence/agents/lpar/Makefile b/fence/agents/lpar/Makefile index 142582a..059cb12 100644 --- a/fence/agents/lpar/Makefile +++ b/fence/agents/lpar/Makefile @@ -13,11 +13,12 @@ SOURCE= fence_lpar.py TARGET= fence_lpar +MANTARGET= $(TARGET).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) +all: $(TARGET) $(MANTARGET) fence_lpar: fence_lpar.py : > $(TARGET) @@ -34,5 +35,11 @@ install: all fi install -m755 ${TARGET} ${sbindir} + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 + + clean: - rm -f $(TARGET) + rm -f $(TARGET) $(MANTARGET) diff --git a/fence/agents/rhevm/Makefile b/fence/agents/rhevm/Makefile index 4315a91..d870c16 100644 --- a/fence/agents/rhevm/Makefile +++ b/fence/agents/rhevm/Makefile @@ -13,11 +13,12 @@ SOURCE= fence_rhevm.py TARGET= fence_rhevm +MANTARGET= $(TARGET).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) +all: $(TARGET) $(MANTARGET) fence_rhevm: $(SOURCE) : > $(TARGET) @@ -34,5 +35,10 @@ install: all fi install -m755 ${TARGET} ${sbindir} + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 + clean: - rm -f $(TARGET) + rm -f $(TARGET) $(MANTARGET) diff --git a/fence/agents/rsa/Makefile b/fence/agents/rsa/Makefile index 0b948cc..2288891 100644 --- a/fence/agents/rsa/Makefile +++ b/fence/agents/rsa/Makefile @@ -13,11 +13,12 @@ SOURCE= fence_rsa.py TARGET= fence_rsa +MANTARGET= $(TARGET).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) +all: $(TARGET) $(MANTARGET) fence_rsa: fence_rsa.py : > $(TARGET) @@ -34,5 +35,10 @@ install: all fi install -m755 ${TARGET} ${sbindir} + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 + clean: - rm -f $(TARGET) + rm -f $(TARGET) $(MANTARGET) diff --git a/fence/agents/sanbox2/Makefile b/fence/agents/sanbox2/Makefile index f6d84bb..cb5515f 100644 --- a/fence/agents/sanbox2/Makefile +++ b/fence/agents/sanbox2/Makefile @@ -13,11 +13,12 @@ SOURCE= fence_sanbox2.py TARGET= fence_sanbox2 +MANTARGET= $(TARGET).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) +all: $(TARGET) $(MANTARGET) $(TARGET): $(SOURCE) : > $(TARGET) @@ -34,7 +35,12 @@ install: all fi install -m755 ${TARGET} ${sbindir} + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 + clean: - rm -f $(TARGET) + rm -f $(TARGET) $(MANTARGET) diff --git a/fence/agents/virsh/Makefile b/fence/agents/virsh/Makefile index 45ca6bf..9e972aa 100644 --- a/fence/agents/virsh/Makefile +++ b/fence/agents/virsh/Makefile @@ -13,11 +13,12 @@ SOURCE= fence_virsh.py TARGET= fence_virsh +MANTARGET= $(TARGET).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) +all: $(TARGET) $(MANTARGET) fence_virsh: fence_virsh.py : > $(TARGET) @@ -34,6 +35,11 @@ install: all fi install -m755 ${TARGET} ${sbindir} + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 + clean: - rm -f $(TARGET) + rm -f $(TARGET) $(MANTARGET) diff --git a/fence/agents/vmware/Makefile b/fence/agents/vmware/Makefile index 1795e63..c893406 100644 --- a/fence/agents/vmware/Makefile +++ b/fence/agents/vmware/Makefile @@ -13,6 +13,7 @@ SOURCE= fence_vmware.py TARGET= fence_vmware +MANTARGET= $(TARGET).8 SOURCE2= fence_vmware_helper.pl TARGET2= fence_vmware_helper @@ -20,7 +21,7 @@ TARGET2= fence_vmware_helper top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) $(TARGET2) +all: $(TARGET) $(TARGET2) $(MANTARGET) $(TARGET): $(SOURCE) : > $(TARGET) @@ -46,7 +47,12 @@ install: all fi install -m755 ${TARGET} ${sbindir} install -m755 ${TARGET2} ${sbindir} + + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 clean: - rm -f $(TARGET) $(TARGET2) + rm -f $(TARGET) $(TARGET2) $(MANTARGET) diff --git a/fence/agents/wti/Makefile b/fence/agents/wti/Makefile index 73f42a4..ff8ca35 100644 --- a/fence/agents/wti/Makefile +++ b/fence/agents/wti/Makefile @@ -13,11 +13,12 @@ SOURCE= fence_wti.py TARGET= fence_wti +MANTARGET= $(TARGET).8 top_srcdir=../.. include ${top_srcdir}/make/defines.mk -all: $(TARGET) +all: $(TARGET) $(MANTARGET) $(TARGET): $(SOURCE) : > $(TARGET) @@ -33,7 +34,12 @@ install: all install -d ${sbindir}; \ fi install -m755 ${TARGET} ${sbindir} + + if [ ! -d ${mandir}/man8 ]; then \ + install -d ${mandir}/man8; \ + fi + install -m644 ${MANTARGET} ${mandir}/man8 clean: - rm -f $(TARGET) + rm -f $(TARGET) $(MANTARGET) diff --git a/fence/make/defines.mk.input b/fence/make/defines.mk.input index b270dea..4c5b40f 100644 --- a/fence/make/defines.mk.input +++ b/fence/make/defines.mk.input @@ -40,3 +40,10 @@ RANLIB = ranlib # Default CFLAGS CFLAGS += -Wall ${INCLUDE} + +$(MANTARGET): $(MANTARGET:.8=) $(top_srcdir)/agents/lib/fence2man.xsl + set -e && \ + PYTHONPATH=$(top_srcdir)/agents/lib \ + python $^ -o metadata > .$@.tmp && \ + xsltproc $(top_srcdir)/agents/lib/fence2man.xsl .$@.tmp > $@ + diff --git a/fence/man/Makefile b/fence/man/Makefile index ad64c0c..3ccc8e6 100644 --- a/fence/man/Makefile +++ b/fence/man/Makefile @@ -14,34 +14,20 @@ TARGET8= \ fence.8 \ fence_ack_manual.8 \ - fence_apc.8 \ - fence_rsa.8 \ - fence_bladecenter.8 \ fence_brocade.8 \ - fence_cisco_mds.8 \ fence_drac.8 \ fence_egenera.8 \ - fence_eps.8 \ - fence_ilo.8 \ - fence_lpar.8 \ fence_manual.8 \ fence_mcdata.8 \ fence_node.8 \ fence_rib.8 \ - fence_sanbox2.8 \ fence_scsi.8 \ fence_scsi_test.8 \ fence_tool.8 \ fence_vixel.8 \ - fence_wti.8 \ fence_bullpap.8 \ - fence_ipmilan.8 \ - fence_vmware.8 \ fence_xvm.8 \ fence_xvmd.8 \ - fence_cisco_ucs.8 \ - fence_ifmib.8 \ - fence_rhevm.8 \ fenced.8 UNINSTALL=${top_srcdir}/scripts/uninstall.pl diff --git a/fence/man/fence_apc.8 b/fence/man/fence_apc.8 deleted file mode 100644 index 45825dc..0000000 --- a/fence/man/fence_apc.8 +++ /dev/null @@ -1,99 +0,0 @@ -.\" Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. -.\" Copyright (C) 2004 Red Hat, Inc. All rights reserved. -.\" -.\" This copyrighted material is made available to anyone wishing to use, -.\" modify, copy, or redistribute it subject to the terms and conditions -.\" of the GNU General Public License v.2. - -.TH fence_apc 8 - -.SH NAME -fence_apc - I/O Fencing agent for APC MasterSwitch - -.SH SYNOPSIS -.B -fence_apc -[\fIOPTION\fR]... - -.SH DESCRIPTION -fence_apc is an I/O Fencing agent which can be used with the APC network -power switch. It logs into device via telnet/ssh and reboots a specified -outlet. Lengthy telnet/ssh connections should be avoided while a GFS -cluster is running because the connection will block any necessary -fencing actions. - -fence_apc accepts options on the command line as well as from stdin. -Fenced sends parameters through stdin when it execs the agent. fence_apc -can be run by itself with command line options. This is useful for testing -and for turning outlets on or off from scripts. - -.SH OPTIONS -.TP -\fB-a\fP \fIIPaddress\fR -IP address or hostname of the switch. -.TP -\fB-h\fP -Print out a help message describing available options, then exit. -.TP -\fB-l\fP \fIlogin\fR -Login name. -.TP -\fB-n\fP \fI[<switch>:]outlet\fR -The outlet number to act upon. -.TP -\fB-o\fP \fIaction\fR -The action required. Reboot (default), Status, Off or On. -.TP -\fB-p\fP \fIpassword\fR -Password for login or for passphrase. -.TP -\fB-S\fP \fIscript\fR -Script to run to retrieve password. -.TP -\fB-x\fP -Use secure connection over ssh (using version 1, cipher blowfish). -.TP -\fB-T\fP -Test only. Answer NO to the confirmation prompt instead of YES. -.TP -\fB-v\fP -Verbose. Record telnet session in /tmp/apclog. -.TP -\fB-V\fP -Print out a version message, then exit. - -.SH STDIN PARAMETERS -.TP -\fIagent = < param >\fR -This option is used by fence_node(8) and is ignored by fence_apc. -.TP -\fIipaddr = < hostname | ip >\fR -IP address or hostname of the switch. -.TP -\fIlogin = < param >\fR -Login name. -.TP -\fIoption = < param >\fR -The action required. Reboot (default), Off or On. -.TP -\fIpasswd = < param >\fR -Password for login or for passphrase. -\fIpasswd_script = < param >\fR -Script to run to retrieve password. -\fIsecure = < param >\fR -Use secure connection over ssh. -.TP -\fIport = < param >\fR -The outlet number to act upon. -.TP -\fIswitch = < param >\fR -The switch to operate on. Defaults to "1" if not specified. -.TP -\fItest = < param >\fR -Test only. Answer NO to the confirmation prompt instead of YES. -.TP -\fIverbose = < param >\fR -Verbose. Record telnet session in /tmp/apclog. - -.SH SEE ALSO -fence(8), fence_node(8) diff --git a/fence/man/fence_bladecenter.8 b/fence/man/fence_bladecenter.8 deleted file mode 100644 index 70c0b00..0000000 --- a/fence/man/fence_bladecenter.8 +++ /dev/null @@ -1,96 +0,0 @@ -.\" Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. -.\" Copyright (C) 2004 Red Hat, Inc. All rights reserved. -.\" -.\" This copyrighted material is made available to anyone wishing to use, -.\" modify, copy, or redistribute it subject to the terms and conditions -.\" of the GNU General Public License v.2. - -.TH fence_bladecenter 8 - -.SH NAME -fence_bladecenter - I/O Fencing agent for IBM Bladecenter - -.SH SYNOPSIS -.B -fence_bladecenter -[\fIOPTION\fR]... - -.SH DESCRIPTION -fence_bladecenter is an I/O Fencing agent which can be used with IBM -Bladecenters with recent enough firmware that includes telnet support. It -logs into a Brocade chasis via telnet or ssh and uses the command line -interface to power on and off blades. fence_bladecenter accepts options on -the command line or from stdin. - -.SH OPTIONS -.TP -\fB-a\fP \fIIPaddress\fP -IP address of the Bladecenter. -.TP -\fB-h\fP -Print out a help message describing available options, then exit. -.TP -\fB-l\fP \fIlogin\fP -Login name for the Bladecenter. -.TP -\fB-n\fP \fIblade\fP -The blade to operate on. -.TP -\fB-o\fP \fIaction\fP -The action required. Valid actions are on, off, reboot (default) and status. -.TP -\fB-p\fP \fIpassword\fP -Password for login or for passphrase. -.TP -\fB-S\fP \fIscript\fR -Script to run to retrieve password. -.TP -\fB-k\fP \fIidentity\fR -Identity file (private key) for ssh connection. -.TP -\fB-x\fP -Use secure connection over ssh. -.TP -\fB-q\fP -Quiet mode: print only error messages. -.TP -\fB-V\fP -Print out a version message, then exit. -.TP -\fB-v\fP \fIdebuglog\fP -Log the telnet session to \fIdebuglog\fP for debugging purposes. - -.SH STDIN PARAMETERS -.TP -\fIagent = < param >\fR -This option is used by fence_node(8) and is ignored by fence_bladecenter. -.TP -\fIipaddr = < hostname | ip >\fR -IP address or hostname of the switch. -.TP -\fIlogin = < param >\fR -Login name. -.TP -\fIoption = < param >\fR -The action required. disable (default) or enable. -.TP -\fIpasswd = < param >\fR -Password for login or for passphrase. -.TP -\fIpasswd_script = < param >\fR -Script to run to retrieve password. -.TP -\fIidentity_file = < param > \fR -Identity file (private key) for ssh. -.TP -\fIsecure = < param >\fR -Use secure connection over ssh. -.TP -\fIblade = < param >\fR -The blade to operate on. -.TP -\fIdebuglog = < param>\fR -Optional parameter to send debug transcript of the telnet session to a log file - -.SH SEE ALSO -fence(8), fence_node(8) diff --git a/fence/man/fence_cisco_mds.8 b/fence/man/fence_cisco_mds.8 deleted file mode 100644 index 8c58d63..0000000 --- a/fence/man/fence_cisco_mds.8 +++ /dev/null @@ -1,132 +0,0 @@ -.TH fence_cisco_mds 8 - -.SH NAME -fence_cisco_mds - I/O Fencing agent for Cisco MDS 9000 series SNMP devices - -.SH SYNOPSIS -.B -fence_cisco_mds -[\fIOPTION\fR]... - -.SH DESCRIPTION -fence_cisco_mds is an I/O Fencing agent which can be used with any Cisco MDS -9000 series with SNMP enabled device. Agent internally uses snmpget, snmpset -and snmpwalk command. - -fence_cisco_mds accepts options on the command line as well as from stdin. -Fenced sends parameters through stdin when it execs the agent. fence_cisco_mds -can be run by itself with command line options. This is useful for testing. - -.SH OPTIONS -.TP -\fB-a\fP \fIIPaddress\fR -IP address or hostname of the Cisco device. Can be used any syntax supported by snmpget. -.TP -\fB-h\fP -Print out a help message describing available options, then exit. -.TP -\fB-c\fP \fIcommunity\fR -The read/write community string to be used in the request. -.TP -\fB-n\fP \fIname\fR -Name of port to fence (fc1/1) -.TP -\fB-p\fP \fIpassword\fR -Password for login for SNMP v3 (authentication protocol pass phrase). -.TP -\fB-P\fP \fIpassword\fR -Password for privacy for SNMP v3 (privacy protocol password). -.TP -\fB-S\fP \fIscript\fR -Script to run to retrieve password for login for SNMP v3 (authentication protocol pass phrase). -.TP -\fB-R\fP \fIscript\fR -Script to run to retrieve privacy for SNMP v3 (privacy protocol password). -.TP -\fB-l\fP \fIlogin\fR -Login name for SNMP v3 (security name). -.TP -\fB-d\fP \fIversion\fR -SNMP version (1,2c,3). -.TP -\fB-b\fP \fIauth_protocol\fR -SNMP authentication protocol (MD5|SHA). -.TP -\fB-E\fP \fIsec_level\fR -SNMP security level (noAuthNoPriv|authNoPriv|authPriv). -.TP -\fB-B\fP \fIpriv_protocol\fR -SNMP privacy protocol (DES|AES). -.TP -\fB-u\fP \fIudp_port\fR -UDP/TCP port to use. -.TP -\fB-o\fP \fIaction\fR -The action required. off (default), on, status, list or monitor. Deprecated -options (enable -> on and disable -> off) can be used too. -.TP -\fB-v\fP -Verbose. Record session to stdout, or debug file if specified (see -D). -.TP -\fB-D\fP -Specifies file, where will be written debug messages from session. -.TP -\fB-V\fP -Print out a version message, then exit. - -.SH STDIN PARAMETERS -.TP -\fIagent = < param >\fR -This option is used by fence_node(8) and is ignored by fence_cisco_mds. -.TP -\fIipaddr = < param >\fR -IP address or hostname of the Cisco device. Can be used any syntax supported by snmpget. -.TP -\fIcommunity = < param >\fR -The read/write community string to be used in the request. -.TP -\fIport = < param >\fR -Name of port to fence (fc1/1) -.TP -\fIpasswd = < param >\fR -Password for login for SNMP v3 (authentication protocol pass phrase). -.TP -\fIsnmp_priv_passwd\fR -Password for privacy for SNMP v3 (privacy protocol password). -.TP -\fIpasswd_script = < param >\fR -Script to run to retrieve password for login for SNMP v3 (authentication protocol pass phrase). -.TP -\fIsnmp_priv_passwd_script = < param>\fR -Password for privacy for SNMP v3 (privacy protocol password). -.TP -\fIlogin = < param >\fR -Login name for SNMP v3 (security name). -.TP -\fIsnmp_version = < param >\fR -SNMP version (1,2c,3). -.TP -\fIsnmp_auth_prot = < param >\fR -SNMP authentication protocol (MD5|SHA). -.TP -\fIsnmp_sec_level = < param >\fR -SNMP security level (noAuthNoPriv|authNoPriv|authPriv). -.TP -\fIsnmp_priv_prot = < param >\fR -SNMP privacy protocol (DES|AES). -.TP -\fIudpport = < param >\fR -UDP/TCP port to use. -.TP -\fIaction = < param >\fR -The action required. off (default), on, status, list or monitor. Deprecated -options (enable -> on and disable -> off) can be used too. -.TP -\fIverbose = < param >\fR -Verbose. Record session to stdout, or debug file if specified (see debug). -.TP -\fIdebug = < param >\fR -Specifies file, where will be written debug messages from session. - -.SH SEE ALSO -fence(8), fence_node(8) diff --git a/fence/man/fence_cisco_ucs.8 b/fence/man/fence_cisco_ucs.8 deleted file mode 100644 index 6afa32b..0000000 --- a/fence/man/fence_cisco_ucs.8 +++ /dev/null @@ -1,251 +0,0 @@ - -.TH FENCE_AGENT 8 2009-10-20 "fence_cisco_ucs (Fence Agent)" -.SH NAME -fence_cisco_ucs - Fence agent for Cisco UCS -.SH DESCRIPTION -.P -fence_cisco_ucs is an I/O Fencing agent which can be used with Cisco UCS to fence machines. -.P -fence_cisco_ucs accepts options on the command line as well -as from stdin. Fenced sends parameters through stdin when it execs the -agent. fence_cisco_ucs can be run by itself with command -line options. This is useful for testing and for turning outlets on or off -from scripts. - -Vendor URL: http://www.cisco.com -.SH PARAMETERS - - -.TP -.B -o, --action=<action> -. -Fencing Action (Default Value: reboot) - -.TP -.B -a, --ip=<ip> -. -IP Address or Hostname This parameter is always required. - -.TP -.B -l, --username=<name> -. -Login Name This parameter is always required. - -.TP -.B -p, --password=<password> -. -Login password or passphrase - -.TP -.B -S, --password-script=<script> -. -Script to retrieve password - -.TP -.B -z, --ssl -. -SSL connection - -.TP -.B -4, --inet4-only -. -Forces agent to use IPv4 addresses only - -.TP -.B -6, --inet6-only -. -Forces agent to use IPv6 addresses only - -.TP -.B -u, --ipport=<port> -. -TCP port to use for connection with device - -.TP -.B -n, --plug=<id> -. -Physical plug number or name of virtual machine This parameter is always required. - -.TP -.B -v, --verbose -. -Verbose mode - -.TP -.B -D, --debug-file=<debugfile> -. -Write debug information to given file - -.TP -.B -V, --version -. -Display version information and exit - -.TP -.B -h, --help -. -Display help and exit - -.TP -.B -C, --separator=<char> -. -Separator for CSV created by operation list (Default Value: ,) - -.TP -.B --power-wait -. -Wait X seconds after issuing ON/OFF (Default Value: 0) - -.TP -.B --power-timeout -. -Test X seconds for status change after ON/OFF (Default Value: 20) - -.TP -.B --shell-timeout -. -Wait X seconds for cmd prompt after issuing command (Default Value: 3) - -.TP -.B --retry-on -. -Count of attempts to retry power on (Default Value: 1) - -.TP -.B --delay -. -Wait X seconds before fencing is started (Default Value: 0) - -.SH ACTIONS - - -.TP -\fBon \fP -Power on machine. - -.TP -\fBoff \fP -Power off machine. - -.TP -\fBreboot \fP -Reboot machine. - -.TP -\fBstatus \fP -This returns the status of the plug/virtual machine. - -.TP -\fBlist \fP -List available plugs with aliases/virtual machines if there is support for more then one device. Returns N/A otherwise. - -.TP -\fBmonitor \fP -Check if fencing device is running. List available plugs/virtual machines or get status of machine (if it does not support more). - -.TP -\fBmetadata \fP - The operational behavior of this is not known. - -.SH STDIN PARAMETERS - - -.TP -.B action -. -Fencing Action (Default Value: reboot) - -.TP -.B ipaddr -. -IP Address or Hostname This parameter is always required. - -.TP -.B login -. -Login Name This parameter is always required. - -.TP -.B passwd -. -Login password or passphrase - -.TP -.B passwd_script -. -Script to retrieve password - -.TP -.B ssl -. -SSL connection - -.TP -.B inet4_only -. -Forces agent to use IPv4 addresses only - -.TP -.B inet6_only -. -Forces agent to use IPv6 addresses only - -.TP -.B ipport -. -TCP port to use for connection with device - -.TP -.B port -. -Physical plug number or name of virtual machine This parameter is always required. - -.TP -.B verbose -. -Verbose mode - -.TP -.B debug -. -Write debug information to given file - -.TP -.B version -. -Display version information and exit - -.TP -.B help -. -Display help and exit - -.TP -.B separator -. -Separator for CSV created by operation list (Default Value: ,) - -.TP -.B power_wait -. -Wait X seconds after issuing ON/OFF (Default Value: 0) - -.TP -.B power_timeout -. -Test X seconds for status change after ON/OFF (Default Value: 20) - -.TP -.B shell_timeout -. -Wait X seconds for cmd prompt after issuing command (Default Value: 3) - -.TP -.B retry_on -. -Count of attempts to retry power on (Default Value: 1) - -.TP -.B delay -. -Wait X seconds before fencing is started (Default Value: 0) diff --git a/fence/man/fence_eps.8 b/fence/man/fence_eps.8 deleted file mode 100644 index 3685837..0000000 --- a/fence/man/fence_eps.8 +++ /dev/null @@ -1,106 +0,0 @@ -.TH fence_eps 8 - -.SH NAME -fence_eps - I/O Fencing agent for ePowerSwitch 8M+ power switch - -.SH SYNOPSIS -.B -fence_eps -[\fIOPTION\fR]... - -.SH DESCRIPTION -fence_eps is an I/O Fencing agent which can be used with the ePowerSwitch 8M+ power -switch to fence connected machines. Fence agent works (in 2008/10/21) ONLY on 8M+ -device, because this is only one, which has support for hidden page feature. - -Agent basically works by connecting to hidden page and pass appropriate arguments -to GET request. This means, that hidden page feature must be enabled and properly -configured. - -fence_eps accepts options on the command line as well as from stdin. -Fenced sends parameters through stdin when it execs the agent. fence_eps -can be run by itself with command line options. This is useful for testin -and for turning outlets on or off from scripts. - -.SH OPTIONS -.TP -\fB-a\fP \fIIPaddress\fR -IP address or hostname of ePowerSwitch 8M+ device. If device is configured -to listen on nonstandard port (other than 80), it's possible to use :port syntax -(ex. psip:8080). -.TP -\fB-h\fP -Print out a help message describing available options, then exit. -.TP -\fB-l\fP \fIlogin\fR -Login name. -.TP -\fB-o\fP \fIaction\fR -The action required. This can be reboot (default), status, off or on. -.TP -\fB-p\fP \fIpassword\fR -Password for login. -.TP -\fB-S\fP \fIscript\fR -Script to run to retrieve password. -.TP -\fB-n\fP \fIname\fR -Physical plug number. Entered without P and with preceding zero (where is needed). -.TP -\fB-c\fP \fIname\fR -Name of hidden page. Default is (hidden.htm) -.TP -\fB-T\fP -Test only. Answer NO to the confirmation prompt instead of YES. -.TP -\fB-q\fP -Quiet mode. -.TP -\fB-v\fP -Verbose. Record session to stdout, or debug file if specified (see -D). -.TP -\fB-D\fP -Specifies file, where will be written debug messages from session. -.TP -\fB-V\fP -Print out a version message, then exit. - -.SH STDIN PARAMETERS -.TP -\fIagent = < param >\fR -This option is used by fence_node(8) and is ignored by fence_eps. -.TP -\fIipaddr = < hostname | ip >\fR -IP address or hostname of ePowerSwitch 8M+ device. If device is configured -to listen on nonstandard port (other than 80), it's possible to use :port syntax -(ex. psip:8080). -.TP -\fIlogin = < param >\fR -Login name. -.TP -\fIoption = < param >\fR -The action required. This can be reboot (default), status, off or on. -.TP -\fIpasswd = < param >\fR -Password for login. -.TP -\fIpasswd_script = < param >\fR -Script to run to retrieve password. -.TP -\fIport = < param >\fR -Physical plug number. Entered without P and with preceding zero (where is needed) -.TP -\fIhidden_page = < param >\fR -Name of hidden page. Default is (hidden.htm) -.TP -\fItest = < param >\fR -Test only. Answer NO to the confirmation prompt instead of YES. -.TP -\fIverbose = < param >\fR -Verbose. Record session to stdout, or debug file if specified (see debug). -.TP -\fIdebug = < param >\fR -Specifies file, where will be written debug messages from session. - -.SH SEE ALSO -fence(8), fence_node(8) diff --git a/fence/man/fence_ibmblade.8 b/fence/man/fence_ibmblade.8 deleted file mode 100644 index 5d1b1ba..0000000 --- a/fence/man/fence_ibmblade.8 +++ /dev/null @@ -1,68 +0,0 @@ -.\" Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. -.\" Copyright (C) 2004 Red Hat, Inc. All rights reserved. -.\" -.\" This copyrighted material is made available to anyone wishing to use, -.\" modify, copy, or redistribute it subject to the terms and conditions -.\" of the GNU General Public License v.2. - -.TH fence_ibmblade 8 - -.SH NAME -fence_ibmblade - I/O Fencing agent for IBM BladeCenter - -.SH SYNOPSIS -.B -fence_ibmblade -[\fIOPTION\fR]... - -.SH DESCRIPTION -fence_ibmblade is an I/O Fencing agent which can be used with IBM BladeCenter -chassis. It issues SNMP Set request to BladeCenter chassins, rebooting, powering -up or down the specified Blade Server. - -fence_ibmblade accepts options on the command line as well as from stdin. -fenced sends parameters through stdin when it execs the agent. fence_ibmblade -can be run by itself with command line options which is useful for testing. - -.SH OPTIONS -.TP -\fB-a\fP \fIIPaddress\fP -IP address of the BladeCenter chassis. -.TP -\fB-h\fP -Print out a help message describing available options, then exit. -.TP -\fB-c\fP \fIcommunity\fP -SNMP community string to use. -.TP -\fB-n\fP \fIport\fP -The Blade port number to disable. -.TP -\fB-o\fP \fIaction\fP -The action required. Reboot (default), On or off. -.TP -\fB-q\fP -Quiet mode: print only error messages. -.TP -\fB-V\fP -Print out a version message, then exit. - -.SH STDIN PARAMETERS -.TP -\fIagent = < param >\fR -This option is used by fence_node(8) and is ignored by fence_ibmblade. -.TP -\fIipaddr = < hostname | ip >\fR -IP address or hostname of the switch. -.TP -\fIcommunity = < param >\fR -SNMP community. -.TP -\fIoption = < param >\fR -The action required. reboot (default), on or off. -.TP -\fIport = < param >\fR -The Blade port number to disable. - -.SH SEE ALSO -fence(8), fence_node(8) diff --git a/fence/man/fence_ifmib.8 b/fence/man/fence_ifmib.8 deleted file mode 100644 index 914d43a..0000000 --- a/fence/man/fence_ifmib.8 +++ /dev/null @@ -1,323 +0,0 @@ - -.TH FENCE_AGENT 8 2009-10-20 "fence_ifmib (Fence Agent)" -.SH NAME -fence_ifmib - Fence agent for IF MIB -.SH DESCRIPTION -.P -fence_ifmib is an I/O Fencing agent which can be used with any SNMP IF-MIB capable device. -.P -It was written with managed ethernet switches in mind, in order to fence iSCSI SAN connections. However, there are many devices that support the IF-MIB interface. The agent uses IF-MIB::ifAdminStatus to control the state of an interface. -.P -fence_ifmib accepts options on the command line as well -as from stdin. Fenced sends parameters through stdin when it execs the -agent. fence_ifmib can be run by itself with command -line options. This is useful for testing and for turning outlets on or off -from scripts. - -Vendor URL: http://www.ietf.org/wg/concluded/ifmib.html -.SH PARAMETERS - - -.TP -.B -o, --action=<action> -. -Fencing Action (Default Value: reboot) - -.TP -.B -a, --ip=<ip> -. -IP Address or Hostname This parameter is always required. - -.TP -.B -l, --username=<name> -. -Login Name - -.TP -.B -p, --password=<password> -. -Login password or passphrase - -.TP -.B -S, --password-script=<script> -. -Script to retrieve password - -.TP -.B -n, --plug=<id> -. -Physical plug number or name of virtual machine This parameter is always required. - -.TP -.B -d, --snmp-version=<ver> -. -Specifies SNMP version to use (1,2c,3) - -.TP -.B -c, --community=<community> -. -Set the community string - -.TP -.B -b, --snmp-auth-prot=<prot> -. -Set authentication protocol (MD5|SHA) - -.TP -.B -E, --snmp-sec-level=<level> -. -Set security level (noAuthNoPriv|authNoPriv|authPriv) - -.TP -.B -B, --snmp-priv-prot=<prot> -. -Set privacy protocol (DES|AES) - -.TP -.B -P, --snmp-priv-passwd=<pass> -. -Set privacy protocol password - -.TP -.B -R, --snmp-priv-passwd-script -. -Script to run to retrieve privacy password - -.TP -.B -u, --udpport -. -UDP/TCP port to use for connection with device (Default Value: 161) - -.TP -.B -4, --inet4-only -. -Forces agent to use IPv4 addresses only - -.TP -.B -6, --inet6-only -. -Forces agent to use IPv6 addresses only - -.TP -.B -v, --verbose -. -Verbose mode - -.TP -.B -D, --debug-file=<debugfile> -. -Write debug information to given file - -.TP -.B -V, --version -. -Display version information and exit - -.TP -.B -h, --help -. -Display help and exit - -.TP -.B -C, --separator=<char> -. -Separator for CSV created by operation list (Default Value: ,) - -.TP -.B --power-timeout -. -Test X seconds for status change after ON/OFF (Default Value: 20) - -.TP -.B --shell-timeout -. -Wait X seconds for cmd prompt after issuing command (Default Value: 3) - -.TP -.B --login-timeout -. -Wait X seconds for cmd prompt after login (Default Value: 5) - -.TP -.B --power-wait -. -Wait X seconds after issuing ON/OFF (Default Value: 0) - -.TP -.B --retry-on -. -Count of attempts to retry power on (Default Value: 1) - -.TP -.B --delay -. -Wait X seconds before fencing is started (Default Value: 0) - -.SH ACTIONS - - -.TP -\fBon \fP -Power on machine. - -.TP -\fBoff \fP -Power off machine. - -.TP -\fBreboot \fP -Reboot machine. - -.TP -\fBstatus \fP -This returns the status of the plug/virtual machine. - -.TP -\fBlist \fP -List available plugs with aliases/virtual machines if there is support for more then one device. Returns N/A otherwise. - -.TP -\fBmonitor \fP -Check if fencing device is running. List available plugs/virtual machines or get status of machine (if it does not support more). - -.TP -\fBmetadata \fP - The operational behavior of this is not known. - -.SH STDIN PARAMETERS - - -.TP -.B action -. -Fencing Action (Default Value: reboot) - -.TP -.B ipaddr -. -IP Address or Hostname This parameter is always required. - -.TP -.B login -. -Login Name - -.TP -.B passwd -. -Login password or passphrase - -.TP -.B passwd_script -. -Script to retrieve password - -.TP -.B port -. -Physical plug number or name of virtual machine This parameter is always required. - -.TP -.B snmp_version -. -Specifies SNMP version to use (1,2c,3) - -.TP -.B community -. -Set the community string - -.TP -.B snmp_auth_prot -. -Set authentication protocol (MD5|SHA) - -.TP -.B snmp_sec_level -. -Set security level (noAuthNoPriv|authNoPriv|authPriv) - -.TP -.B snmp_priv_prot -. -Set privacy protocol (DES|AES) - -.TP -.B snmp_priv_passwd -. -Set privacy protocol password - -.TP -.B snmp_priv_passwd_script -. -Script to run to retrieve privacy password - -.TP -.B udpport -. -UDP/TCP port to use for connection with device (Default Value: 161) - -.TP -.B inet4_only -. -Forces agent to use IPv4 addresses only - -.TP -.B inet6_only -. -Forces agent to use IPv6 addresses only - -.TP -.B verbose -. -Verbose mode - -.TP -.B debug -. -Write debug information to given file - -.TP -.B version -. -Display version information and exit - -.TP -.B help -. -Display help and exit - -.TP -.B separator -. -Separator for CSV created by operation list (Default Value: ,) - -.TP -.B power_timeout -. -Test X seconds for status change after ON/OFF (Default Value: 20) - -.TP -.B shell_timeout -. -Wait X seconds for cmd prompt after issuing command (Default Value: 3) - -.TP -.B login_timeout -. -Wait X seconds for cmd prompt after login (Default Value: 5) - -.TP -.B power_wait -. -Wait X seconds after issuing ON/OFF (Default Value: 0) - -.TP -.B retry_on -. -Count of attempts to retry power on (Default Value: 1) - -.TP -.B delay -. -Wait X seconds before fencing is started (Default Value: 0) diff --git a/fence/man/fence_ilo.8 b/fence/man/fence_ilo.8 deleted file mode 100644 index a2dd038..0000000 --- a/fence/man/fence_ilo.8 +++ /dev/null @@ -1,95 +0,0 @@ -.\" Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. -.\" Copyright (C) 2004 Red Hat, Inc. All rights reserved. -.\" -.\" This copyrighted material is made available to anyone wishing to use, -.\" modify, copy, or redistribute it subject to the terms and conditions -.\" of the GNU General Public License v.2. - -.TH fence_ilo 8 - -.SH NAME -fence_ilo - I/O Fencing agent for HP Integrated Lights Out card - -.SH SYNOPSIS -.B -fence_ilo -[\fIOPTION\fR]... - -.SH DESCRIPTION -fence_ilo is an I/O Fencing agent used for HP servers with the Integrated Light -Out (iLO) PCI card. The agent opens an SSL connection to the iLO card. Once the -SSL connection is established, the agent is able to communicate with the iLO -card through an XML stream. - -fence_ilo depends on the pyOpenSSL available in your distribution or -downloadable from http://pyopenssl.sourceforge.net - -NOTE: fence_ilo deprecates fence_rib. - -.SH OPTIONS -.TP -\fB-a\fP \fIIPaddress[:port]\fR -IP address or hostname of the iLO card. If the SSL server of the card is -not running on the default SSL port, 443, then [:port] will also need to be -specified. -.TP -\fB-h\fP -Print out a help message describing available options, then exit. -.TP -\fB-l\fP \fIlogin\fR -Login name. -.TP -\fB-o\fP \fIaction\fR -The action required. reboot (default), off, on or status. -.TP -\fB-p\fP \fIpassword\fR -Password for login or for passphrase. -.TP -\fB-S\fP \fIscript\fR -Script to run to retrieve password. -\fB-z\fP -Use secure connection over SSL (default). -.TP -\fB-r\fP \fIprotocol\fR -RIBCL protocol to use. Default is to autodetect. -.TP -\fB-v\fP -Verbose. -.TP -\fB-V\fP -Print out a version message, then exit. - -.SH STDIN PARAMETERS -.TP -\fIaction = < param >\fR -The action required. reboot (default), off, on or status. -.TP -\fIagent = < param >\fR -This option is used by fence_node(8) and is ignored by fence_ilo. -.TP -\fIhostname = < hostname | ip >\fR -IP address or hostname of the iLO card. -.TP -\fIlogin = < param >\fR -Login name. -.TP -\fIpasswd = < param >\fR -Password for login or for passphrase. -.TP -\fIpasswd_script = < param >\fR -Script to run to retrieve password. -.TP -\fIssl = < param >\fR -Use secure connection over SSL. -.TP -\fIpasswd = < param >\fR -Password for login. -.TP -\fIribcl = < param >\fR -RIBCL protocol to use. Default is to autodetect. -.TP -\fIverbose = < param >\fR -Verbose mode. - -.SH SEE ALSO -fence(8), fence_node(8), fence_rib(8) diff --git a/fence/man/fence_ipmilan.8 b/fence/man/fence_ipmilan.8 deleted file mode 100644 index 9b10198..0000000 --- a/fence/man/fence_ipmilan.8 +++ /dev/null @@ -1,111 +0,0 @@ -.\" Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. -.\" Copyright (C) 2004 Red Hat, Inc. All rights reserved. -.\" -.\" This copyrighted material is made available to anyone wishing to use, -.\" modify, copy, or redistribute it subject to the terms and conditions -.\" of the GNU General Public License v.2. - -.TH fence_ipmilan 8 - -.SH NAME -fence_ipmilan - I/O Fencing agent for machines controlled by IPMI over -LAN. - -.SH SYNOPSIS -.B -fence_ipmilan -[\fIOPTION\fR]... - -.SH DESCRIPTION -fence_ipmilan is an I/O Fencing agent which can be used with -machines controlled by IPMI. This agent calls support software -using ipmitool (http://ipmitool.sf.net/). - -fence_ipmilan accepts options on the command line as well as from stdin. -fenced sends the options through stdin when it execs the agent. fence_ipmilan -can be run by itself with command line options which is useful for testing. - -.SH OPTIONS -.TP -\fB-a\fP \fIIPaddress\fP -IP address or hostname of the IPMI controller. -.TP -\fB-h\fP -Print out a help message describing available options, then exit. -.TP -\fB-l\fP \fIlogin\fP -Login (if required) with administrative privileges. -.TP -\fB-o\fP \fIoption\fP -Action to perform (on, off, reboot). -.TP -\fB-p\fP \fIpassword\fP -Password (if required) for login. -.TP -\fB-P\fP -Use the lanplus option if this is a lanplus capable interface (for example iLo2) -.TP -\fB-A\fP \fIAuthentication Type\fP -Can be set to none, password, md2, or md5. -.TP -\fB-C\fP \fICiphersuite Type\fP -If you are using lanplus, this option avails you to define type of ciphersuite to -use. Standard is 3 (defined if you just use lanplus). For more information please -refer ipmitool man page (option -C). -.TP -\fB-M\fP \fImethod\fP -Method to fence (onoff or cycle). Default is onoff. Use cycle in case your management -card will power off with default method so there will be no chance to power machine -on by IPMI. -.TP -\fB-t\fP \fItimeout\fP -Timeout in seconds for IPMI operation. Default is 10, but in some cases it -must be set to higher value (anything above 30 is not recommended and may -cause strange problems). -.TP -\fB-q\fP -Quiet operation. Only print out error messages. -.TP -\fB-V\fP -Print out a version message, then exit. -.TP -\fB-v\fP -Verbose mode. - -.SH STDIN PARAMETERS -.TP -\fIipaddr = < hostname | ip >\fR -IP address or hostname of the IPMI controller. -.TP -\fIlogin= < param >\fR -Login (if required) with administrative privileges. -.TP -\fIoption = < param >\fR -Action to perform (on, off, reboot). -.TP -\fIpasswd = < param >\fR -Password (if required) for login. -.TP -\fIauth = < param >\fR -Authentication type (none, password, md2, md5). -.TP -\fItimeout = < param >\fR -Timeout in seconds for IPMI operation. Default is 10, but in some cases it -must be set to higher value (anything above 30 is not recommended and may -cause strange problems). -.TP -\fIcipher = < param >\fR -If you are using lanplus, this option avails you to define type of ciphersuite to -use. Standard is 3 (defined if you just use lanplus). For more information please -refer ipmitool man page (option -C). -.TP -\fImethod = < param >\fR -Method to fence (onoff or cycle). Default is onoff. Use cycle in case your management -card will power off with default method so there will be no chance to power machine -on by IPMI. -.TP -\fIlanplus\fR -If we are using the lanplus option for ipmitool - -.SH SEE ALSO -fence(8), fence_node(8), ipmitool(1) diff --git a/fence/man/fence_lpar.8 b/fence/man/fence_lpar.8 deleted file mode 100644 index b4de871..0000000 --- a/fence/man/fence_lpar.8 +++ /dev/null @@ -1,116 +0,0 @@ -.\" Copyright (C) 2009 Red Hat, Inc. All rights reserved. -.\" -.\" This copyrighted material is made available to anyone wishing to use, -.\" modify, copy, or redistribute it subject to the terms and conditions -.\" of the GNU General Public License v.2. - -.TH fence_lpar 8 - -.SH NAME -fence_lpar - I/O Fencing agent for IBM Power Systems - -.SH SYNOPSIS -.B -fence_lpar -[\fIOPTION\fR]... - -.SH DESCRIPTION -fence_lpar is an I/O Fencing agent which can be used with IBM Power Systems. -It logs into the HMC via ssh and uses the command line interface to operate -LPARs. - -fence_lpar accepts options on the command line as well as from stdin. Fenced -sends parameters through stdin when it execs the agent. fence_lpar can be run -by itself with command line options. This is useful for testing and for -stopping and starting LPARs from scripts. - -.SH OPTIONS -.TP -\fB-a\fP \fIIPaddress\fR -IP address or hostname of the HMC. -.TP -\fB-c\fP \fIprompt\fR -Select command prompt. Default: :~>, ] -.TP -\fB-D\fP \fIdebugfile\fR -Write debug information to given file. -.TP -\fB-h\fP -Print out a help message describing available options, then exit. -.TP -\fB-H\fP \fIversion\fR -Select an HMC version to use: 3 or 4 (default). -.TP -\fB-l\fP \fIlogin\fR -Login name. -.TP -\fB-n\fP \fIname\fR -Partition name. -.TP -\fB-o\fP \fIaction\fR -The action required. Reboot (default), Status, Off or On. -.TP -\fB-p\fP \fIpassword\fR -Password for login. -.TP -\fB-s\fP \fIname\fR -Managed system name. -.TP -\fB-S\fP \fIscript\fR -Script to run to retrieve password. -.TP -\fB-x\fP -Use secure connection over ssh. -.TP -\fB-v\fP -Verbose mode. -.TP -\fB-V\fP -Print out a version message, then exit. - -.SH STDIN PARAMETERS -.TP -\fIaction = < param >\fR -The fencing action requested: reboot (default), on, off or status. -.TP -\fIcmd_prompt = < param >\fR -Force command prompt. Default: :~>, ] -.TP -\fIdebug = < param >\fR -Write debug information to given file. -.TP -\fIhelp = < param >\fR -Display help and exit. -.TP -\fIhmc_version = < param >\fR -HMC version to use: 3 or 4 (default). -.TP -\fIipaddr = < hostname | ip >\fR -IP address or hostname of the HMC. -.TP -\fIlogin = < param >\fR -Login name. -.TP -\fImanaged = < param >\fR -Managed system name. -.TP -\fIpartition = < param >\fR -Partition name. -.TP -\fIpasswd = < param >\fR -Password for login. -.TP -\fIpasswd_script = < param >\fR -Script to run to retrieve password. -.TP -\fIsecure\fR -Use secure connection over ssh. -.TP -\fIverbose\fR -Verbose mode. -.TP -\fIversion\fR -Display version information and exit. - -.SH SEE ALSO -fence(8), fence_node(8) diff --git a/fence/man/fence_rsa.8 b/fence/man/fence_rsa.8 deleted file mode 100644 index 0ba1744..0000000 --- a/fence/man/fence_rsa.8 +++ /dev/null @@ -1,69 +0,0 @@ -.\" Copyright (C) 2006 Red Hat, Inc. All rights reserved. -.\" -.\" This copyrighted material is made available to anyone wishing to use, -.\" modify, copy, or redistribute it subject to the terms and conditions -.\" of the GNU General Public License v.2. - -.TH fence_rsa 8 - -.SH NAME -fence_rsa - I/O Fencing agent for IBM RSA II - -.SH SYNOPSIS -.B -fence_rsa -[\fIOPTION\fR]... - -.SH DESCRIPTION -fence_rsa is an I/O Fencing agent which can be used with the IBM RSA II -management interface. It logs into an RSA II device via telnet and reboots -the associated machine. Lengthy telnet connections to the RSA II device -should be avoided while a GFS cluster is running because the connection -will block any necessary fencing actions. - -fence_rsa accepts options on the command line as well as from stdin. -Fenced sends parameters through stdin when it execs the agent. fence_rsa -can be run by itself with command line options. This is useful for testing. - -.SH OPTIONS -.TP -\fB-a\fP \fIIPaddress\fR -IP address or hostname of the RSA II device. -.TP -\fB-h\fP -Print out a help message describing available options, then exit. -.TP -\fB-l\fP \fIlogin\fR -Login name. -.TP -\fB-o\fP \fIaction\fR -The action required. Reboot (default), Off, On, or Status. -.TP -\fB-p\fP \fIpassword\fR -Password for login. -.TP -\fB-v\fP -Verbose. Print informational messages to standard out. -.TP -\fB-V\fP -Print out a version message, then exit. - -.SH STDIN PARAMETERS -.TP -\fIagent = < param >\fR -This option is used by fence_node(8) and is ignored by fence_rsa. -.TP -\fIipaddr = < hostname | ip >\fR -IP address or hostname of the device. -.TP -\fIlogin = < param >\fR -Login name. -.TP -\fIoption = < param >\fR -The action required. Reboot (default), Off, On or Status. -.TP -\fIpasswd = < param >\fR -Password for login. - -.SH SEE ALSO -fence(8), fence_node(8) diff --git a/fence/man/fence_sanbox2.8 b/fence/man/fence_sanbox2.8 deleted file mode 100644 index 46209f8..0000000 --- a/fence/man/fence_sanbox2.8 +++ /dev/null @@ -1,83 +0,0 @@ -.\" Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. -.\" Copyright (C) 2004 Red Hat, Inc. All rights reserved. -.\" -.\" This copyrighted material is made available to anyone wishing to use, -.\" modify, copy, or redistribute it subject to the terms and conditions -.\" of the GNU General Public License v.2. - -.TH fence_sanbox2 8 - -.SH NAME -fence_sanbox2 - I/O Fencing agent for QLogic SANBox2 FC switches - -.SH SYNOPSIS -.B -fence_sanbox2 -[\fIOPTION\fR]... - -.SH DESCRIPTION -fence_sanbox2 is an I/O Fencing agent which can be used with QLogic SANBox2 FC -switches. It logs into a SANBox2 switch via telnet and disables a specified -port. Disabling the port which a machine is connected to effectively fences -that machine. Lengthy telnet connections to the switch should be avoided -while a GFS cluster is running because the connection will block any necessary -fencing actions. - -fence_sanbox2 accepts options on the command line as well as from stdin. -fenced sends parameters through stdin when it execs the agent. fence_sanbox2 -can be run by itself with command line options which is useful for testing. - -After a fence operation has taken place the fenced machine can no longer connect -to the switch. When the fenced machine is ready to be brought back -into the GFS cluster (after reboot) the port on the FC switch needs to -be enabled. This can be done by running fence_sanbox2 and specifying the -enable action. - -.SH OPTIONS -.TP -\fB-a\fP \fIIPaddress\fP -IP address of the switch. -.TP -\fB-h\fP -Print out a help message describing available options, then exit. -.TP -\fB-l\fP \fIlogin\fP -Login name for the switch. -.TP -\fB-n\fP \fIport\fP -The port number to disable on the switch. -.TP -\fB-o\fP \fIaction\fP -The action required. disable (default) or enable. -.TP -\fB-p\fP \fIpassword\fP -Password for login. -.TP -\fB-q\fP -Quiet mode: print only error messages. -.TP -\fB-V\fP -Print out a version message, then exit. - -.SH STDIN PARAMETERS -.TP -\fIagent = < param >\fR -This option is used by fence_node(8) and is ignored by fence_sanbox2. -.TP -\fIipaddr = < hostname | ip >\fR -IP address or hostname of the switch. -.TP -\fIlogin = < param >\fR -Login name. -.TP -\fIoption = < param >\fR -The action required. disable (default) or enable. -.TP -\fIpasswd = < param >\fR -Password for login. -.TP -\fIport = < param >\fR -The port number to disable on the switch. - -.SH SEE ALSO -fence(8), fence_node(8) diff --git a/fence/man/fence_vmware.8 b/fence/man/fence_vmware.8 deleted file mode 100644 index 31ea5f8..0000000 --- a/fence/man/fence_vmware.8 +++ /dev/null @@ -1,137 +0,0 @@ -.\" Copyright (C) 2008 Red Hat, Inc. All rights reserved. -.\" -.\" This copyrighted material is made available to anyone wishing to use, -.\" modify, copy, or redistribute it subject to the terms and conditions -.\" of the GNU General Public License v.2. - -.TH fence_vmware 8 - -.SH NAME -fence_vmware - I/O Fencing agent for VMware virtual machines - -.SH SYNOPSIS -.B -fence_vmware -[\fIOPTION\fR]... - -.SH DESCRIPTION -fence_vmware is an I/O Fencing agent which can be used with the VMware ESX or -VMware Server to fence virtual machines. It logs via ssh to a VMware ESX (or Server) -physical machine and there run vmware-cmd, which does all work. - -By default, VMware ESX has disabled root account so you must create annother user -account with limited permissions on VMWare ESX machine. - -Better idea is install right version of vmware-cmd (with same API) to any other machine -in network and use it for fencing. - -fence_vmware accepts options on the command line as well as from stdin. -Fenced sends parameters through stdin when it execs the agent. fence_vmware -can be run by itself with command line options. This is useful for testing -and for turning outlets on or off from scripts. - -.SH OPTIONS -.TP -\fB-a\fP \fIIPaddress\fR -IP address or hostname of machine where is vmware-cmd. -.TP -\fB-A\fP \fIIPAdress\fR -IP adress or hostname of machine where is runing vmware. Default is localhost. -.TP -\fB-h\fP -Print out a help message describing available options, then exit. -.TP -\fB-l\fP \fIlogin\fR -Login name of machine with vmware-cmd. -.TP -\fB-L\fP \fIlogin\fR -Login name to VMware administration interface. -.TP -\fB-o\fP \fIaction\fR -The action required. Reboot (default), Status, Off or On. -.TP -\fB-p\fP \fIpassword\fR -Password for login or for passphrase for machine with vmware-cmd. -.TP -\fB-P\fP \fIpassword\fR -Password for login to VMware administration interface. -.TP -\fB-B\fP \fIscript\fR -Script to run to retrieve password for machine with vmware-cmd. -.TP -\fB-R\fP \fIscript\fR -Script to run to retrieve password for VMware administration interface. -.TP -\fB-n\fP \fIname\fR -Name of virtual machine to fence (ie. /vmfs/volumes/48bfcbd1-4624461c-8250-0015c5f3ef0f/Rhel/Rhel.vmx) -.TP -\fB-x\fP -Use secure connection over ssh (this is default, and can't be disabled) -.TP -\fB-k\fP \fIfilename\fR -Identity file (private key) for ssh -.TP -\fB-T\fP -Test only. Answer NO to the confirmation prompt instead of YES. -.TP -\fB-v\fP -Verbose. Record session to stdout, or debug file if specified (see -D). -.TP -\fB-D\fP -Specifies file, where will be written debug messages from session. -.TP -\fB-V\fP -Print out a version message, then exit. - -.SH STDIN PARAMETERS -.TP -\fIagent = < param >\fR -This option is used by fence_node(8) and is ignored by fence_vmware. -.TP -\fIipaddr = < hostname | ip >\fR -IP address or hostname of machine where is vmware-cmd. -.TP -\fIvmipaddr = < hostname | ip >\fR -IP adress or hostname of machine where is runing vmware. Default is localhost. -.TP -\fIlogin = < param >\fR -Login name of machine with vmware-cmd. -.TP -\fIvmlogin = < param >\fR -Login name to VMware administration interface. -.TP -\fIoption = < param >\fR -The action required. Reboot (default), Off or On. -.TP -\fIpasswd = < param >\fR -Password for login or for passphrase for machine with vmware-cmd. -.TP -\fIvmpasswd = < param >\fR -Password for login to VMware administration interface. -.TP -\fIpasswd_script = < param >\fR -Script to run to retrieve password for machine with vmware-cmd. -.TP -\fIvmpasswd_script = < param >\fR -Script to run to retrieve password for VMware administration interface. -.TP -\fIport = < param >\fR -Name of virtual machine to fence (ie. /vmfs/volumes/48bfcbd1-4624461c-8250-0015c5f3ef0f/Rhel/Rhel.vmx) -.TP -\fIsecure = < param >\fR -Use secure connection over ssh (this is default, and can't be disabled) -.TP -\fIidentity_file = < param >\fR -Identity file (private key) for ssh -.TP -\fItest = < param >\fR -Test only. Answer NO to the confirmation prompt instead of YES. -.TP -\fIverbose = < param >\fR -Verbose. Record session to stdout, or debug file if specified (see debug). -.TP -\fIdebug = < param >\fR -Specifies file, where will be written debug messages from session. - -.SH SEE ALSO -fence(8), fence_node(8) diff --git a/fence/man/fence_wti.8 b/fence/man/fence_wti.8 deleted file mode 100644 index 1b1d231..0000000 --- a/fence/man/fence_wti.8 +++ /dev/null @@ -1,84 +0,0 @@ -.\" Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. -.\" Copyright (C) 2004 Red Hat, Inc. All rights reserved. -.\" -.\" This copyrighted material is made available to anyone wishing to use, -.\" modify, copy, or redistribute it subject to the terms and conditions -.\" of the GNU General Public License v.2. - -.TH fence_wti 8 - -.SH NAME -fence_wti - I/O Fencing agent for WTI Network Power Switch - -.SH SYNOPSIS -.B -fence_wti -[\fIOPTION\fR]... - -.SH DESCRIPTION -fence_wti is an I/O Fencing agent which can be used with the WTI Network -Power Switch (NPS). It logs into an NPS via telnet or ssh and boots a specified plug. -Lengthy telnet connections to the NPS should be avoided while a GFS cluster is -running because the connection will block any necessary fencing actions. - -fence_wti accepts options on the command line as well as from stdin. -fenced sends the options through stdin when it execs the agent. fence_wti -can be run by itself with command line options which is useful for testing. - -.SH OPTIONS -.TP -\fB-a\fP \fIIPaddress\fP -IP address of the switch. -.TP -\fB-h\fP -Print out a help message describing available options, then exit. -.TP -\fB-n\fP \fIplug\fP -The plug number to power cycle. -.TP -\fB-p\fP \fIpassword\fP -Password for login or for passphrase. -.TP -\fB-S\fP \fIscript\fR -Script to run to retrieve password. -.TP -\fB-x\fP -Use secure connection over ssh. -.TP -\fB-T\fP -Test only. Do not power cycle. Reports state of the plug. -.TP -\fB-q\fP -Quiet operation. Only print out error messages. -.TP -\fB-V\fP -Print out a version message, then exit. - -.SH STDIN PARAMETERS -.TP -\fIagent = < param >\fR -This option is used by fence_node(8) and is ignored by fence_wti. -.TP -\fIipaddr = < hostname | ip >\fR -IP address or hostname of the switch. -.TP -\fIpasswd = < param >\fR -Password for login or for passphrase. -.TP -\fIpasswd_script = < param >\fR -Script to run to retrieve password. -.TP -\fIidentity_file = < param > \fR -Identity file (private key) for ssh. -.TP -\fIsecure = < param >\fR -Use secure connection over ssh. -.TP -\fIport = < param >\fR -The outlet number to act upon. -.TP -\fItest = < param >\fR -Test only. Answer NO to the confirmation prompt instead of YES. - -.SH SEE ALSO -fence(8), fence_node(8)

1 0

fence-agents: master - fence_eaton_snmp: fix port number handling
by Fabio M. Di Nitto 25 Feb '11

25 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 5bee71f95ec9f1c6a1486fe7f16ddeda32865b1d Parent: 693d93c73fb6cd4a7978a507f0fce33c85feda6f Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Fri Feb 25 09:46:34 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Fri Feb 25 09:46:34 2011 +0100 fence_eaton_snmp: fix port number handling snmp port enumration starts at 0 while all other interfaces start at 1. Make the numbering consistent between configuration, devices and UIs. Signed-off-by: Arnaud Quette <aquette.dev(a)gmail.com> Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- fence/agents/eaton_snmp/fence_eaton_snmp.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/fence/agents/eaton_snmp/fence_eaton_snmp.py b/fence/agents/eaton_snmp/fence_eaton_snmp.py index b02cfd1..18df1cb 100644 --- a/fence/agents/eaton_snmp/fence_eaton_snmp.py +++ b/fence/agents/eaton_snmp/fence_eaton_snmp.py @@ -160,6 +160,11 @@ def main(): if (not (options.has_key("-s"))): options["-s"]="1" + # Plug indexing start from zero, so we substract '1' from the + # user's given plug number + if ((options.has_key("-n")) and (options["-n"].isdigit())): + options["-n"] = str(int(options["-n"]) - 1) + docs = { } docs["shortdesc"] = "Fence agent for Eaton over SNMP" docs["longdesc"] = "fence_eaton_snmp is an I/O Fencing agent \

1 0

cluster: RHEL57 - resource-agents: Remove netmask from IP address when creating list of them
by Marek Grác 25 Feb '11

25 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=56… Commit: 56b618c99947d457579c6bc9f0a1de4aae329595 Parent: f26a3627a1087816fae1bb671623fc74bf653a90 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Feb 7 14:14:39 2011 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Wed Feb 23 18:39:55 2011 +0100 resource-agents: Remove netmask from IP address when creating list of them IP address were copied directly to configuration of various resource agents. Resolves: rhbz#675739 --- rgmanager/src/resources/utils/config-utils.sh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/utils/config-utils.sh b/rgmanager/src/resources/utils/config-utils.sh index 5646fa8..c54b266 100644 --- a/rgmanager/src/resources/utils/config-utils.sh +++ b/rgmanager/src/resources/utils/config-utils.sh @@ -210,7 +210,9 @@ build_ip_list() break fi - ipaddrs="$ipaddrs $ipaddr" + # remove netmask + iponly=`echo $ipaddr | sed 's/\/.*//'` + ipaddrs="$ipaddrs $iponly" ((x++)) done

1 0

cluster: RHEL57 - resource-agents: Add option disable_rdisc to ip.sh
by Marek Grác 25 Feb '11

25 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f2… Commit: f26a3627a1087816fae1bb671623fc74bf653a90 Parent: b9306e19ba3f346326befd933c8ecdd9bc8973bf Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Fri Jan 28 15:29:48 2011 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Wed Feb 23 18:38:08 2011 +0100 resource-agents: Add option disable_rdisc to ip.sh rdisc is called by ip.sh which causes static routes to be updated by dynamic ones. This option adds possibility to disable this feature. Resolves: rhbz#620700 --- rgmanager/src/resources/ip.sh | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/resources/ip.sh b/rgmanager/src/resources/ip.sh index 4f7e432..38d1ab9 100755 --- a/rgmanager/src/resources/ip.sh +++ b/rgmanager/src/resources/ip.sh @@ -121,6 +121,17 @@ meta_data() <content type="string"/> </parameter> + <parameter name="disable_rdisc"> + <longdesc lang="en"> + Disable updating of routing using RDISC protocol and + preserve static routes. + </longdesc> + <shortdesc lang="en"> + Disable updating of routing using RDISC protocol + </shortdesc> + <content type="boolean"/> + </parameter> + </parameters> <actions> @@ -632,7 +643,10 @@ ipv6() # Not sure if this is necessary for ipv6 either. file=$(which rdisc 2>/dev/null) if [ -f "$file" ]; then - killall -HUP rdisc || rdisc -fs + if [ "$OCF_RESKEY_disable_rdisc" != "yes" ] && \ + [ "$OCF_RESKEY_disable_rdisc" != "1" ]; then + killall -HUP rdisc || rdisc -fs + fi fi return 0 @@ -711,7 +725,10 @@ ipv4() file=$(which rdisc 2>/dev/null) if [ -f "$file" ]; then - killall -HUP rdisc || rdisc -fs + if [ "$OCF_RESKEY_disable_rdisc" != "yes" ] && \ + [ "$OCF_RESKEY_disable_rdisc" != "1" ]; then + killall -HUP rdisc || rdisc -fs + fi fi return 0

1 0

cluster: STABLE31 - config: stop leaking memory on config reload
by Fabio M. Di Nitto 24 Feb '11

24 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7d… Commit: 7d2b388cfe9cdc7e0eac65218788527a3969fe8c Parent: 0901934fdcd49f85deac905da3d63497d3885382 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Thu Feb 24 15:04:31 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Thu Feb 24 15:04:31 2011 +0100 config: stop leaking memory on config reload Resolves: rhbz#680155 Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- config/plugins/xml/config.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/config/plugins/xml/config.c b/config/plugins/xml/config.c index 1db23da..7dcf8ba 100644 --- a/config/plugins/xml/config.c +++ b/config/plugins/xml/config.c @@ -142,7 +142,5 @@ fail: if (doc) xmlFreeDoc(doc); - xmlCleanupParser(); - return err; }

1 0

gfs2-utils: the annotated tag 3.1.1 has been created
by Bob Peterson 23 Feb '11

23 Feb '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: ffda3929ec66f086f91adc69682285127693f137 Parent: 0000000000000000000000000000000000000000 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: 2011-02-23 15:23 +0000 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: 2011-02-23 15:23 +0000 annotated tag: 3.1.1 has been created at ffda3929ec66f086f91adc69682285127693f137 (tag) tagging 4a727917ff403b6f386c992d1e071e3f1a795893 (commit) replaces 3.1.0 New tag for updated source tree Benjamin Marzinski (1): gfs2_grow: fix growing on full filesystems Bob Peterson (14): mkfs.gfs2 should support discard request generation GFS2: mkfs.gfs2 segfaults with 18.55TB and -b512 gfs2-utils: minor corrections to README.build fsck.gfs2: reports master/root dinodes as unused and fixes the bitmap fsck.gfs2: can't repair rgrps resulting from gfs_grow->gfs2_convert gfs2_edit: handle corrupt file systems better gfs2_edit: print large block numbers better gfs2_edit: has problems printing gfs1 journals gfs2_edit: add -d option for printing journal details gfs2_edit: Fix error message on blockalloc when outside bitmap gfs2_edit: fix careless compiler warning gfs2_edit: fix segfault in set_bitmap when block is in rgrp fsck.gfs2: segfault in pass1b gfs2_edit savemeta doesn't save all leaf blocks for large dirs David Teigland (1): gfs_controld: remove oom_adj Steven Whitehouse (5): tune: Clean up and make closer to tune2fs strings: Clean up strings libgfs2: Remove calls to gettext from libgfs2 libgfs2: Remove unused function get_sysfs_uinit() libgfs2: Move gfs2_query into gfs2_convert

1 0

gfs2-utils: master - gfs2_edit savemeta doesn't save all leaf blocks for large dirs
by Bob Peterson 23 Feb '11

23 Feb '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: 4a727917ff403b6f386c992d1e071e3f1a795893 Parent: 4e79f08f455038bdfb962f941676b7d5d8c21ef8 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Feb 23 07:13:31 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 23 07:13:31 2011 -0600 gfs2_edit savemeta doesn't save all leaf blocks for large dirs This patch changes the gfs2_edit "savemeta" option so that it processes exhash directories the same way that fsck.gfs2 does, namely, it does a read of the hash table and saves all the leaf blocks from that. Before it was trying to traverse the blocks, but that only works for medium-size exhash directories. rhbz#679565 --- gfs2/edit/savemeta.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index 666a452..844da8c 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -398,10 +398,21 @@ static void save_inode_data(int out_fd) } } /* Process directory exhash inodes */ - if (S_ISDIR(inode->i_di.di_mode)) { - if (inode->i_di.di_flags & GFS2_DIF_EXHASH) { - save_indirect_blocks(out_fd, cur_list, metabh, - height, 0); + if (S_ISDIR(inode->i_di.di_mode) && + inode->i_di.di_flags & GFS2_DIF_EXHASH) { + uint64_t leaf_no, old_leaf = -1; + int li; + + for (li = 0; li < (1 << inode->i_di.di_depth); li++) { + gfs2_get_leaf_nr(inode, li, &leaf_no); + if (leaf_no == old_leaf || + gfs2_check_range(&sbd, leaf_no) != 0) + continue; + old_leaf = leaf_no; + mybh = bread(&sbd, leaf_no); + if (gfs2_check_meta(mybh, GFS2_METATYPE_LF) == 0) + save_block(sbd.device_fd, out_fd, leaf_no); + brelse(mybh); } } if (inode->i_di.di_eattr) { /* if this inode has extended attributes */

1 0

cluster: RHEL57 - fsck.gfs2: segfault in pass1b
by Bob Peterson 22 Feb '11

22 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b9… Commit: b9306e19ba3f346326befd933c8ecdd9bc8973bf Parent: 415fc5f19db6780c76dfc00f680a9617dacd7b31 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Tue Feb 22 16:40:37 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Tue Feb 22 16:40:37 2011 -0600 fsck.gfs2: segfault in pass1b The problem occurred when there were duplicate block references in a dinode but all references in the duplicate list are eventually deleted due to other corruption. The fix is an additional check whether the list is empty. rhbz#679076 --- gfs2/fsck/pass1b.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gfs2/fsck/pass1b.c b/gfs2/fsck/pass1b.c index a0c5c88..9abc8c1 100644 --- a/gfs2/fsck/pass1b.c +++ b/gfs2/fsck/pass1b.c @@ -558,7 +558,7 @@ static int handle_dup_blk(struct gfs2_sbd *sbp, struct duptree *b) last_reference = clear_a_reference(sbp, b, &b->ref_inode_list, &dh, 0); - if (last_reference) { + if (last_reference && !osi_list_empty(&b->ref_inode_list)) { uint8_t q; /* If we're down to a single reference (and not all references

1 0

fence: master - fenced: don't ignore victim_done messages for reduced victims
by David Teigland 22 Feb '11

22 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence.git?p=fence.git;a=commitdiff;h=73c0f5… Commit: 73c0f58f071d713bd3b634ffcfb1d02feba84fcc Parent: 7181608a3a497bff3d9d1306e77503dbfc4c32f5 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Feb 22 15:47:24 2011 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Feb 22 16:40:30 2011 -0600 fenced: don't ignore victim_done messages for reduced victims When a victim is "reduced" (i.e. fenced skips fencing it because it rejoins the cluster cleanly before fenced fences it), it is immediately removed from the list of victims, before the "victim_done" message is sent for it. The victim_done message updates the time of the last successful fencing operation for a failed node. The code that processes received victim_done messages was ignoring the message for the reduced victim because the node couldn't be found in the victims list. This caused the latest fencing information to not be recorded for the node, causing dlm_controld to wait indefinately for fencing to complete for the reduced victim. The fix is to simply record the information from a victim_done message even if the node is not in the victims list. bz 678704 Acked-by: Ryan O'Hara <rohara(a)redhat.com> Signed-off-by: David Teigland <teigland(a)redhat.com> --- fence/fenced/cpg.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/fence/fenced/cpg.c b/fence/fenced/cpg.c index eec2ba6..716d4c4 100644 --- a/fence/fenced/cpg.c +++ b/fence/fenced/cpg.c @@ -654,9 +654,9 @@ static void receive_victim_done(struct fd *fd, struct fd_header *hd, int len) node = get_node_victim(fd, id->nodeid); if (!node) { + /* see comment below about no node */ log_debug("receive_victim_done %d:%u no victim nodeid %d", hd->nodeid, seq, id->nodeid); - return; } log_debug("receive_victim_done %d:%u remove victim %d time %llu how %d", @@ -672,9 +672,11 @@ static void receive_victim_done(struct fd *fd, struct fd_header *hd, int len) if (hd->nodeid == our_nodeid) { /* sanity check, I don't think this should happen; see comment in fence_victims() */ - if (!node->local_victim_done) - log_error("expect local_victim_done"); - node->local_victim_done = 0; + if (node) { + if (!node->local_victim_done) + log_error("expect local_victim_done"); + node->local_victim_done = 0; + } } else { /* save details of fencing operation from master, which master saves at the time it completes it */ @@ -682,8 +684,12 @@ static void receive_victim_done(struct fd *fd, struct fd_header *hd, int len) id->fence_how, id->fence_time); } - list_del(&node->list); - free(node); + /* we can have no node when reduce_victims() removes it, bz 678704 */ + + if (node) { + list_del(&node->list); + free(node); + } } /* we know that the quorum value here is consistent with the cpg events

1 0

cluster: STABLE31 - fenced: don't ignore victim_done messages for reduced victims
by David Teigland 22 Feb '11

22 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=09… Commit: 0901934fdcd49f85deac905da3d63497d3885382 Parent: c217c686b16f9aa8be3b2b49d017b11bf05b26fc Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Feb 22 15:47:24 2011 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Feb 22 16:39:53 2011 -0600 fenced: don't ignore victim_done messages for reduced victims When a victim is "reduced" (i.e. fenced skips fencing it because it rejoins the cluster cleanly before fenced fences it), it is immediately removed from the list of victims, before the "victim_done" message is sent for it. The victim_done message updates the time of the last successful fencing operation for a failed node. The code that processes received victim_done messages was ignoring the message for the reduced victim because the node couldn't be found in the victims list. This caused the latest fencing information to not be recorded for the node, causing dlm_controld to wait indefinately for fencing to complete for the reduced victim. The fix is to simply record the information from a victim_done message even if the node is not in the victims list. bz 678704 Acked-by: Ryan O'Hara <rohara(a)redhat.com> Signed-off-by: David Teigland <teigland(a)redhat.com> --- fence/fenced/cpg.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/fence/fenced/cpg.c b/fence/fenced/cpg.c index a8629b9..99e16a0 100644 --- a/fence/fenced/cpg.c +++ b/fence/fenced/cpg.c @@ -652,9 +652,9 @@ static void receive_victim_done(struct fd *fd, struct fd_header *hd, int len) node = get_node_victim(fd, id->nodeid); if (!node) { + /* see comment below about no node */ log_debug("receive_victim_done %d:%u no victim nodeid %d", hd->nodeid, seq, id->nodeid); - return; } log_debug("receive_victim_done %d:%u remove victim %d time %llu how %d", @@ -670,9 +670,11 @@ static void receive_victim_done(struct fd *fd, struct fd_header *hd, int len) if (hd->nodeid == our_nodeid) { /* sanity check, I don't think this should happen; see comment in fence_victims() */ - if (!node->local_victim_done) - log_error("expect local_victim_done"); - node->local_victim_done = 0; + if (node) { + if (!node->local_victim_done) + log_error("expect local_victim_done"); + node->local_victim_done = 0; + } } else { /* save details of fencing operation from master, which master saves at the time it completes it */ @@ -680,8 +682,12 @@ static void receive_victim_done(struct fd *fd, struct fd_header *hd, int len) id->fence_how, id->fence_time); } - list_del(&node->list); - free(node); + /* we can have no node when reduce_victims() removes it, bz 678704 */ + + if (node) { + list_del(&node->list); + free(node); + } } /* we know that the quorum value here is consistent with the cpg events

1 0

cluster: RHEL6 - fenced: don't ignore victim_done messages for reduced victims
by David Teigland 22 Feb '11

22 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4e… Commit: 4eb20ad9f8e62d0739c7897d79bc1bccb94e5250 Parent: 8fd8d3f3c52b9efc09d911bd8fdcab3e8742e9cb Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Feb 22 15:47:24 2011 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Feb 22 16:33:11 2011 -0600 fenced: don't ignore victim_done messages for reduced victims When a victim is "reduced" (i.e. fenced skips fencing it because it rejoins the cluster cleanly before fenced fences it), it is immediately removed from the list of victims, before the "victim_done" message is sent for it. The victim_done message updates the time of the last successful fencing operation for a failed node. The code that processes received victim_done messages was ignoring the message for the reduced victim because the node couldn't be found in the victims list. This caused the latest fencing information to not be recorded for the node, causing dlm_controld to wait indefinately for fencing to complete for the reduced victim. The fix is to simply record the information from a victim_done message even if the node is not in the victims list. bz 678704 Acked-by: Ryan O'Hara <rohara(a)redhat.com> Signed-off-by: David Teigland <teigland(a)redhat.com> --- fence/fenced/cpg.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/fence/fenced/cpg.c b/fence/fenced/cpg.c index a8629b9..99e16a0 100644 --- a/fence/fenced/cpg.c +++ b/fence/fenced/cpg.c @@ -652,9 +652,9 @@ static void receive_victim_done(struct fd *fd, struct fd_header *hd, int len) node = get_node_victim(fd, id->nodeid); if (!node) { + /* see comment below about no node */ log_debug("receive_victim_done %d:%u no victim nodeid %d", hd->nodeid, seq, id->nodeid); - return; } log_debug("receive_victim_done %d:%u remove victim %d time %llu how %d", @@ -670,9 +670,11 @@ static void receive_victim_done(struct fd *fd, struct fd_header *hd, int len) if (hd->nodeid == our_nodeid) { /* sanity check, I don't think this should happen; see comment in fence_victims() */ - if (!node->local_victim_done) - log_error("expect local_victim_done"); - node->local_victim_done = 0; + if (node) { + if (!node->local_victim_done) + log_error("expect local_victim_done"); + node->local_victim_done = 0; + } } else { /* save details of fencing operation from master, which master saves at the time it completes it */ @@ -680,8 +682,12 @@ static void receive_victim_done(struct fd *fd, struct fd_header *hd, int len) id->fence_how, id->fence_time); } - list_del(&node->list); - free(node); + /* we can have no node when reduce_victims() removes it, bz 678704 */ + + if (node) { + list_del(&node->list); + free(node); + } } /* we know that the quorum value here is consistent with the cpg events

1 0

gfs2-utils: master - fsck.gfs2: segfault in pass1b
by Bob Peterson 22 Feb '11

22 Feb '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: 4e79f08f455038bdfb962f941676b7d5d8c21ef8 Parent: 897437313adc8801b38ea42abc4fd07bd486ce3e Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Tue Feb 22 15:56:39 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Tue Feb 22 15:56:39 2011 -0600 fsck.gfs2: segfault in pass1b The problem occurred when there were duplicate block references in a dinode but all references in the duplicate list are eventually deleted due to other corruption. The fix is an additional check whether the list is empty. rhbz#679076 --- gfs2/fsck/pass1b.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gfs2/fsck/pass1b.c b/gfs2/fsck/pass1b.c index 090b412..5bbda7c 100644 --- a/gfs2/fsck/pass1b.c +++ b/gfs2/fsck/pass1b.c @@ -542,7 +542,7 @@ static int handle_dup_blk(struct gfs2_sbd *sbp, struct duptree *b) last_reference = clear_a_reference(sbp, b, &b->ref_inode_list, &dh, 0); - if (last_reference) { + if (last_reference && !osi_list_empty(&b->ref_inode_list)) { uint8_t q; /* If we're down to a single reference (and not all references

1 0

dlm: master - dlm_controld: Reset fs_notified when check_fs_done
by David Teigland 22 Feb '11

22 Feb '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=70a61dc4d5… Commit: 70a61dc4d5d91119da30a7165e70bb9646a6d6c1 Parent: 9ccd853b6d36e99af1100548d1e389fc921f10d4 Author: Jiaju Zhang <jjzhang.linux(a)gmail.com> AuthorDate: Mon Nov 8 16:07:31 2010 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Feb 22 11:09:10 2011 -0600 dlm_controld: Reset fs_notified when check_fs_done This situation only seems to arise with ocfs2_controld. Copying bug description from email https://www.redhat.com/archives/cluster-devel/2010-November/msg00004.html > About the issue that dlm_controld and fs_controld sit spinning, > retrying and replying for the fs_notified check, I have a suspision > that another scenario may also hit that logic: > > If the node->fs_notified has been set to 1 by previous change, when a > new change comes and needs to check the node->fs_notified, because it > has not been reset to 0, so check_fs_done will succeed even if > dlm_controld has not received the notification from fs_controld this > time. > For example, given that the following membership changes n, n+1, n+2, > we see what happens on node X: > Step 1: cg n: node Y leaves with CPG_REASON_NODEDOWN reason, > eventually in node X's ls->node_history, node Y's fs_notified > = 1 > Step 2: cg n+1: node Y joins ... > Step 3: cg n+2: node Y leaves with CPG_REASON_NODEDOWN reason, one > possible scenario is: before fs_controld's notification > arrives, dlm_controld has known node Y is down from CPG > message and done a lot of work, and it saw node Y's > fs_notified = 1 (been set in Step 1) then passed the fs check > wrongly. So node Y's check_fs reset to 0. > Step 4: fs_controld's notification arrives, it sees node Y's check_fs > = 0 and assumes dlm_controld has not known node Y is down and > retries to send the notification. But in fact, dlm_controld > has already known this and finished all the work, which will > result in the spinning ... Signed-off-by: Jiaju Zhang <jjzhang.linux(a)gmail.com> Signed-off-by: David Teigland <teigland(a)redhat.com> --- group/dlm_controld/cpg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/group/dlm_controld/cpg.c b/group/dlm_controld/cpg.c index 9b0d223..12cb202 100644 --- a/group/dlm_controld/cpg.c +++ b/group/dlm_controld/cpg.c @@ -651,6 +651,7 @@ static int check_fs_done(struct lockspace *ls) if (node->fs_notified) { log_group(ls, "check_fs nodeid %d clear", node->nodeid); node->check_fs = 0; + node->fs_notified = 0; } else { log_group(ls, "check_fs nodeid %d needs fs notify", node->nodeid);

1 0

fence-agents: master - fence_wti: Unable to parse output when splitted into several screens (2/2)
by Marek Grác 21 Feb '11

21 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 693d93c73fb6cd4a7978a507f0fce33c85feda6f Parent: 7a8fa47877b462bd0f892d62c5488036113143e3 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Feb 21 20:55:30 2011 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Feb 21 20:55:30 2011 +0100 fence_wti: Unable to parse output when splitted into several screens (2/2) Minor changes to previous patch. Power ON/OFF now works as expected Resolves: rhbz#678522 --- fence/agents/wti/fence_wti.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index d05676b..8caa4c2 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -28,13 +28,12 @@ def get_power_status(conn, options): conn.send("/S"+"\r\n") if isinstance(options["-c"], list): - re_all = options["-c"] + re_all = list(options["-c"]) else: re_all = [options["-c"]] re_next = re.compile("Enter: ", re.IGNORECASE) re_all.append(re_next) - conn.send("/S"+"\r\n") result = conn.log_expect(options, re_all, int(options["-Y"])) listing = conn.before if result == (len(re_all) - 1):

1 0

fence-agents: master - fence_wti: Unable to parse output when splitted into several screens
by Marek Grác 21 Feb '11

21 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 7a8fa47877b462bd0f892d62c5488036113143e3 Parent: 1c57218c8735553ba74e1c286295dd0cf95c3d42 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Feb 21 19:42:18 2011 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Feb 21 19:42:18 2011 +0100 fence_wti: Unable to parse output when splitted into several screens Parsing of listing that consists of several screens added. Resolves: rhbz#678522 --- fence/agents/wti/fence_wti.py | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index a71852a..d05676b 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -22,9 +22,26 @@ BUILD_DATE="March, 2008" #END_VERSION_GENERATION def get_power_status(conn, options): - try: + listing = "" + + try: + conn.send("/S"+"\r\n") + + if isinstance(options["-c"], list): + re_all = options["-c"] + else: + re_all = [options["-c"]] + re_next = re.compile("Enter: ", re.IGNORECASE) + re_all.append(re_next) + conn.send("/S"+"\r\n") - conn.log_expect(options, options["-c"], int(options["-Y"])) + result = conn.log_expect(options, re_all, int(options["-Y"])) + listing = conn.before + if result == (len(re_all) - 1): + conn.send("\r\n") + conn.log_expect(options, options["-c"], int(options["-Y"])) + listing += conn.before + except pexpect.EOF: fail(EC_CONNECTION_LOST) except pexpect.TIMEOUT: @@ -32,8 +49,8 @@ def get_power_status(conn, options): plug_section = 0 outlets = {} - for line in conn.before.splitlines(): - if (plug_section == 2) and line.find("|") >= 0: + for line in listing.splitlines(): + if (plug_section == 2) and line.find("|") >= 0 and line.startswith("PLUG") == False: plug_line = [x.strip().lower() for x in line.split("|")] if len(plug_line) < len(plug_header): plug_section = -1 @@ -42,7 +59,8 @@ def get_power_status(conn, options): return plug_line[status_index] else: ## We already believe that first column contains plug number - outlets[plug_line[0]] = (plug_line[name_index], plug_line[status_index]) + if len(plug_line[0]) != 0: + outlets[plug_line[0]] = (plug_line[name_index], plug_line[status_index]) elif (plug_section == 1): plug_section = 2 pass

1 0

cluster: STABLE31 - cman init: fence_xvmd is long gone...
by Fabio M. Di Nitto 21 Feb '11

21 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c2… Commit: c217c686b16f9aa8be3b2b49d017b11bf05b26fc Parent: f7d98e763f40e3e7630cf687ec791c446aade8cc Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Mon Feb 21 18:29:34 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Mon Feb 21 18:29:34 2011 +0100 cman init: fence_xvmd is long gone... Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/init.d/cman.in | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index fbca2fb..3cef0df 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -448,14 +448,6 @@ fence_join_enabled() fi } -check_fence_opt() -{ - for i in $(getopt dfi:a:p:I:C:U:c:k:u?hLXV $FENCE_XVMD_OPTS); do - [ -$1 = $i ] && return 0 - done - return 1 -} - ### the real stuff starts here start_global()

1 0

fence: master - build: add support for dbus notification
by Fabio M. Di Nitto 18 Feb '11

18 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence.git?p=fence.git;a=commitdiff;h=718160… Commit: 7181608a3a497bff3d9d1306e77503dbfc4c32f5 Parent: a8e523a8ed9df5d54d9c41349a19e1c95252a45e Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Fri Feb 18 20:24:05 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Fri Feb 18 20:24:05 2011 +0100 build: add support for dbus notification Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- configure.ac | 11 ++++++++++- fence/fenced/Makefile.am | 11 ++++++++++- fence/fenced/main.c | 4 +--- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 4da5a0f..3393315 100644 --- a/configure.ac +++ b/configure.ac @@ -109,9 +109,18 @@ AC_CHECK_FUNCS([ftruncate gettimeofday memset mkfifo select socket strcasecmp st # local options AC_ARG_ENABLE([debug], - [ --enable-debug enable debug build. ], + [ --enable-debug enable debug build [default=no].], [ default="no" ]) +AC_ARG_ENABLE([dbus], + [ --enable-dbus enable support for dbus [default=yes]. ], + [ default="yes" ]) + +AM_CONDITIONAL(BUILD_DBUS, test "x${enable_dbus}" != "xno") +if test "x${enable_dbus}" != "xno"; then + PKG_CHECK_MODULES([dbus],[dbus-1]) +fi + AC_ARG_WITH([syslogfacility], [ --syslogfacility=FACILITY cluster default syslog facility. ], diff --git a/fence/fenced/Makefile.am b/fence/fenced/Makefile.am index 3bb6dfe..f309383 100644 --- a/fence/fenced/Makefile.am +++ b/fence/fenced/Makefile.am @@ -4,7 +4,8 @@ sbin_PROGRAMS = fenced noinst_HEADERS = config.h fd.h fenced.h -fenced_SOURCES = config.c cpg.c logging.c main.c member_cman.c recover.c +fenced_SOURCES = config.c cpg.c dbus.c \ + logging.c main.c member_cman.c recover.c fenced_CPPFLAGS = -D_FILE_OFFSET_BITS=64 \ -I$(top_srcdir)/fence/include \ @@ -17,4 +18,12 @@ fenced_CFLAGS = $(logt_CFLAGS) $(cfg_CFLAGS) \ fenced_LDFLAGS = $(logt_LIBS) $(cfg_LIBS) $(cpg_LIBS) $(quorum_LIBS) \ -lpthread +if BUILD_DBUS +fenced_CPPFLAGS += -DDBUS + +fenced_CFLAGS += $(dbus_CFLAGS) + +fenced_LDFLAGS += $(dbus_LIBS) +endif + fenced_LDADD = $(top_builddir)/fence/libfence/libfence.la diff --git a/fence/fenced/main.c b/fence/fenced/main.c index 555fb36..a20aae2 100644 --- a/fence/fenced/main.c +++ b/fence/fenced/main.c @@ -988,11 +988,9 @@ int main(int argc, char **argv) loop(); -<<<<<<< HEAD -======= fd_dbus_exit(); unlink(LOCKFILE_NAME); ->>>>>>> 4536bfb... fenced: send dbus signal when node is fenced + return 0; }

1 0

fence: master - fenced: send dbus signal when node is fenced
by rohara 18 Feb '11

18 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence.git?p=fence.git;a=commitdiff;h=a8e523… Commit: a8e523a8ed9df5d54d9c41349a19e1c95252a45e Parent: c36edde1d07fa8ba54cc9e9f78a3b4905b8b4f68 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Wed Feb 2 18:15:32 2011 -0600 Committer: Ryan O'Hara <rohara(a)cyclone.(none)> CommitterDate: Fri Feb 18 11:03:42 2011 -0600 fenced: send dbus signal when node is fenced This patch adds the ability to send a dbus signal when a node is fenced. This code is can reestablish a connection with dbus if necessary. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> Reviewed-by: David Teigland <teigland(a)redhat.com> --- fence/fenced/config.c | 2 + fence/fenced/config.h | 3 ++ fence/fenced/dbus.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ fence/fenced/fd.h | 6 +++ fence/fenced/main.c | 18 +++++++++- fence/fenced/recover.c | 4 ++ 6 files changed, 118 insertions(+), 2 deletions(-) diff --git a/fence/fenced/config.c b/fence/fenced/config.c index f8e9846..5b657d0 100644 --- a/fence/fenced/config.c +++ b/fence/fenced/config.c @@ -10,6 +10,7 @@ int ccs_handle; int optd_debug_logfile; int optd_clean_start; +int optd_disable_dbus; int optd_skip_undefined; int optd_post_join_delay; int optd_post_fail_delay; @@ -20,6 +21,7 @@ int optd_override_path; int cfgd_debug_logfile = DEFAULT_DEBUG_LOGFILE; int cfgd_clean_start = DEFAULT_CLEAN_START; +int cfgd_disable_dbus = DEFAULT_DISABLE_DBUS; int cfgd_skip_undefined = DEFAULT_SKIP_UNDEFINED; int cfgd_post_join_delay = DEFAULT_POST_JOIN_DELAY; int cfgd_post_fail_delay = DEFAULT_POST_FAIL_DELAY; diff --git a/fence/fenced/config.h b/fence/fenced/config.h index 102b91a..18cc762 100644 --- a/fence/fenced/config.h +++ b/fence/fenced/config.h @@ -5,6 +5,7 @@ #define DEFAULT_DEBUG_LOGFILE 0 #define DEFAULT_CLEAN_START 0 +#define DEFAULT_DISABLE_DBUS 0 #define DEFAULT_SKIP_UNDEFINED 0 #define DEFAULT_POST_JOIN_DELAY 6 #define DEFAULT_POST_FAIL_DELAY 0 @@ -13,6 +14,7 @@ extern int optd_debug_logfile; extern int optd_clean_start; +extern int optd_disable_dbus; extern int optd_skip_undefined; extern int optd_post_join_delay; extern int optd_post_fail_delay; @@ -21,6 +23,7 @@ extern int optd_override_path; extern int cfgd_debug_logfile; extern int cfgd_clean_start; +extern int cfgd_disable_dbus; extern int cfgd_skip_undefined; extern int cfgd_post_join_delay; extern int cfgd_post_fail_delay; diff --git a/fence/fenced/dbus.c b/fence/fenced/dbus.c new file mode 100644 index 0000000..5d1e1d5 --- /dev/null +++ b/fence/fenced/dbus.c @@ -0,0 +1,87 @@ +#include "fd.h" +#include "config.h" + +#ifdef DBUS +#include <dbus/dbus.h> + +#define DBUS_FENCE_NAME "com.redhat.cluster.fence" +#define DBUS_FENCE_IFACE "com.redhat.cluster.fence" +#define DBUS_FENCE_PATH "/com/redhat/cluster/fence" + +static DBusConnection *bus = NULL; + +void fd_dbus_init(void) +{ + if (!(bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, NULL))) { + log_error("failed to get dbus connection"); + } else { + log_debug("connected to dbus %s", dbus_bus_get_unique_name(bus)); + } +} + +void fd_dbus_exit(void) +{ + if (bus) { + dbus_connection_close(bus); + dbus_connection_unref(bus); + } + bus = NULL; +} + +void fd_dbus_send(const char *nodename, int nodeid, int result) +{ + DBusMessage *msg = NULL; + + if (bus && !dbus_connection_read_write(bus, 1)) { + log_debug("disconnected from dbus"); + fd_dbus_exit(); + } + + if (!bus) { + fd_dbus_init(); + } + + if (!bus) { + goto out; + } + + if (!(msg = dbus_message_new_signal(DBUS_FENCE_PATH, + DBUS_FENCE_IFACE, + "FenceNode"))) { + log_error("failed to create dbus signal"); + goto out; + } + + if (!dbus_message_append_args(msg, + DBUS_TYPE_STRING, &nodename, + DBUS_TYPE_INT32, &nodeid, + DBUS_TYPE_INT32, &result, + DBUS_TYPE_INVALID)) { + log_error("failed to append args to dbus signal"); + goto out; + } + + dbus_connection_send(bus, msg, NULL); + dbus_connection_flush(bus); + +out: + if (msg) { + dbus_message_unref(msg); + } +} + +#else + +void fd_dbus_init(void) +{ +} + +void fd_dbus_exit(void) +{ +} + +void fd_dbus_send(const char *nodename, int nodeid, int result) +{ +} + +#endif /* DBUS */ diff --git a/fence/fenced/fd.h b/fence/fenced/fd.h index 1182ef5..aead409 100644 --- a/fence/fenced/fd.h +++ b/fence/fenced/fd.h @@ -258,5 +258,11 @@ void init_logging(void); void setup_logging(void); void close_logging(void); +/* dbus.c */ + +void fd_dbus_init(void); +void fd_dbus_exit(void); +void fd_dbus_send(const char *nodename, int nodeid, int result); + #endif /* __FD_DOT_H__ */ diff --git a/fence/fenced/main.c b/fence/fenced/main.c index 2a4678f..555fb36 100644 --- a/fence/fenced/main.c +++ b/fence/fenced/main.c @@ -855,7 +855,7 @@ static void print_usage(void) printf(" -j <secs> Post-join fencing delay (default %d)\n", DEFAULT_POST_JOIN_DELAY); printf(" -f <secs> Post-fail fencing delay (default %d)\n", DEFAULT_POST_FAIL_DELAY); printf(" -R <secs> Override time (default %d)\n", DEFAULT_OVERRIDE_TIME); - + printf(" -q Disable dbus signals\n"); printf(" -O <path> Override path (default %s)\n", DEFAULT_OVERRIDE_PATH); printf(" -h Print this help, then exit\n"); printf(" -V Print program version information, then exit\n"); @@ -865,7 +865,7 @@ static void print_usage(void) printf("\n"); } -#define OPTION_STRING "Lcj:f:Dn:O:hVSse:r:" +#define OPTION_STRING "Lcj:f:Dn:O:hVSse:r:q:" static void read_arguments(int argc, char **argv) { @@ -918,6 +918,11 @@ static void read_arguments(int argc, char **argv) cfgd_override_path = strdup(optarg); break; + case 'q': + optd_disable_dbus = 1; + cfgd_disable_dbus = 1; + break; + case 'r': register_controlled_dir(optarg); break; @@ -977,8 +982,17 @@ int main(int argc, char **argv) log_level(LOG_INFO, "fenced %s started", VERSION); signal(SIGTERM, sigterm_handler); + if (!cfgd_disable_dbus) { + fd_dbus_init(); + } + loop(); +<<<<<<< HEAD +======= + fd_dbus_exit(); + unlink(LOCKFILE_NAME); +>>>>>>> 4536bfb... fenced: send dbus signal when node is fenced return 0; } diff --git a/fence/fenced/recover.c b/fence/fenced/recover.c index 1847246..4434256 100644 --- a/fence/fenced/recover.c +++ b/fence/fenced/recover.c @@ -383,6 +383,10 @@ void fence_victims(struct fd *fd) log_error("fence %s %s", node->name, error ? "failed" : "success"); + if (!cfgd_disable_dbus) { + fd_dbus_send(node->name, node->nodeid, error); + } + skip_log_message: if (!error) { node->local_victim_done = 1;

1 0

cluster: RHEL57 - fence_rsa: Better error handling
by Marek Grác 16 Feb '11

16 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=41… Commit: 415fc5f19db6780c76dfc00f680a9617dacd7b31 Parent: a93f8e62758d78e50877efbfe55a1101088a141d Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Wed Feb 16 15:00:35 2011 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Wed Feb 16 15:18:19 2011 +0100 fence_rsa: Better error handling In some special cases (reason is not known yet) fence agent for RSA fails to get status because it can't find pattern 'Power: (.*)'. After applying this patch agent will end with proper error message instead of python backtrace. Resolves: rhbz#652619 --- fence/agents/rsa/fence_rsa.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py index 36a9f04..33c7fe9 100755 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -26,7 +26,12 @@ def get_power_status(conn, options): except pexpect.TIMEOUT: fail(EC_TIMED_OUT) - status = re.compile("Power: (.*)", re.IGNORECASE).search(conn.before).group(1) + match = re.compile("Power: (.*)", re.IGNORECASE).search(conn.before) + if (match != None): + status = match.group(1) + else: + status = "undefined" + return status.lower().strip() def set_power_status(conn, options):

1 0

fence-agents: master - fence_rsa: Better error handling
by Marek Grác 16 Feb '11

16 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 1c57218c8735553ba74e1c286295dd0cf95c3d42 Parent: 9b1a7fa8ad83152d729017accf3dff2ffbe90ea3 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Wed Feb 16 15:00:35 2011 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Wed Feb 16 15:00:35 2011 +0100 fence_rsa: Better error handling In some special cases (reason is not known yet) fence agent for RSA fails to get status because it can't find pattern 'Power: (.*)'. After applying this patch agent will end with proper error message instead of python backtrace. Resolves: rhbz#652619 --- fence/agents/rsa/fence_rsa.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py index 888063b..2dc18fe 100644 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -25,7 +25,12 @@ def get_power_status(conn, options): except pexpect.TIMEOUT: fail(EC_TIMED_OUT) - status = re.compile("Power: (.*)", re.IGNORECASE).search(conn.before).group(1) + match = re.compile("Power: (.*)", re.IGNORECASE).search(conn.before) + if (match != None): + status = match.group(1) + else: + status = "undefined" + return status.lower().strip() def set_power_status(conn, options):

1 0

cluster: RHEL57 - fence_ipmilan: Fix manual page to describe usage with HP iLO 3
by Lon Hohberger 15 Feb '11

15 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a9… Commit: a93f8e62758d78e50877efbfe55a1101088a141d Parent: 144e764cfcb5cdd937cb1eb9316146aadce794e1 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Thu Jan 13 15:02:11 2011 +0100 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 15 16:55:58 2011 -0500 fence_ipmilan: Fix manual page to describe usage with HP iLO 3 Resolves: rhbz#671089 Reviewed-by: Lon Hohberger <lhh(a)redhat.com> --- fence/agents/ipmilan/ipmilan.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/fence/agents/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c index e894e60..2f46078 100644 --- a/fence/agents/ipmilan/ipmilan.c +++ b/fence/agents/ipmilan/ipmilan.c @@ -1106,7 +1106,10 @@ void print_xml_metadata(char *pname) { printf("<longdesc>\n"); printf("fence_ipmilan is an I/O Fencing agent which can be used with " "machines controlled by IPMI. This agent calls support software " - "using ipmitool (http://ipmitool.sf.net/)."); + "using ipmitool (http://ipmitool.sf.net/).\n\n" + "To use fence_ipmilan with HP iLO 3 you have to enable lanplus " + "option (lanplus / -P) and increase wait after operation to " + "4 seconds (power_wait=4 / -T 4)"); printf("</longdesc>\n"); printf("%s\n","<parameters>");

1 0

cluster: RHEL57 - cman: Fix cman_tool reporting with quorum disk
by Lon Hohberger 15 Feb '11

15 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=14… Commit: 144e764cfcb5cdd937cb1eb9316146aadce794e1 Parent: 4ec386998729159bb68c74c9ddb8636d9f901025 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Mon Nov 29 16:46:20 2010 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 15 16:01:46 2011 -0500 cman: Fix cman_tool reporting with quorum disk This fixes a segmentation fault caused by an uninitialized variable when running: cman_tool nodes -F id,name,type,addr Resolves: rhbz#654894 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Shane Bradley <sbradley(a)redhat.com> --- cman/cman_tool/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cman/cman_tool/main.c b/cman/cman_tool/main.c index 9575c59..e059c9f 100644 --- a/cman/cman_tool/main.c +++ b/cman/cman_tool/main.c @@ -457,7 +457,7 @@ static void show_nodes(commandline_t *comline) } } - int numaddrs; + int numaddrs = 0; struct cman_node_address addrs[MAX_INTERFACES]; if (comline->addresses_opt || comline->format_opts) {

1 0

cluster: RHEL57 - [CMAN] Display the node's votes in cman_tool status
by Lon Hohberger 15 Feb '11

15 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4e… Commit: 4ec386998729159bb68c74c9ddb8636d9f901025 Parent: d7c4483a3f4a1d91b14e9e7d879f5039ed493027 Author: Christine Caulfield <ccaulfie(a)redhat.com> AuthorDate: Tue Jul 29 13:52:14 2008 +0100 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 15 15:55:57 2011 -0500 [CMAN] Display the node's votes in cman_tool status I'm not sure how this one slipped the net. Resolves: rhbz#653508 Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com> Reviewed-by: Lon Hohberger <lhh(a)redhat.com> --- cman/cman_tool/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/cman/cman_tool/main.c b/cman/cman_tool/main.c index 7c56556..9575c59 100644 --- a/cman/cman_tool/main.c +++ b/cman/cman_tool/main.c @@ -230,6 +230,7 @@ static void show_status(void) if (cman_get_quorum_device(h, &qinfo) == 0 && qinfo.qi_state == 2) printf("Quorum device votes: %d\n", qinfo.qi_votes); printf("Total votes: %d\n", einfo->ei_total_votes); + printf("Node votes: %d\n", einfo->ei_node_votes); printf("Quorum: %d %s\n", einfo->ei_quorum, quorate?" ":"Activity blocked"); printf("Active subsystems: %d\n", cman_get_subsys_count(h));

1 0

cluster: RHEL57 - rgmanager: Fix nofailback when service is in 'starting' state
by Lon Hohberger 15 Feb '11

15 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d7… Commit: d7c4483a3f4a1d91b14e9e7d879f5039ed493027 Parent: 4198c45971a12d59ad565309acd63c46a6809ef6 Author: Shane Bradley <sbradley(a)redhat.com> AuthorDate: Wed Jan 26 10:05:27 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 15 15:54:22 2011 -0500 rgmanager: Fix nofailback when service is in 'starting' state If a failover domain has "nofailback" enabled a service that is "starting" state would still failback to the original. If a service takes a while to come up and is in the "starting" state and the original node comes back online while it is in that state the service will be failed back. Resolves: rhbz#669440 Signed-off-by: Shane Bradley <sbradley(a)redhat.com> Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/fo_domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/daemons/fo_domain.c b/rgmanager/src/daemons/fo_domain.c index d8d074f..677a859 100644 --- a/rgmanager/src/daemons/fo_domain.c +++ b/rgmanager/src/daemons/fo_domain.c @@ -549,7 +549,7 @@ node_should_start(int nodeid, cluster_member_list_t *membership, * Check to see if the service is started and if we are the owner in case of * restricted+owner+no failback */ - if (svc_state.rs_state == RG_STATE_STARTED) + if (svc_state.rs_state == RG_STATE_STARTED || svc_state.rs_state == RG_STATE_STARTING) started = 1; if (svc_state.rs_owner == (uint32_t)nodeid) owned_by_node = 1;

1 0

cluster: RHEL57 - ccs: Update manual page for ccs_tool
by Lon Hohberger 15 Feb '11

15 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=41… Commit: 4198c45971a12d59ad565309acd63c46a6809ef6 Parent: 359a10b3382a5ea30840a1dc9754960e1de04f83 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Feb 9 16:04:50 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 15 15:24:20 2011 -0500 ccs: Update manual page for ccs_tool Resolves: rhbz#656427 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- ccs/man/ccs_tool.8 | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ccs/man/ccs_tool.8 b/ccs/man/ccs_tool.8 index e8869c0..e582ed4 100644 --- a/ccs/man/ccs_tool.8 +++ b/ccs/man/ccs_tool.8 @@ -37,6 +37,13 @@ while the cman cluster is operational (i.e. online). Run this on a single machine to update cluster.conf on all current cluster members. This also notfies cman of the new config version. +Note: If ccsd is run on a non-standard base port, you can specify this to +a \fBccs_tool update\fP in the same manner as you would to \fBccsd\fP: + +For example: + + ccs_tool update -P c:40003 /etc/cluster/cluster.conf + .TP \fBupgrade\fP \fI<location>\fP This command is used to upgrade an old CCS format archive to the new

1 0

cluster: RHEL57 - ccs: Allow ccs_tool to use alternate base ports
by Lon Hohberger 15 Feb '11

15 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=35… Commit: 359a10b3382a5ea30840a1dc9754960e1de04f83 Parent: 5b78e00a39c53d81281978ab575dff5801c0d1a6 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Feb 9 14:48:53 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 15 15:21:15 2011 -0500 ccs: Allow ccs_tool to use alternate base ports Resolves: rhbz#656427 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- ccs/ccs_tool/ccs_tool.c | 2 +- ccs/ccs_tool/update.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++- ccs/ccs_tool/update.h | 1 + 3 files changed, 65 insertions(+), 2 deletions(-) diff --git a/ccs/ccs_tool/ccs_tool.c b/ccs/ccs_tool/ccs_tool.c index dc54146..5fcd667 100644 --- a/ccs/ccs_tool/ccs_tool.c +++ b/ccs/ccs_tool/ccs_tool.c @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) "Try 'ccs_tool help' for help.\n"); exit(EXIT_FAILURE); } - if(update(argv[optind+1])){ + if(update2(argc-1, argv+1)){ fprintf(stderr, "\nFailed to update config file.\n"); exit(EXIT_FAILURE); } diff --git a/ccs/ccs_tool/update.c b/ccs/ccs_tool/update.c index 1defdaf..3af779b 100644 --- a/ccs/ccs_tool/update.c +++ b/ccs/ccs_tool/update.c @@ -113,11 +113,70 @@ fail: } -int update(char *location) +static int parse_args(int argc, char **argv, char **loc) +{ + int c, error, ret; + + while ((c = getopt(argc, argv, "P:")) != EOF) { + switch(c) { + case 'P': + if(optarg[1] != ':'){ + fprintf(stderr, "Bad argument to '-P' option.\n" + "Try '-h' for help.\n"); + error = -EINVAL; + goto fail; + } + switch(optarg[0]){ + case 'b': /* backend port number */ + /* Not used by ccs_tool */ + break; + case 'c': /* cluster base port number */ + ret = atoi(optarg+2); + if(ret < 1024){ + fprintf(stderr, "Bad cluster base port number.\n"); + error = -EINVAL; + goto fail; + } + cluster_base_port = ret; + printf("Set cluster base port to %d\n", cluster_base_port); + break; + case 'f': /* frontend port number */ + /* Not used by ccs_tool */ + break; + } + break; + default: + goto fail; + } + } + + *loc = argv[optind]; + + return 0; +fail: + return error; +} + +int update(const char *location) +{ + char *args[3]; + char **argv; + + args[0] = "update"; + args[1] = location; + args[2] = NULL; + + argv = args; + + return update2(2, argv); +} + +int update2(int argc, char **argv) { int error = 0; int i, fd; int cluster_fd = -1; + char *location = NULL; char true_location[256]; xmlDocPtr doc = NULL; xmlChar *mem_doc; @@ -132,6 +191,9 @@ int update(char *location) struct timeval tv; + if (parse_args(argc, argv, &location)) + return -1; + if (location[0] != '/') { memset(true_location, 0, 256); if (!getcwd(true_location, 256)) { diff --git a/ccs/ccs_tool/update.h b/ccs/ccs_tool/update.h index 19fd7cb..f706963 100644 --- a/ccs/ccs_tool/update.h +++ b/ccs/ccs_tool/update.h @@ -14,5 +14,6 @@ #define __UPDATE_DOT_H__ int update(char *location); +int update2(int argc, char **argv); #endif /* __UPDATE_DOT_H__ */

1 0

cluster: RHEL57 - GFS: speed up gfs_fsck
by Bob Peterson 14 Feb '11

14 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5b… Commit: 5b78e00a39c53d81281978ab575dff5801c0d1a6 Parent: 6d0b3a728aa478d73621fa003be63806d3623b26 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Feb 14 13:59:50 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Mon Feb 14 13:59:50 2011 -0600 GFS: speed up gfs_fsck This patch reduces the memory requirements of gfs_fsck by combining bitmap and block_map settings that were rarely used. It also speeds up gfs_fsck by eliminating un-needed parameter passing, optimizing bitmap math and simplifying bitmap structures. rhbz#515834 --- gfs/gfs_fsck/bio.c | 8 +- gfs/gfs_fsck/bio.h | 4 +- gfs/gfs_fsck/bitmap.c | 79 ++++++++++--- gfs/gfs_fsck/block_list.c | 286 +++++++++++++++----------------------------- gfs/gfs_fsck/block_list.h | 54 ++------- gfs/gfs_fsck/file.c | 6 +- gfs/gfs_fsck/fs_bits.c | 60 +++++----- gfs/gfs_fsck/fs_bits.h | 4 +- gfs/gfs_fsck/fs_bmap.c | 17 ++-- gfs/gfs_fsck/fs_dir.c | 22 ++-- gfs/gfs_fsck/fs_inode.c | 14 +- gfs/gfs_fsck/initialize.c | 2 +- gfs/gfs_fsck/inode.c | 8 +- gfs/gfs_fsck/metawalk.c | 27 +++-- gfs/gfs_fsck/metawalk.h | 5 +- gfs/gfs_fsck/pass1.c | 29 +++-- gfs/gfs_fsck/pass1b.c | 12 +- gfs/gfs_fsck/pass1c.c | 6 +- gfs/gfs_fsck/pass2.c | 20 ++-- gfs/gfs_fsck/pass3.c | 2 +- gfs/gfs_fsck/pass4.c | 5 +- gfs/gfs_fsck/pass5.c | 2 - gfs/gfs_fsck/rgrp.c | 8 +- gfs/gfs_fsck/super.c | 18 ++-- gfs/gfs_fsck/util.c | 2 +- 25 files changed, 316 insertions(+), 384 deletions(-) diff --git a/gfs/gfs_fsck/bio.c b/gfs/gfs_fsck/bio.c index cfa5cc5..cd6833c 100644 --- a/gfs/gfs_fsck/bio.c +++ b/gfs/gfs_fsck/bio.c @@ -91,11 +91,10 @@ void relse_buf(struct fsck_sb *sdp, osi_buf_t *bh){ * @sdp: the super block * @blkno: block number * @bhp: place where buffer is returned - * @flags: * * Returns 0 on success, -1 on error */ -int read_buf(struct fsck_sb *sdp, osi_buf_t *bh, int flags){ +int read_buf(struct fsck_sb *sdp, osi_buf_t *bh){ int disk_fd = sdp->diskfd; if(do_lseek(disk_fd, (uint64)(BH_BLKNO(bh)*BH_SIZE(bh)))){ @@ -161,15 +160,14 @@ int write_buf(struct fsck_sb *sdp, osi_buf_t *bh, int flags){ * * Returns: 0 on success, -1 on error */ -int get_and_read_buf(struct fsck_sb *sdp, uint64 blkno, osi_buf_t **bhp, - int flags) +int get_and_read_buf(struct fsck_sb *sdp, uint64 blkno, osi_buf_t **bhp) { if(get_buf(sdp, blkno, bhp)) { stack; return -1; } - if(read_buf(sdp, *bhp, flags)){ + if(read_buf(sdp, *bhp)){ stack; relse_buf(sdp, *bhp); *bhp = NULL; /* guarantee that ptr is NULL in failure cases */ diff --git a/gfs/gfs_fsck/bio.h b/gfs/gfs_fsck/bio.h index 0f4ef62..bbf34be 100644 --- a/gfs/gfs_fsck/bio.h +++ b/gfs/gfs_fsck/bio.h @@ -27,9 +27,9 @@ int get_buf(struct fsck_sb *sdp, uint64 blkno, osi_buf_t **bhp); void relse_buf(struct fsck_sb *sdp, osi_buf_t *bh); -int read_buf(struct fsck_sb *sdp, osi_buf_t *bh, int flags); +int read_buf(struct fsck_sb *sdp, osi_buf_t *bh); int write_buf(struct fsck_sb *sdp, osi_buf_t *bh, int flags); -int get_and_read_buf(struct fsck_sb *sdp, uint64 blkno, osi_buf_t **bhp, int flags); +int get_and_read_buf(struct fsck_sb *sdp, uint64 blkno, osi_buf_t **bhp); #endif /* __BIO_H */ diff --git a/gfs/gfs_fsck/bitmap.c b/gfs/gfs_fsck/bitmap.c index 507dcc8..1e87d93 100644 --- a/gfs/gfs_fsck/bitmap.c +++ b/gfs/gfs_fsck/bitmap.c @@ -22,11 +22,39 @@ #define BITMAP_SIZE(size, cpb) (size / cpb) +#define BITMAP_SIZE1(size) (size >> 3) +#define BITMAP_SIZE4(size) (size >> 1) #define BITMAP_BYTE_OFFSET(x, map) ((x % map->chunks_per_byte) \ * map->chunksize ) +/* BITMAP_BYTE_OFFSET1 is for chunksize==1, which implies chunks_per_byte==8 */ +/* Reducing the math, we get: */ +/* #define BITMAP_BYTE_OFFSET1(x) ((x % 8) * 1) */ +/* #define BITMAP_BYTE_OFFSET1(x) (x % 8) */ +/* #define BITMAP_BYTE_OFFSET1(x) (x & 0x0000000000000007) */ +#define BITMAP_BYTE_OFFSET1(x) (x & 0x0000000000000007) + +/* BITMAP_BYTE_OFFSET4 is for chunksize==4, which implies chunks_per_byte==2 */ +/* Reducing the math, we get: */ +/* #define BITMAP_BYTE_OFFSET4(x) ((x % 2) * 4) */ +/* #define BITMAP_BYTE_OFFSET4(x) ((x & 0x0000000000000001) * 4) */ +/* #define BITMAP_BYTE_OFFSET4(x) ((x & 0x0000000000000001) << 2) */ +#define BITMAP_BYTE_OFFSET4(x) ((x & 0x0000000000000001) << 2) + #define BITMAP_MASK(chunksize) ((2 << (chunksize - 1)) - 1) +/* BITMAP_MASK1 is for chunksize==1 */ +/* Reducing the math, we get: */ +/* #define BITMAP_MASK1(chunksize) ((2 << (1 - 1)) - 1) */ +/* #define BITMAP_MASK1(chunksize) ((2 << 0) - 1) */ +/* #define BITMAP_MASK1(chunksize) ((2) - 1) */ +#define BITMAP_MASK1(chunksize) (1) + +/* BITMAP_MASK4 is for chunksize==4 */ +/* #define BITMAP_MASK(chunksize) ((2 << (4 - 1)) - 1) */ +/* #define BITMAP_MASK(chunksize) ((2 << 3) - 1) */ +/* #define BITMAP_MASK(chunksize) (0x10 - 1) */ +#define BITMAP_MASK4(chunksize) (0xf) uint64_t bitmap_size(struct bmap *bmap) { return bmap->size; @@ -71,14 +99,19 @@ int bitmap_create(struct bmap *bmap, uint64_t size, uint8_t chunksize) int bitmap_set(struct bmap *bmap, uint64_t offset, uint8_t val) { - char *byte = NULL; - uint64_t b = offset; + static char *byte; + static uint64_t b; if(offset < bmap->size) { - byte = bmap->map + BITMAP_SIZE(offset, bmap->chunks_per_byte); - b = BITMAP_BYTE_OFFSET(offset, bmap); - - *byte |= (val & BITMAP_MASK(bmap->chunksize)) << b; + if (bmap->chunksize == 1) { + byte = bmap->map + BITMAP_SIZE1(offset); + b = BITMAP_BYTE_OFFSET1(offset); + *byte |= (val & BITMAP_MASK1(bmap->chunksize)) << b; + } else { + byte = bmap->map + BITMAP_SIZE4(offset); + b = BITMAP_BYTE_OFFSET4(offset); + *byte |= (val & BITMAP_MASK4(bmap->chunksize)) << b; + } return 0; } log_debug("offset %d out of bounds\n", offset); @@ -87,14 +120,19 @@ int bitmap_set(struct bmap *bmap, uint64_t offset, uint8_t val) int bitmap_get(struct bmap *bmap, uint64_t bit, uint8_t *val) { - char *byte = NULL; - uint64_t b = bit; + static char *byte; + static uint64_t b; if(bit < bmap->size) { - byte = bmap->map + BITMAP_SIZE(bit, bmap->chunks_per_byte); - b = BITMAP_BYTE_OFFSET(bit, bmap); - - *val = (*byte & (BITMAP_MASK(bmap->chunksize) <> b; + if (bmap->chunksize == 1) { + byte = bmap->map + BITMAP_SIZE1(bit); + b = BITMAP_BYTE_OFFSET1(bit); + *val = (*byte & (BITMAP_MASK1(bmap->chunksize) <> b; + } else { + byte = bmap->map + BITMAP_SIZE4(bit); + b = BITMAP_BYTE_OFFSET4(bit); + *val = (*byte & (BITMAP_MASK4(bmap->chunksize) <> b; + } return 0; } log_debug("offset %d out of bounds\n", bit); @@ -104,14 +142,19 @@ int bitmap_get(struct bmap *bmap, uint64_t bit, uint8_t *val) int bitmap_clear(struct bmap *bmap, uint64_t offset) { - char *byte = NULL; - uint64_t b = offset; + static char *byte; + static uint64_t b; if(offset < bmap->size) { - byte = bmap->map + BITMAP_SIZE(offset, bmap->chunks_per_byte); - b = BITMAP_BYTE_OFFSET(offset, bmap); - - *byte &= ~(BITMAP_MASK(bmap->chunksize) << b); + if (bmap->chunksize == 1) { + byte = bmap->map + BITMAP_SIZE1(offset); + b = BITMAP_BYTE_OFFSET1(offset); + *byte &= ~(BITMAP_MASK1(bmap->chunksize) << b); + } else { + byte = bmap->map + BITMAP_SIZE4(offset); + b = BITMAP_BYTE_OFFSET4(offset); + *byte &= ~(BITMAP_MASK4(bmap->chunksize) << b); + } return 0; } log_debug("offset %d out of bounds\n", offset); diff --git a/gfs/gfs_fsck/block_list.c b/gfs/gfs_fsck/block_list.c index f44de6a..c1eadd1 100644 --- a/gfs/gfs_fsck/block_list.c +++ b/gfs/gfs_fsck/block_list.c @@ -24,11 +24,10 @@ static int mark_to_gbmap[16] = { block_free, block_used, indir_blk, inode_dir, inode_file, inode_lnk, inode_blk, inode_chr, inode_fifo, inode_sock, - leaf_blk, journal_blk, meta_other, meta_free, - meta_eattr, meta_inval + leaf_blk, meta_other, meta_free, meta_eattr, bad_block, meta_inval }; -struct block_list *block_list_create(uint64_t size, enum block_list_type type) +struct block_list *block_list_create(uint64_t size) { struct block_list *il; uint64_t addl_mem_needed = 0L; @@ -39,56 +38,43 @@ struct block_list *block_list_create(uint64_t size, enum block_list_type type) log_err("Cannot set block list to zero\n"); return NULL; } - il->type = type; - switch(type) { - case gbmap: - if(bitmap_create(&il->list.gbmap.group_map, size, 4)) { - /* Note on addl_mem_needed: We've tried to allocate ram */ - /* for our bitmaps, but we failed. The fs is too big. */ - /* We should tell them how much to allocate. This first */ - /* bitmap is the biggest, but we need three more smaller */ - /* for the code that immediately follows. I'm rounding */ - /* up to twice the memory for this bitmap, even though */ - /* it's actually 1 + 3/4. That will allow for future */ - /* mallocs that happen after this point in the code. */ - /* For the bad_map, we have two more to go (total of 3) */ - /* but again I'm rounding it up to 4 smaller ones. */ - /* For the dup_map, I'm rounding from 2 to 3, and for */ - /* eattr_map, I'm rounding up from 1 to 2. */ - addl_mem_needed = il->list.gbmap.group_map.mapsize * 2; - stack; - free(il); - il = NULL; - } - else if(bitmap_create(&il->list.gbmap.bad_map, size, 1)) { - addl_mem_needed = il->list.gbmap.group_map.mapsize * 4; - stack; - free(il); - il = NULL; - } - else if(bitmap_create(&il->list.gbmap.dup_map, size, 1)) { - addl_mem_needed = il->list.gbmap.group_map.mapsize * 3; - stack; - free(il); - il = NULL; - } - else if(bitmap_create(&il->list.gbmap.eattr_map, size, 1)) { - addl_mem_needed = il->list.gbmap.group_map.mapsize * 2; - stack; - free(il); - il = NULL; - } - if (addl_mem_needed) { - log_err("This system doesn't have enough memory + swap space to fsck this file system.\n"); - log_err("Additional memory needed is approximately: %ldMB\n", addl_mem_needed / 1048576); - log_err("Please increase your swap space by that amount and run gfs_fsck again.\n"); - } - break; - default: - log_crit("Block list type %d not implemented\n", - type); - break; + if(bitmap_create(&il->group_map, size, 4)) { + /* Note on addl_mem_needed: We've tried to allocate + ram for our bitmaps, but we failed. The fs is too + big. We should tell them how much to allocate. + This first bitmap is the biggest, but we need three + more smaller for the code that immediately follows. + I'm rounding up to twice the memory for this bitmap, + even though it's actually 1 + 1/2. That will allow + for future mallocs that happen after this point in + the code. For the dup_map, I'm rounding from 2 + to 3, and for eattr_map, I'm rounding up from 1 to + 2. */ + addl_mem_needed = il->group_map.mapsize * 2; + stack; + free(il); + il = NULL; + } + else if(bitmap_create(&il->dup_map, size, 1)) { + addl_mem_needed = il->group_map.mapsize * 2; + stack; + free(il); + il = NULL; + } + else if(bitmap_create(&il->eattr_map, size, 1)) { + addl_mem_needed = il->group_map.mapsize; + stack; + free(il); + il = NULL; + } + if (addl_mem_needed) { + log_err("This system doesn't have enough memory + " + "swap space to fsck this file system.\n"); + log_err("Additional memory needed is approximately: " + "%ldMB\n", addl_mem_needed / 1048576); + log_err("Please increase your swap space by that " + "amount and run gfs_fsck again.\n"); } } @@ -97,37 +83,21 @@ struct block_list *block_list_create(uint64_t size, enum block_list_type type) int block_mark(struct block_list *il, uint64_t block, enum mark_block mark) { - int err = 0; - - switch(il->type) { - case gbmap: - if(mark == bad_block) { - err = bitmap_set(&il->list.gbmap.bad_map, block, 1); - } - else if(mark == dup_block) { - err = bitmap_set(&il->list.gbmap.dup_map, block, 1); - } - else if(mark == eattr_block) { - err = bitmap_set(&il->list.gbmap.eattr_map, block, 1); - } - else { - err = bitmap_set(&il->list.gbmap.group_map, block, - mark_to_gbmap[mark]); - } - - break; - default: - log_err("block list type %d not implemented\n", - il->type); - err = -1; - break; - } + int err; + + if(mark == dup_block) + err = bitmap_set(&il->dup_map, block, 1); + else if(mark == eattr_block) + err = bitmap_set(&il->eattr_map, block, 1); + else + err = bitmap_set(&il->group_map, block, mark_to_gbmap[mark]); return err; } int block_set(struct block_list *il, uint64_t block, enum mark_block mark) { - int err = 0; + int err; + err = block_clear(il, block); if(!err) err = block_mark(il, block, mark); @@ -136,31 +106,18 @@ int block_set(struct block_list *il, uint64_t block, enum mark_block mark) int block_unmark(struct block_list *il, uint64_t block, enum mark_block m) { - int err = 0; - - switch(il->type) { - case gbmap: - switch (m) { - case dup_block: - err = bitmap_clear(&il->list.gbmap.dup_map, block); - break; - case bad_block: - err = bitmap_clear(&il->list.gbmap.bad_map, block); - break; - case eattr_block: - err = bitmap_clear(&il->list.gbmap.eattr_map, block); - break; - default: - /* FIXME: check types */ - err = bitmap_clear(&il->list.gbmap.group_map, block); - break; - } + int err; + switch (m) { + case dup_block: + err = bitmap_clear(&il->dup_map, block); + break; + case eattr_block: + err = bitmap_clear(&il->eattr_map, block); break; default: - log_err("block list type %d not implemented\n", - il->type); - err = -1; + /* FIXME: check types */ + err = bitmap_clear(&il->group_map, block); break; } return err; @@ -168,80 +125,40 @@ int block_unmark(struct block_list *il, uint64_t block, enum mark_block m) int block_clear(struct block_list *il, uint64_t block) { - int err = 0; + int err; - switch(il->type) { - case gbmap: - err = bitmap_clear(&il->list.gbmap.dup_map, block); - err = bitmap_clear(&il->list.gbmap.bad_map, block); - err = bitmap_clear(&il->list.gbmap.eattr_map, block); - err = bitmap_clear(&il->list.gbmap.group_map, block); - break; - default: - log_err("block list type %d not implemented\n", - il->type); - err = -1; - break; - } + err = bitmap_clear(&il->dup_map, block); + err = bitmap_clear(&il->eattr_map, block); + err = bitmap_clear(&il->group_map, block); return err; } int block_check(struct block_list *il, uint64_t block, struct block_query *val) { - int err = 0; + int err; + val->block_type = 0; - val->bad_block = 0; val->dup_block = 0; - switch(il->type) { - case gbmap: - if((err = bitmap_get(&il->list.gbmap.group_map, block, - &val->block_type))) { - log_err("Unable to get block type for block %" - PRIu64"\n", block); - break; - } - if((err = bitmap_get(&il->list.gbmap.bad_map, block, - &val->bad_block))) { - log_err("Unable to get bad block status for block %" - PRIu64"\n", block); - break; - } - if((err = bitmap_get(&il->list.gbmap.dup_map, block, - &val->dup_block))) { - log_err("Unable to get duplicate status for block %" - PRIu64"\n", block); - break; - } - if((err = bitmap_get(&il->list.gbmap.eattr_map, block, - &val->eattr_block))) { - log_err("Unable to get eattr status for block %" - PRIu64"\n", block); - break; - } - break; - default: - log_err("block list type %d not implemented\n", - il->type); - err = -1; - break; - } - + if((err = bitmap_get(&il->group_map, block, &val->block_type))) + log_err("Unable to get block type for block %" + PRIu64"\n", block); + else if((err = bitmap_get(&il->dup_map, block, + &val->dup_block))) + log_err("Unable to get duplicate status for block %" + PRIu64"\n", block); + else if((err = bitmap_get(&il->eattr_map, block, + &val->eattr_block))) + log_err("Unable to get eattr status for block %" + PRIu64"\n", block); return err; } void *block_list_destroy(struct block_list *il) { if(il) { - switch(il->type) { - case gbmap: - bitmap_destroy(&il->list.gbmap.group_map); - bitmap_destroy(&il->list.gbmap.bad_map); - bitmap_destroy(&il->list.gbmap.dup_map); - bitmap_destroy(&il->list.gbmap.eattr_map); - break; - default: - break; - } + bitmap_destroy(&il->group_map); + bitmap_destroy(&il->dup_map); + bitmap_destroy(&il->eattr_map); free(il); il = NULL; } @@ -255,40 +172,33 @@ int find_next_block_type(struct block_list *il, enum mark_block m, uint64_t *b) uint8_t val; int found = 0; for(i = *b; ; i++) { - switch(il->type) { - case gbmap: - if(i >= bitmap_size(&il->list.gbmap.dup_map)) - return -1; + if(i >= bitmap_size(&il->dup_map)) + return -1; - switch(m) { - case dup_block: - if(bitmap_get(&il->list.gbmap.dup_map, i, &val)) { - stack; - return -1; - } - - if(val) - found = 1; - break; - case eattr_block: - if(bitmap_get(&il->list.gbmap.eattr_map, i, &val)) { - stack; - return -1; - } - - if(val) - found = 1; - break; - default: - /* FIXME: add support for getting - * other types */ - log_err("Unhandled block type\n"); + switch(m) { + case dup_block: + if(bitmap_get(&il->dup_map, i, &val)) { + stack; + return -1; + } + if(val) + found = 1; + break; + case eattr_block: + if(bitmap_get(&il->eattr_map, i, &val)) { + stack; + return -1; } + + if(val) + found = 1; break; default: - log_err("Unhandled block list type\n"); + /* FIXME: add support for getting other types */ + log_err("Unhandled block type\n"); break; } + if(found) { *b = i; return 0; diff --git a/gfs/gfs_fsck/block_list.h b/gfs/gfs_fsck/block_list.h index 7fd02eb..00a2600 100644 --- a/gfs/gfs_fsck/block_list.h +++ b/gfs/gfs_fsck/block_list.h @@ -15,14 +15,6 @@ #include "bitmap.h" -#define BMAP_COUNT 13 - -enum block_list_type { - gbmap = 0, /* Grouped bitmap */ - dbmap, /* Ondisk bitmap - like grouped bitmap, but mmaps - * the bitmaps onto file(s) ondisk - not implemented */ -}; - /* Must be kept in sync with mark_to_bitmap array in block_list.c */ enum mark_block { block_free = 0, @@ -36,57 +28,31 @@ enum mark_block { inode_fifo = 8, inode_sock = 9, leaf_blk = 10, - journal_blk = 11, - meta_other = 12, - meta_free = 13, - meta_eattr = 14, + meta_other = 11, + meta_free = 12, + meta_eattr = 13, + bad_block = 14, /* Contains at least one bad block */ meta_inval = 15, /* above this are nibble-values 0x0-0xf */ - bad_block = 16, /* Contains at least one bad block */ - dup_block = 17, /* Contains at least one duplicate block */ - eattr_block = 18, /* Contains an eattr */ + /* A block can be both duplicate and one of the above. */ + dup_block = 16, /* Contains at least one duplicate block */ + eattr_block = 17, /* Contains an eattr */ }; struct block_query { uint8_t block_type; - uint8_t bad_block; uint8_t dup_block; uint8_t eattr_block; }; -struct gbmap { - struct bmap group_map; - struct bmap bad_map; - struct bmap dup_map; - struct bmap eattr_map; -}; - -struct dbmap { +/* bitmap implementation */ +struct block_list { struct bmap group_map; - char *group_file; - struct bmap bad_map; - char *bad_file; struct bmap dup_map; - char *dup_file; struct bmap eattr_map; - char *eattr_file; -}; - -union block_lists { - struct gbmap gbmap; - struct dbmap dbmap; }; - -/* bitmap implementation */ -struct block_list { - enum block_list_type type; - /* Union of bitmap, rle */ - union block_lists list; -}; - - -struct block_list *block_list_create(uint64_t size, enum block_list_type type); +struct block_list *block_list_create(uint64_t size); int block_mark(struct block_list *il, uint64_t block, enum mark_block mark); int block_set(struct block_list *il, uint64_t block, enum mark_block mark); int block_unmark(struct block_list *il, uint64_t block, enum mark_block m); diff --git a/gfs/gfs_fsck/file.c b/gfs/gfs_fsck/file.c index 5217e92..559a979 100644 --- a/gfs/gfs_fsck/file.c +++ b/gfs/gfs_fsck/file.c @@ -83,7 +83,7 @@ int readi(struct fsck_inode *ip, void *buf, uint64 offset, unsigned int size) } if (dblock){ - error = get_and_read_buf(ip->i_sbd, dblock, &bh, 0); + error = get_and_read_buf(ip->i_sbd, dblock, &bh); if (error){ log_err("readi: Unable to perform get_and_read_buf()\n"); goto out; @@ -184,7 +184,7 @@ int writei(struct fsck_inode *ip, void *buf, uint64_t offset, unsigned int size) } } - error = get_and_read_buf(ip->i_sbd, dblock, &bh, 0); + error = get_and_read_buf(ip->i_sbd, dblock, &bh); if (error) goto fail; @@ -206,7 +206,7 @@ int writei(struct fsck_inode *ip, void *buf, uint64_t offset, unsigned int size) out: - error = get_and_read_buf(ip->i_sbd, ip->i_num.no_addr, &dibh, 0); + error = get_and_read_buf(ip->i_sbd, ip->i_num.no_addr, &dibh); if (error){ log_err("fs_writei: " "Unable to get inode buffer.\n"); diff --git a/gfs/gfs_fsck/fs_bits.c b/gfs/gfs_fsck/fs_bits.c index fce646a..ec12a9d 100644 --- a/gfs/gfs_fsck/fs_bits.c +++ b/gfs/gfs_fsck/fs_bits.c @@ -79,7 +79,6 @@ uint32_t fs_bitfit_core(struct fsck_sb *sbp, uint64_t goal, uint64_t start, uint case inode_sock: case indir_blk: case leaf_blk: - case journal_blk: case meta_other: case meta_eattr: return block - start; @@ -184,14 +183,13 @@ uint32_t fs_bitcount(unsigned char *buffer, unsigned int buflen, * @goal: the goal block in the RG * @old_state: the type of block to find * @new_state: the resulting block type - * @do_it: if FALSE, we just find the block we would allocate * * * Returns: returns the block allocated, or BFITNOENT on failure */ uint32_t fs_blkalloc_internal(struct fsck_rgrp *rgd, uint32_t goal, unsigned char old_state, - unsigned char new_state, int do_it) + unsigned char new_state) { struct fsck_sb *sdp = rgd->rd_sbd; uint32_t block = 0; @@ -251,56 +249,64 @@ uint32_t fs_blkalloc_internal(struct fsck_rgrp *rgd, uint32_t goal, * * Returns: state on success, -1 on error */ -int fs_get_bitmap(struct fsck_sb *sdp, uint64 blkno, struct fsck_rgrp *rgd){ +int fs_get_bitmap(struct fsck_sb *sdp, uint64 blkno, struct fsck_rgrp **rgd){ int buf, val; uint32_t rgrp_block; -/* struct fsck_rgrp *rgd;*/ fs_bitmap_t *bits = NULL; unsigned int bit; unsigned char *byte; - int local_rgd = 0; if(check_range(sdp, blkno)){ log_warn("Block #%"PRIu64" is out of range.\n", blkno); return -1; } - if(rgd == NULL) { - local_rgd = 1; - rgd = fs_blk2rgrpd(sdp, blkno); - } - if(rgd == NULL){ - log_err( "Unable to get rgrp for block #%"PRIu64"\n", blkno); - return -1; + /* If we had a previous rgd, see if the block is represented by it. */ + if (*rgd) { + struct gfs_rindex *ri; + + ri = &(*rgd)->rd_ri; + if (ri->ri_data1 > blkno || + blkno >= ri->ri_data1 + ri->ri_data) { /* outside range */ + fs_rgrp_relse(*rgd); /* release the previous */ + *rgd = NULL; /* zero out to read a new one in */ + } } - if(fs_rgrp_read(rgd, FALSE)){ /* FALSE:don't try to fix (done elsewhere) */ - log_err( "Unable to read rgrp.\n"); - return -1; + if(*rgd == NULL) { + *rgd = fs_blk2rgrpd(sdp, blkno); + if(*rgd == NULL){ + log_err( "Unable to get rgrp for block #%"PRIu64"\n", + blkno); + return -1; + } + if(fs_rgrp_read(*rgd, FALSE)){ /* FALSE:don't try to fix + (done elsewhere) */ + log_err( "Unable to read rgrp.\n"); + return -1; + } } - rgrp_block = (uint32_t)(blkno - rgd->rd_ri.ri_data1); + rgrp_block = (uint32_t)(blkno - (*rgd)->rd_ri.ri_data1); - for(buf= 0; buf < rgd->rd_ri.ri_length; buf++){ - bits = &(rgd->rd_bits[buf]); + for(buf= 0; buf < (*rgd)->rd_ri.ri_length; buf++){ + bits = &((*rgd)->rd_bits[buf]); if(rgrp_block < ((bits->bi_start + bits->bi_len)*GFS_NBBY)){ break; } } - if(buf >= rgd->rd_ri.ri_length){ + if(buf >= (*rgd)->rd_ri.ri_length){ log_err( "Unable to locate bitmap entry for block #%"PRIu64"\n", - blkno); - fs_rgrp_relse(rgd); + blkno); + fs_rgrp_relse(*rgd); return -1; } - byte = (BH_DATA(rgd->rd_bh[buf]) + bits->bi_offset) + - (rgrp_block/GFS_NBBY - bits->bi_start); + byte = (unsigned char *)((BH_DATA((*rgd)->rd_bh[buf]) + + bits->bi_offset) + + (rgrp_block/GFS_NBBY - bits->bi_start)); bit = (rgrp_block % GFS_NBBY) * GFS_BIT_SIZE; val = ((*byte >> bit) & GFS_BIT_MASK); - if(local_rgd) { - fs_rgrp_relse(rgd); - } return val; } diff --git a/gfs/gfs_fsck/fs_bits.h b/gfs/gfs_fsck/fs_bits.h index 43efe52..02a1df7 100644 --- a/gfs/gfs_fsck/fs_bits.h +++ b/gfs/gfs_fsck/fs_bits.h @@ -38,10 +38,10 @@ uint32_t fs_bitfit(unsigned char *buffer, unsigned int buflen, /* functions with blk #'s that are rgrp relative */ uint32_t fs_blkalloc_internal(struct fsck_rgrp *rgd, uint32_t goal, unsigned char old_state, - unsigned char new_state, int do_it); + unsigned char new_state); /* functions with blk #'s that are file system relative */ -int fs_get_bitmap(struct fsck_sb *sdp, uint64_t blkno, struct fsck_rgrp *rgd); +int fs_get_bitmap(struct fsck_sb *sdp, uint64_t blkno, struct fsck_rgrp **rgd); int fs_set_bitmap(struct fsck_sb *sdp, uint64_t blkno, int state); #endif /* __FS_BITS_H__ */ diff --git a/gfs/gfs_fsck/fs_bmap.c b/gfs/gfs_fsck/fs_bmap.c index e5243ef..4ca4308 100644 --- a/gfs/gfs_fsck/fs_bmap.c +++ b/gfs/gfs_fsck/fs_bmap.c @@ -50,7 +50,7 @@ int fs_unstuff_dinode(struct fsck_inode *ip) } - error = get_and_read_buf(sdp, ip->i_num.no_addr, &dibh, 0); + error = get_and_read_buf(sdp, ip->i_num.no_addr, &dibh); if (error) { stack; goto fail; @@ -89,9 +89,8 @@ int fs_unstuff_dinode(struct fsck_inode *ip) goto fail; } relse_buf(sdp, bh); - block_set(sdp->bl, block, journal_blk); - } - else{ + block_set(sdp->bl, block, meta_other); + } else { error = fs_blkalloc(ip, &block); if(error) { @@ -207,7 +206,7 @@ static int build_height(struct fsck_inode *ip, int height) int error; while (ip->i_di.di_height < height){ - error = get_and_read_buf(ip->i_sbd, ip->i_num.no_addr, &dibh, 0); + error = get_and_read_buf(ip->i_sbd, ip->i_num.no_addr, &dibh); if (error) goto fail; @@ -226,7 +225,7 @@ static int build_height(struct fsck_inode *ip, int height) if (error) goto fail_drelse; - error = get_and_read_buf(sdp, block, &bh, 0); + error = get_and_read_buf(sdp, block, &bh); if (error) goto fail_drelse; @@ -469,7 +468,7 @@ int fs_block_map(struct fsck_inode *ip, uint64 lblock, int *new, } - error = get_and_read_buf(ip->i_sbd, ip->i_num.no_addr, &bh, 0); + error = get_and_read_buf(ip->i_sbd, ip->i_num.no_addr, &bh); if (error) goto fail; @@ -485,7 +484,7 @@ int fs_block_map(struct fsck_inode *ip, uint64 lblock, int *new, if (!*dblock) goto out; - error = get_and_read_buf(ip->i_sbd, *dblock, &bh, 0); + error = get_and_read_buf(ip->i_sbd, *dblock, &bh); if (error) goto fail; } @@ -522,7 +521,7 @@ int fs_block_map(struct fsck_inode *ip, uint64 lblock, int *new, out: if (*new){ - error = get_and_read_buf(sdp, ip->i_num.no_addr, &bh, 0); + error = get_and_read_buf(sdp, ip->i_num.no_addr, &bh); if (error) goto fail; gfs_dinode_out(&ip->i_di, BH_DATA(bh)); diff --git a/gfs/gfs_fsck/fs_dir.c b/gfs/gfs_fsck/fs_dir.c index 3dcfcea..f5b9613 100644 --- a/gfs/gfs_fsck/fs_dir.c +++ b/gfs/gfs_fsck/fs_dir.c @@ -200,7 +200,7 @@ static int get_leaf(struct fsck_inode *dip, uint64 leaf_no, osi_buf_t **bhp) { int error; - error = get_and_read_buf(dip->i_sbd, leaf_no, bhp, 0); + error = get_and_read_buf(dip->i_sbd, leaf_no, bhp); if (error) { log_err("Unable to read leaf buffer #%"PRIu64"\n", leaf_no); @@ -547,7 +547,7 @@ static int dir_l_search(struct fsck_inode *dip, identifier_t *id, unsigned int * return -1; } - error = get_and_read_buf(dip->i_sbd, dip->i_num.no_addr, &dibh, 0); + error = get_and_read_buf(dip->i_sbd, dip->i_num.no_addr, &dibh); if (error) goto out; @@ -619,7 +619,7 @@ static int dir_make_exhash(struct fsck_inode *dip) return -1; } - error = get_and_read_buf(dip->i_sbd, dip->i_num.no_addr, &dibh, 0); + error = get_and_read_buf(dip->i_sbd, dip->i_num.no_addr, &dibh); if (error) goto fail; @@ -632,7 +632,7 @@ static int dir_make_exhash(struct fsck_inode *dip) /* Turn over a new leaf */ - error = get_and_read_buf(sdp, bn, &bh, 0); + error = get_and_read_buf(sdp, bn, &bh); if (error) goto fail_drelse; @@ -767,7 +767,7 @@ static int dir_split_leaf(struct fsck_inode *dip, uint32 index, uint64 leaf_no) /* Get the new leaf block */ - error = get_and_read_buf(sdp, bn, &nbh, 0); + error = get_and_read_buf(sdp, bn, &nbh); if (error) goto fail; @@ -916,7 +916,7 @@ static int dir_split_leaf(struct fsck_inode *dip, uint32 index, uint64 leaf_no) nleaf->lf_depth = oleaf->lf_depth; - error = get_and_read_buf(dip->i_sbd, dip->i_num.no_addr, &dibh, 0); + error = get_and_read_buf(dip->i_sbd, dip->i_num.no_addr, &dibh); if(error){ log_err("dir_split_leaf: Unable to get inode buffer.\n"); goto fail_orelse; @@ -1042,7 +1042,7 @@ static int dir_double_exhash(struct fsck_inode *dip) free(buf); buf=NULL; - error = get_and_read_buf(sdp, dip->i_num.no_addr, &dibh, 0); + error = get_and_read_buf(sdp, dip->i_num.no_addr, &dibh); if(error){ log_err("dir_double_exhash: " "Unable to get inode buffer.\n"); @@ -1157,7 +1157,7 @@ static int dir_l_del(struct fsck_inode *dip, osi_buf_t *dibh, if(!dibh) { error = get_and_read_buf(dip->i_sbd, dip->i_num.no_addr, - &dibh, 0); + &dibh); if (error){ log_err("dir_l_del: Failed to read in dinode buffer.\n"); return -1; @@ -1320,7 +1320,7 @@ static int dir_e_add(struct fsck_inode *dip, osi_filename_t *filename, return error; } - error = get_and_read_buf(sdp, bn, &nbh, 0); + error = get_and_read_buf(sdp, bn, &nbh); if (error){ relse_buf(sdp, bh); return error; @@ -1377,7 +1377,7 @@ static int dir_e_add(struct fsck_inode *dip, osi_filename_t *filename, write_buf(sdp, bh, 0); relse_buf(sdp, bh); - error = get_and_read_buf(dip->i_sbd, dip->i_num.no_addr, &dibh, 0); + error = get_and_read_buf(dip->i_sbd, dip->i_num.no_addr, &dibh); if(error){ log_err("dir_e_add: Unable to get inode buffer.\n"); return error; @@ -1431,7 +1431,7 @@ static int dir_l_add(struct fsck_inode *dip, osi_filename_t *filename, return -1; } - error = get_and_read_buf(dip->i_sbd, dip->i_num.no_addr, &dibh, 0); + error = get_and_read_buf(dip->i_sbd, dip->i_num.no_addr, &dibh); if (error) goto out; diff --git a/gfs/gfs_fsck/fs_inode.c b/gfs/gfs_fsck/fs_inode.c index fadc073..a2f6a10 100644 --- a/gfs/gfs_fsck/fs_inode.c +++ b/gfs/gfs_fsck/fs_inode.c @@ -86,7 +86,7 @@ int fs_copyin_dinode(struct fsck_inode *ip, osi_buf_t *dibh) if(!dibh) { error = get_and_read_buf(ip->i_sbd, - ip->i_num.no_addr, &dibh, 0); + ip->i_num.no_addr, &dibh); if (error) { stack; goto out; @@ -122,7 +122,7 @@ int fs_copyout_dinode(struct fsck_inode *ip){ osi_buf_t *dibh; int error; - error = get_and_read_buf(ip->i_sbd, ip->i_num.no_addr, &dibh, 0); + error = get_and_read_buf(ip->i_sbd, ip->i_num.no_addr, &dibh); if(error){ log_err( "Unable to get a buffer to write dinode to disk.\n"); return -1; @@ -159,7 +159,7 @@ static int make_dinode(struct fsck_inode *dip, struct gfs_inum *inum, struct fsck_rgrp *rgd; int error; - error = get_and_read_buf(sdp, inum->no_addr, &dibh, 0); + error = get_and_read_buf(sdp, inum->no_addr, &dibh); if (error) goto out; @@ -258,7 +258,7 @@ static int fs_change_nlink(struct fsck_inode *ip, int diff) if(nlink >= ip->i_di.di_nlink) log_err( "fs_change_nlink: Bad link count detected in dinode.\n"); - error = get_and_read_buf(ip->i_sbd, ip->i_num.no_addr, &dibh, 0); + error = get_and_read_buf(ip->i_sbd, ip->i_num.no_addr, &dibh); if (error) goto out; @@ -400,7 +400,7 @@ int fs_createi(struct fsck_inode *dip, osi_filename_t *name, if(rgd->rd_rg.rg_freemeta){ block = fs_blkalloc_internal(rgd, dip->i_num.no_addr, GFS_BLKST_FREEMETA, - GFS_BLKST_USEDMETA, 1); + GFS_BLKST_USEDMETA); log_debug("Got block %"PRIu64"\n", block); if(block == BFITNOENT) { fs_rgrp_relse(rgd); @@ -429,7 +429,7 @@ int fs_createi(struct fsck_inode *dip, osi_filename_t *name, if(!clump_alloc(rgd, 0)){ block = fs_blkalloc_internal(rgd, dip->i_num.no_addr, GFS_BLKST_FREEMETA, - GFS_BLKST_USEDMETA, 1); + GFS_BLKST_USEDMETA); log_debug("Got block %"PRIu64"\n", block); if(block == BFITNOENT) { @@ -544,7 +544,7 @@ int fs_mkdir(struct fsck_inode *dip, char *new_dir, int mode, struct fsck_inode ip->i_di.di_payload_format = GFS_FORMAT_DE; ip->i_di.di_entries = 2; - error = get_and_read_buf(ip->i_sbd, ip->i_num.no_addr, &dibh, 0); + error = get_and_read_buf(ip->i_sbd, ip->i_num.no_addr, &dibh); if(error){ log_err( "fs_mkdir: Unable to aquire directory buffer.\n"); goto fail; diff --git a/gfs/gfs_fsck/initialize.c b/gfs/gfs_fsck/initialize.c index 8d029b8..2b278d1 100644 --- a/gfs/gfs_fsck/initialize.c +++ b/gfs/gfs_fsck/initialize.c @@ -348,7 +348,7 @@ static int fill_super_block(struct fsck_sb *sdp) goto fail; } - sdp->bl = block_list_create(sdp->last_fs_block+1, gbmap); + sdp->bl = block_list_create(sdp->last_fs_block+1); if (!sdp->bl) goto fail; diff --git a/gfs/gfs_fsck/inode.c b/gfs/gfs_fsck/inode.c index e180ba0..1d3790f 100644 --- a/gfs/gfs_fsck/inode.c +++ b/gfs/gfs_fsck/inode.c @@ -51,7 +51,7 @@ int load_inode(struct fsck_sb *sbp, uint64_t block, struct fsck_inode **inode) { osi_buf_t *bh; - if(get_and_read_buf(sbp, block, &bh, 0)){ + if(get_and_read_buf(sbp, block, &bh)){ stack; log_err("Unable to retrieve block %"PRIu64"\n", block); @@ -176,7 +176,7 @@ static int make_dinode(struct fsck_inode *dip, struct fsck_sb *sdp, struct fsck_rgrp *rgd; int error; - error = get_and_read_buf(sdp, inum->no_addr, &dibh, 0); + error = get_and_read_buf(sdp, inum->no_addr, &dibh); if (error) goto out; @@ -271,7 +271,7 @@ int create_inode(struct fsck_sb *sbp, unsigned int type, struct fsck_inode **ip) } if(rgd->rd_rg.rg_freemeta){ block = fs_blkalloc_internal(rgd, 0, - GFS_BLKST_FREEMETA, GFS_BLKST_USEDMETA, 1); + GFS_BLKST_FREEMETA, GFS_BLKST_USEDMETA); log_debug("Got block %"PRIu64"\n", block); if(block == BFITNOENT) { fs_rgrp_relse(rgd); @@ -292,7 +292,7 @@ int create_inode(struct fsck_sb *sbp, unsigned int type, struct fsck_inode **ip) if(allocate && !clump_alloc(rgd, 0)){ block = fs_blkalloc_internal(rgd, 0, GFS_BLKST_FREEMETA, - GFS_BLKST_USEDMETA, 1); + GFS_BLKST_USEDMETA); log_debug("Got block %"PRIu64"\n", block); if(block == BFITNOENT) { diff --git a/gfs/gfs_fsck/metawalk.c b/gfs/gfs_fsck/metawalk.c index 3475bb9..e28a1cc 100644 --- a/gfs/gfs_fsck/metawalk.c +++ b/gfs/gfs_fsck/metawalk.c @@ -214,7 +214,7 @@ static int check_leaf_blks(struct fsck_inode *ip, int *update, if (first_leaf_ptr == -1) first_leaf_ptr = first_ok_leaf; if(check_range(sbp, first_ok_leaf) == 0) { - get_and_read_buf(sbp, first_ok_leaf, &lbh, 0); + get_and_read_buf(sbp, first_ok_leaf, &lbh); /* Make sure it's really a valid leaf block. */ if (check_meta(lbh, GFS_METATYPE_LF) == 0) { relse_buf(sbp, lbh); @@ -262,7 +262,7 @@ static int check_leaf_blks(struct fsck_inode *ip, int *update, int factor = 0, divisor = ref_count; errors_corrected++; - get_and_read_buf(sbp, old_leaf, &lbh, 0); + get_and_read_buf(sbp, old_leaf, &lbh); while (divisor > 1) { factor++; divisor /= 2; @@ -295,7 +295,7 @@ static int check_leaf_blks(struct fsck_inode *ip, int *update, } *update = 0; /* Try to read in the leaf block. */ - if(get_and_read_buf(sbp, leaf_no, &lbh, 0)){ + if(get_and_read_buf(sbp, leaf_no, &lbh)){ log_err("Unable to read leaf block #%" PRIu64" for " "directory #%"PRIu64".\n", @@ -353,7 +353,7 @@ static int check_leaf_blks(struct fsck_inode *ip, int *update, if(update && (count != leaf.lf_entries)) { if(get_and_read_buf(sbp, leaf_no, - &lbh, 0)){ + &lbh)){ log_err("Unable to read leaf block #%" PRIu64" for " "directory #%"PRIu64".\n", @@ -665,7 +665,7 @@ static int build_metalist(struct fsck_inode *ip, osi_list_t *mlp, uint64 *ptr, block; int err; - if(get_and_read_buf(ip->i_sbd, ip->i_di.di_num.no_addr, &metabh, 0)) { + if(get_and_read_buf(ip->i_sbd, ip->i_di.di_num.no_addr, &metabh)) { stack; return -1; } @@ -716,7 +716,7 @@ static int build_metalist(struct fsck_inode *ip, osi_list_t *mlp, } if(!nbh) { if(get_and_read_buf(ip->i_sbd, block, - &nbh, 0)) { + &nbh)) { stack; goto fail; } @@ -759,6 +759,7 @@ int check_metatree(struct fsck_inode *ip, struct metawalk_fxns *pass) int i, head_size; int update = 0; int error = 0; + struct fsck_rgrp *rgd; if (!height) goto end; @@ -781,6 +782,7 @@ int check_metatree(struct fsck_inode *ip, struct metawalk_fxns *pass) /* check data blocks */ list = &metalist[height - 1]; + rgd = NULL; for (tmp = list->next; tmp != list; tmp = tmp->next) { bh = osi_list_entry(tmp, osi_buf_t, b_list); @@ -805,13 +807,17 @@ int check_metatree(struct fsck_inode *ip, struct metawalk_fxns *pass) block = gfs64_to_cpu(*ptr); if(pass->check_data && - (pass->check_data(ip, block, pass->private) < 0)) { + (pass->check_data(ip, block, &rgd, + pass->private) < 0)) { stack; return -1; } } } + if (rgd) + fs_rgrp_relse(rgd); + /* free metalists */ for (i = 0; i < GFS_MAX_META_HEIGHT; i++) { @@ -863,7 +869,7 @@ int check_dir(struct fsck_sb *sbp, uint64_t block, struct metawalk_fxns *pass) int update = 0; int error = 0; - if(get_and_read_buf(sbp, block, &bh, 0)){ + if(get_and_read_buf(sbp, block, &bh)){ log_err("Unable to retrieve block #%"PRIu64"\n", block); block_set(sbp->bl, block, meta_inval); @@ -1047,7 +1053,7 @@ void free_block(struct fsck_sb *sdp, uint64_t block) fs_set_bitmap(sdp, block, GFS_BLKST_FREE); /* Adjust the free space count for the freed block */ rgd = fs_blk2rgrpd(sdp, block); /* find the rg for indir block */ - get_and_read_buf(sdp, rgd->rd_ri.ri_addr, &bh, 0); + get_and_read_buf(sdp, rgd->rd_ri.ri_addr, &bh); rgd->rd_rg.rg_free++; /* adjust the free count */ gfs_rgrp_out(&rgd->rd_rg, bh->b_data); /* back to the buffer */ relse_buf(sdp, bh); /* release the buffer */ @@ -1081,7 +1087,8 @@ int delete_metadata(struct fsck_inode *ip, uint64_t block, osi_buf_t **bh, return delete_blocks(ip, block, bh, "metadata", private); } -int delete_data(struct fsck_inode *ip, uint64_t block, void *private) +int delete_data(struct fsck_inode *ip, uint64_t block, struct fsck_rgrp **rgd, + void *private) { return delete_blocks(ip, block, NULL, "data", private); } diff --git a/gfs/gfs_fsck/metawalk.h b/gfs/gfs_fsck/metawalk.h index 3dc7aac..4aa9ff7 100644 --- a/gfs/gfs_fsck/metawalk.h +++ b/gfs/gfs_fsck/metawalk.h @@ -31,7 +31,8 @@ int delete_blocks(struct fsck_inode *ip, uint64_t block, osi_buf_t **bh, const char *btype, void *private); int delete_metadata(struct fsck_inode *ip, uint64_t block, osi_buf_t **bh, void *private); -int delete_data(struct fsck_inode *ip, uint64_t block, void *private); +int delete_data(struct fsck_inode *ip, uint64_t block, struct fsck_rgrp **rgd, + void *private); int delete_eattr_indir(struct fsck_inode *ip, uint64_t block, uint64_t parent, osi_buf_t **bh, void *private); int delete_eattr_leaf(struct fsck_inode *ip, uint64_t block, uint64_t parent, @@ -59,7 +60,7 @@ struct metawalk_fxns { int (*check_metalist) (struct fsck_inode *ip, uint64_t block, osi_buf_t **bh, void *private); int (*check_data) (struct fsck_inode *ip, uint64_t block, - void *private); + struct fsck_rgrp **rgd, void *private); int (*check_eattr_indir) (struct fsck_inode *ip, uint64_t block, uint64_t parent, osi_buf_t **bh, void *private); diff --git a/gfs/gfs_fsck/pass1.c b/gfs/gfs_fsck/pass1.c index caa7660..4b9de02 100644 --- a/gfs/gfs_fsck/pass1.c +++ b/gfs/gfs_fsck/pass1.c @@ -45,7 +45,8 @@ static int leaf(struct fsck_inode *ip, uint64_t block, osi_buf_t *bh, void *private); static int check_metalist(struct fsck_inode *ip, uint64_t block, osi_buf_t **bh, void *private); -static int check_data(struct fsck_inode *ip, uint64_t block, void *private); +static int check_data(struct fsck_inode *ip, uint64_t block, + struct fsck_rgrp **rgd, void *private); static int check_eattr_indir(struct fsck_inode *ip, uint64_t indirect, uint64_t parent, osi_buf_t **bh, void *private); @@ -116,7 +117,7 @@ static int check_metalist(struct fsck_inode *ip, uint64_t block, block_mark(sdp->bl, block, dup_block); found_dup = 1; } - get_and_read_buf(ip->i_sbd, block, &nbh, 0); + get_and_read_buf(ip->i_sbd, block, &nbh); if (check_meta(nbh, GFS_METATYPE_IN)){ log_debug("Bad indirect block pointer (points to " @@ -140,7 +141,8 @@ static int check_metalist(struct fsck_inode *ip, uint64_t block, return 0; } -static int check_data(struct fsck_inode *ip, uint64_t block, void *private) +static int check_data(struct fsck_inode *ip, uint64_t block, + struct fsck_rgrp **rgd, void *private) { struct fsck_sb *sdp = ip->i_sbd; struct block_query q = {0}; @@ -160,7 +162,7 @@ static int check_data(struct fsck_inode *ip, uint64_t block, void *private) return 1; } - if(get_and_read_buf(ip->i_sbd, block, &data_bh, 0)) { + if(get_and_read_buf(ip->i_sbd, block, &data_bh)) { stack; block_set(sdp->bl, ip->i_di.di_num.no_addr, meta_inval); return 1; @@ -216,7 +218,7 @@ static int check_data(struct fsck_inode *ip, uint64_t block, void *private) block_unmark(sdp->bl, block, meta_inval); block_mark(sdp->bl, block, dup_block); } - block_mark(sdp->bl, block, journal_blk); + block_mark(sdp->bl, block, meta_other); } else { if(q.block_type != block_free) { log_err("Found duplicate block referenced as data " @@ -251,7 +253,7 @@ static int check_data(struct fsck_inode *ip, uint64_t block, void *private) code in pass1b.c is better at resolving metadata referencing a data block than it is at resolving a data block referencing a metadata block. */ - btype = fs_get_bitmap(ip->i_sbd, block, NULL); + btype = fs_get_bitmap(ip->i_sbd, block, rgd); if (btype != GFS_BLKST_USED && btype != GFS_BLKST_USEDMETA) { const char *allocdesc[] = {"free space", "data", "free metadata", "metadata", @@ -305,7 +307,7 @@ static int remove_inode_eattr(struct fsck_inode *ip, struct block_count *bc, bc->ea_count = 0; ip->i_di.di_blocks = 1 + bc->indir_count + bc->data_count; ip->i_di.di_flags &= ~GFS_DIF_EA_INDIRECT; - if (get_and_read_buf(ip->i_sbd, ip->i_num.no_addr, &dibh, 0)) { + if (get_and_read_buf(ip->i_sbd, ip->i_num.no_addr, &dibh)) { log_err("The bad Extended Attribute could not be fixed.\n"); bc->ea_count++; return 1; @@ -413,7 +415,7 @@ static int check_eattr_indir(struct fsck_inode *ip, uint64_t indirect, check if it really is an EA. If it is, let duplicate handling sort it out. If it isn't, clear it but don't count it as a duplicate. */ - if(get_and_read_buf(sdp, indirect, bh, 0)) { + if(get_and_read_buf(sdp, indirect, bh)) { log_warn("Unable to read Extended Attribute indirect block " "#%"PRIu64".\n", indirect); block_set(sdp->bl, indirect, meta_inval); @@ -496,7 +498,7 @@ static int check_leaf_block(struct fsck_inode *ip, uint64_t block, int btype, /* Special duplicate processing: If we have an EA block, check if it really is an EA. If it is, let duplicate handling sort it out. If it isn't, clear it but don't count it as a duplicate. */ - if(get_and_read_buf(sdp, block, &leaf_bh, 0)){ + if(get_and_read_buf(sdp, block, &leaf_bh)){ log_err("Unable to read leaf block %lld.\n", block); return -1; } @@ -661,7 +663,8 @@ static int clear_metalist(struct fsck_inode *ip, uint64_t block, return 0; } -static int clear_data(struct fsck_inode *ip, uint64_t block, void *private) +static int clear_data(struct fsck_inode *ip, uint64_t block, + struct fsck_rgrp **rgd, void *private) { struct fsck_sb *sdp = ip->i_sbd; struct block_query q = {0}; @@ -957,7 +960,7 @@ static int handle_di(struct fsck_sb *sdp, osi_buf_t *bh, uint64_t block, int mfr ip->i_di.di_blocks = 1 + bc.indir_count + bc.data_count + bc.ea_count; if(get_and_read_buf(sdp, ip->i_di.di_num.no_addr, - &di_bh, 0)){ + &di_bh)){ stack; log_crit("Bad block count remains\n"); } else { @@ -1060,7 +1063,7 @@ int pass1(struct fsck_sb *sbp) for(j = ji->ji_addr; j < ji->ji_addr + (ji->ji_nsegment * sbp->sb.sb_seg_size); j++) { - if(block_set(sbp->bl, j, journal_blk)) { + if(block_set(sbp->bl, j, meta_other)) { stack; return FSCK_ERROR; } @@ -1113,7 +1116,7 @@ int pass1(struct fsck_sb *sbp) skip_this_pass = FALSE; fflush(stdout); } - if(get_and_read_buf(sbp, block, &bh, 0)){ + if(get_and_read_buf(sbp, block, &bh)){ stack; log_crit("Unable to retrieve block %"PRIu64 "\n", block); diff --git a/gfs/gfs_fsck/pass1b.c b/gfs/gfs_fsck/pass1b.c index 9a348ed..17a5444 100644 --- a/gfs/gfs_fsck/pass1b.c +++ b/gfs/gfs_fsck/pass1b.c @@ -67,7 +67,8 @@ static int check_metalist(struct fsck_inode *ip, uint64_t block, return 0; } -static int check_data(struct fsck_inode *ip, uint64_t block, void *private) +static int check_data(struct fsck_inode *ip, uint64_t block, + struct fsck_rgrp **rgd, void *private) { inc_if_found(block, 1, private); @@ -81,7 +82,7 @@ static int check_eattr_indir(struct fsck_inode *ip, uint64_t block, osi_buf_t *indir_bh = NULL; inc_if_found(block, 0, private); - if(get_and_read_buf(sbp, block, &indir_bh, 0)){ + if(get_and_read_buf(sbp, block, &indir_bh)){ log_warn("Unable to read EA leaf block #%"PRIu64".\n", block); return 1; @@ -99,7 +100,7 @@ static int check_eattr_leaf(struct fsck_inode *ip, uint64_t block, osi_buf_t *leaf_bh = NULL; inc_if_found(block, 0, private); - if(get_and_read_buf(sbp, block, &leaf_bh, 0)){ + if(get_and_read_buf(sbp, block, &leaf_bh)){ log_err("Unable to read EA leaf block #%"PRIu64".\n", block); return 1; @@ -193,7 +194,8 @@ static int clear_dup_metalist(struct fsck_inode *ip, uint64_t block, } return 0; } -static int clear_dup_data(struct fsck_inode *ip, uint64_t block, void *private) +static int clear_dup_data(struct fsck_inode *ip, uint64_t block, + struct fsck_rgrp **rgd, void *private) { return clear_dup_metalist(ip, block, NULL, private); } @@ -425,7 +427,7 @@ static int handle_dup_blk(struct fsck_sb *sbp, struct blocks *b) osi_buf_t *bh; uint32_t cmagic; - get_and_read_buf(sbp, b->block_no, &bh, 0); + get_and_read_buf(sbp, b->block_no, &bh); cmagic = ((struct gfs_meta_header *)(bh->b_data))->mh_magic; relse_buf(sbp, bh); if (be32_to_cpu(cmagic) == GFS_MAGIC) { diff --git a/gfs/gfs_fsck/pass1c.c b/gfs/gfs_fsck/pass1c.c index 6bec08d..4760170 100644 --- a/gfs/gfs_fsck/pass1c.c +++ b/gfs/gfs_fsck/pass1c.c @@ -113,7 +113,7 @@ static int check_eattr_indir(struct fsck_inode *ip, uint64_t block, (unsigned long long)ip->i_num.no_addr); return ask_remove_eattr(ip); } - else if(get_and_read_buf(sbp, block, &indir_bh, 0)){ + else if(get_and_read_buf(sbp, block, &indir_bh)){ log_warn("Unable to read Extended Attribute leaf block " "#%"PRIu64".\n", block); return ask_remove_eattr(ip); @@ -146,7 +146,7 @@ static int check_eattr_leaf(struct fsck_inode *ip, uint64_t block, block, ip->i_num.no_addr); return ask_remove_eattr(ip); } - else if(get_and_read_buf(sbp, block, &leaf_bh, 0)){ + else if(get_and_read_buf(sbp, block, &leaf_bh)){ log_warn("Unable to read Extended attributes leaf block " "#%"PRIu64".\n", block); return ask_remove_eattr(ip); @@ -270,7 +270,7 @@ int pass1c(struct fsck_sb *sbp) if (skip_this_pass || fsck_abort) /* if asked to skip the rest */ return FSCK_OK; log_info("EA in inode %"PRIu64"\n", block_no); - if(get_and_read_buf(sbp, block_no, &bh, 0)) { + if(get_and_read_buf(sbp, block_no, &bh)) { stack; return FSCK_ERROR; } diff --git a/gfs/gfs_fsck/pass2.c b/gfs/gfs_fsck/pass2.c index b6845cf..ba3462d 100644 --- a/gfs/gfs_fsck/pass2.c +++ b/gfs/gfs_fsck/pass2.c @@ -99,7 +99,7 @@ static int check_eattr_indir(struct fsck_inode *ip, uint64_t block, osi_buf_t *indir_bh; - if(get_and_read_buf(ip->i_sbd, block, &indir_bh, 0)){ + if(get_and_read_buf(ip->i_sbd, block, &indir_bh)){ log_warn("Unable to read EA indir block #%"PRIu64".\n", block); block_set(ip->i_sbd->bl, block, meta_inval); @@ -114,7 +114,7 @@ static int check_eattr_leaf(struct fsck_inode *ip, uint64_t block, { osi_buf_t *leaf_bh = NULL; - if(get_and_read_buf(ip->i_sbd, block, &leaf_bh, 0)){ + if(get_and_read_buf(ip->i_sbd, block, &leaf_bh)){ log_warn("Unable to read EA leaf block #%"PRIu64".\n", block); block_set(ip->i_sbd->bl, block, meta_inval); @@ -258,7 +258,7 @@ static int check_dentry(struct fsck_inode *ip, struct gfs_dirent *dent, return -1; } /* Get the status of the directory inode */ - if(q.bad_block) { + if(q.block_type == bad_block) { /* This entry's inode has bad blocks in it */ /* Handle bad blocks */ @@ -320,7 +320,7 @@ static int check_dentry(struct fsck_inode *ip, struct gfs_dirent *dent, return 1; /* Now try to clear the dinode, if it is an dinode */ - get_and_read_buf(sbp, de->de_inum.no_addr, &bhi, 0); + get_and_read_buf(sbp, de->de_inum.no_addr, &bhi); error = check_meta(bhi, GFS_METATYPE_DI); relse_buf(sbp, bhi); if (error) @@ -573,7 +573,7 @@ static int build_rooti(struct fsck_sb *sbp) { struct fsck_inode *ip; osi_buf_t *bh; - get_and_read_buf(sbp, GFS_SB_ADDR >> sbp->fsb2bb_shift, &bh, 0); + get_and_read_buf(sbp, GFS_SB_ADDR >> sbp->fsb2bb_shift, &bh); /* Create a new inode ondisk */ create_inode(sbp, GFS_FILE_DIR, &ip); /* Attach it to the superblock's sb_root_di address */ @@ -673,7 +673,7 @@ static int check_root_dir(struct fsck_sb *sbp) rootblock = sbp->sb.sb_root_di.no_addr; pass2_fxns.private = (void *) &ds; - if(ds.q.bad_block) { + if(ds.q.block_type == bad_block) { /* First check that the directory's metatree is valid */ load_inode(sbp, rootblock, &ip); if(check_metatree(ip, &pass2_fxns)) { @@ -692,7 +692,7 @@ static int check_root_dir(struct fsck_sb *sbp) block_set(sbp->bl, rootblock, meta_inval); } - if(get_and_read_buf(sbp, rootblock, &bh, 0)){ + if(get_and_read_buf(sbp, rootblock, &bh)){ log_err("Unable to retrieve block #%"PRIu64"\n", rootblock); block_set(sbp->bl, rootblock, meta_inval); @@ -750,7 +750,7 @@ static int check_root_dir(struct fsck_sb *sbp) log_err("The directory was not fixed.\n"); } free_inode(&ip); - if(get_and_read_buf(sbp, rootblock, &bh, 0)){ + if(get_and_read_buf(sbp, rootblock, &bh)){ log_err("Unable to retrieve block #%"PRIu64"\n", rootblock); block_set(sbp->bl, rootblock, meta_inval); @@ -843,7 +843,7 @@ int pass2(struct fsck_sb *sbp, struct options *opts) memset(&ds, 0, sizeof(ds)); pass2_fxns.private = (void *) &ds; - if(ds.q.bad_block) { + if(ds.q.block_type == bad_block) { /* First check that the directory's metatree * is valid */ load_inode(sbp, i, &ip); @@ -892,7 +892,7 @@ int pass2(struct fsck_sb *sbp, struct options *opts) } block_set(sbp->bl, i, meta_inval); } - if(get_and_read_buf(sbp, i, &bh, 0)){ + if(get_and_read_buf(sbp, i, &bh)){ /* This shouldn't happen since we were able to * read it before */ log_err("Unable to retrieve block #%"PRIu64 diff --git a/gfs/gfs_fsck/pass3.c b/gfs/gfs_fsck/pass3.c index 0fafa18..409d5af 100644 --- a/gfs/gfs_fsck/pass3.c +++ b/gfs/gfs_fsck/pass3.c @@ -223,7 +223,7 @@ int pass3(struct fsck_sb *sbp, struct options *opts) stack; return FSCK_ERROR; } - if(q.bad_block) { + if(q.block_type == bad_block) { log_err("Found unlinked directory containing" "bad block\n"); errors_found++; diff --git a/gfs/gfs_fsck/pass4.c b/gfs/gfs_fsck/pass4.c index 1adb355..b90c8b5 100644 --- a/gfs/gfs_fsck/pass4.c +++ b/gfs/gfs_fsck/pass4.c @@ -79,9 +79,8 @@ static int scan_inode_list(struct fsck_sb *sbp, osi_list_t *list) { stack; return -1; } - if(q.bad_block) { - log_err("Unlinked inode contains" - "bad blocks\n", + if(q.block_type == bad_block) { + log_err("Unlinked inode contains bad blocks\n", ii->inode); errors_found++; if(query(sbp, "Delete unlinked inode with bad " diff --git a/gfs/gfs_fsck/pass5.c b/gfs/gfs_fsck/pass5.c index 2cc6425..2021ddd 100644 --- a/gfs/gfs_fsck/pass5.c +++ b/gfs/gfs_fsck/pass5.c @@ -84,7 +84,6 @@ int fsck_countbits(struct fsck_sb *sbp, uint64_t start_blk, uint64_t count, case inode_dir: case inode_file: case leaf_blk: - case journal_blk: case meta_other: case meta_eattr: bit_array[3]++; @@ -161,7 +160,6 @@ static int convert_mark(enum mark_block mark, uint32_t *count) case indir_blk: case leaf_blk: - case journal_blk: case meta_other: case meta_eattr: count[3]++; diff --git a/gfs/gfs_fsck/rgrp.c b/gfs/gfs_fsck/rgrp.c index 101e6e6..046679e 100644 --- a/gfs/gfs_fsck/rgrp.c +++ b/gfs/gfs_fsck/rgrp.c @@ -179,7 +179,7 @@ int fs_rgrp_read(struct fsck_rgrp *rgd, int repair_if_corrupted) exit(FSCK_ERROR); } error = get_and_read_buf(sdp, rgd->rd_ri.ri_addr + x, - &(rgd->rd_bh[x]), 0); + &(rgd->rd_bh[x])); if (error) { log_err("Unable to read rgrp from disk.\n"); goto fail; @@ -445,7 +445,7 @@ int clump_alloc(struct fsck_rgrp *rgd, uint32 goal) for (i = 0; i < GFS_META_CLUMP; i++){ block = fs_blkalloc_internal(rgd, goal, GFS_BLKST_FREE, - GFS_BLKST_FREEMETA, TRUE); + GFS_BLKST_FREEMETA); log_debug("Got block %u\n", block); if(block == BFITNOENT) { @@ -537,7 +537,7 @@ int fs_blkalloc(struct fsck_inode *ip, uint64 *block) *block = fs_blkalloc_internal(rgd, goal, GFS_BLKST_FREE, - GFS_BLKST_USED, TRUE); + GFS_BLKST_USED); log_debug("Got block %"PRIu64"\n", *block); if(*block == BFITNOENT) { @@ -618,7 +618,7 @@ int fs_metaalloc(struct fsck_inode *ip, uint64 *block) } *block = fs_blkalloc_internal(rgd, goal, GFS_BLKST_FREEMETA, - GFS_BLKST_USEDMETA, TRUE); + GFS_BLKST_USEDMETA); log_debug("Got block %"PRIu64"\n", *block); if(*block == BFITNOENT) { fs_rgrp_relse(rgd); diff --git a/gfs/gfs_fsck/super.c b/gfs/gfs_fsck/super.c index d5f5a58..30030d4 100644 --- a/gfs/gfs_fsck/super.c +++ b/gfs/gfs_fsck/super.c @@ -108,7 +108,7 @@ int read_sb(struct fsck_sb *sdp) uint64 space = 0; unsigned int x; int error; - error = get_and_read_buf(sdp, GFS_SB_ADDR >> sdp->fsb2bb_shift, &bh, 0); + error = get_and_read_buf(sdp, GFS_SB_ADDR >> sdp->fsb2bb_shift, &bh); if (error){ log_crit("Unable to read superblock\n"); goto out; @@ -506,7 +506,7 @@ int gfs_rgindex_rebuild(struct fsck_sb *sdp, osi_list_t *ret_list, number_of_rgs = 0; shortest_dist_btwn_rgs[subd] = subdevice_size; for (blok = start_block; blok < fs_total_size; blok++) { - error = get_and_read_buf(sdp, blok, &bh, 0); + error = get_and_read_buf(sdp, blok, &bh); if (error){ log_crit("Unable to read block 0x%" PRIX64 "\n", blok); return -1; @@ -723,7 +723,7 @@ int gfs_rgindex_rebuild(struct fsck_sb *sdp, osi_list_t *ret_list, /* blocks early. So we need to check for this special case. */ for (start_block = end_block - 2; start_block < end_block + 1; start_block++) { - error = get_and_read_buf(sdp, start_block, &bh, 0); + error = get_and_read_buf(sdp, start_block, &bh); rg_was_fnd = (!check_type(bh, GFS_METATYPE_RG)); relse_buf(sdp, bh); /* release the read buffer */ if (rg_was_fnd) @@ -740,7 +740,7 @@ int gfs_rgindex_rebuild(struct fsck_sb *sdp, osi_list_t *ret_list, int bitmap_was_fnd; log_debug("Block 0x%" PRIx64 "\n", blok); - error = get_and_read_buf(sdp, blok, &bh, 0); + error = get_and_read_buf(sdp, blok, &bh); if (error) { log_crit("Unable to read block 0x%" PRIX64 "\n", blok); return -1; @@ -787,7 +787,7 @@ int gfs_rgindex_rebuild(struct fsck_sb *sdp, osi_list_t *ret_list, bitmap_was_fnd = FALSE; for (fwd_block = blok + 1; fwd_block < fs_total_size; fwd_block++) { - error = get_and_read_buf(sdp, fwd_block, &bh, 0); + error = get_and_read_buf(sdp, fwd_block, &bh); if (error){ log_crit("Unable to read block 0x%" PRIX64 "\n", fwd_block); @@ -884,7 +884,7 @@ int gfs_rgindex_rebuild(struct fsck_sb *sdp, osi_list_t *ret_list, if (block_bump == 1 && prev_rgd && subd == 2) { uint64_t last_distance = blok - prev_rgd->rd_ri.ri_addr; - error = get_and_read_buf(sdp, blok + last_distance, &bh, 0); + error = get_and_read_buf(sdp, blok + last_distance, &bh); rg_was_fnd = (!check_type(bh, GFS_METATYPE_RG)); relse_buf(sdp, bh); /* release the read buffer */ if (rg_was_fnd) @@ -1066,7 +1066,7 @@ int gfs_rgindex_calculate(struct fsck_sb *sdp, osi_list_t *ret_list, /* Read the first block of the subdevice and make sure it's an RG. */ /* ----------------------------------------------------------------- */ subdevice_start = dvice.subdev[sdp->journals + 1].start; - error = get_and_read_buf(sdp, subdevice_start, &bh, 0); + error = get_and_read_buf(sdp, subdevice_start, &bh); if (error){ log_crit("Unable to read start of last subdevice.\n"); return -1; @@ -1393,7 +1393,7 @@ int ri_update(struct fsck_sb *sdp) if (fix_grow_problems) { osi_buf_t *dibh; - get_and_read_buf(sdp, sdp->sb.sb_rindex_di.no_addr, &dibh, 0); + get_and_read_buf(sdp, sdp->sb.sb_rindex_di.no_addr, &dibh); sdp->riinode->i_di.di_size = rg * sizeof(struct gfs_rindex); gfs_dinode_out(&sdp->riinode->i_di, BH_DATA(dibh)); write_buf(sdp, dibh, 0); @@ -1425,7 +1425,7 @@ int write_sb(struct fsck_sb *sbp) int error = 0; osi_buf_t *bh; - error = get_and_read_buf(sbp, GFS_SB_ADDR >> sbp->fsb2bb_shift, &bh, 0); + error = get_and_read_buf(sbp, GFS_SB_ADDR >> sbp->fsb2bb_shift, &bh); if (error){ log_crit("Unable to read superblock\n"); goto out; diff --git a/gfs/gfs_fsck/util.c b/gfs/gfs_fsck/util.c index e81bc31..bb53d8c 100644 --- a/gfs/gfs_fsck/util.c +++ b/gfs/gfs_fsck/util.c @@ -268,7 +268,7 @@ int next_rg_metatype(struct fsck_rgrp *rgd, uint64 *block, uint32 type, int firs if(next_rg_meta(rgd, block, first)) return -1; - if(get_and_read_buf(sdp, *block, &bh, 0)){ + if(get_and_read_buf(sdp, *block, &bh)){ log_err("next_rg_metatype: Unable to read meta block " "#%"PRIu64" from disk\n", *block); exit(FSCK_ERROR);

1 0

cluster: RHEL56 - fsck.gfs2 stuck in pass1 on i686
by Bob Peterson 08 Feb '11

08 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=98… Commit: 98f3a54ca8b1bf4536fb3caac62e5e15cfda2675 Parent: be158e9bd1c3c99475ff4f213c19b1732ab0f14d Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Fri Jan 21 08:13:08 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Tue Feb 8 15:04:04 2011 -0600 fsck.gfs2 stuck in pass1 on i686 This patch fixes a problem specific to 32-bit architectures. The shift point calculation for determining where to start looking for a desired value in the bitmap was wrong because it was using sizeof(unsigned long) rather than sizeof(unsigned long long). That caused the bitfit function to start in the wrong place, which in some circumstances caused the same block to be returned repeatedly which resulted in infinite loops in fsck.gfs2. rhbz#675911 --- gfs2/libgfs2/fs_bits.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gfs2/libgfs2/fs_bits.c b/gfs2/libgfs2/fs_bits.c index ee9dfa7..69b16e9 100644 --- a/gfs2/libgfs2/fs_bits.c +++ b/gfs2/libgfs2/fs_bits.c @@ -77,7 +77,7 @@ static inline uint64_t gfs2_bit_search(const unsigned long long *ptr, unsigned long gfs2_bitfit(const unsigned char *buf, const unsigned int len, unsigned long goal, unsigned char state) { - unsigned long spoint = (goal << 1) & ((8 * sizeof(unsigned long)) - 1); + unsigned long spoint = (goal << 1) & ((8 * sizeof(unsigned long long)) - 1); const unsigned long long *ptr = ((unsigned long long *)buf) + (goal >> 5); const unsigned long long *end = (unsigned long long *) (buf + ALIGN(len, sizeof(unsigned long long)));

1 0

cluster: STABLE31 - libdlm: stop looking for dlm devices in /dev/misc and access /dev directly
by Fabio M. Di Nitto 08 Feb '11

08 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f7… Commit: f7d98e763f40e3e7630cf687ec791c446aade8cc Parent: 17dbf63a93049318c985ef4449293778a5fad3d7 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue Feb 8 16:40:36 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue Feb 8 16:40:36 2011 +0100 libdlm: stop looking for dlm devices in /dev/misc and access /dev directly Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- dlm/libdlm/libdlm.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlm/libdlm/libdlm.c b/dlm/libdlm/libdlm.c index dadf1d2..3c3a31a 100644 --- a/dlm/libdlm/libdlm.c +++ b/dlm/libdlm/libdlm.c @@ -24,11 +24,11 @@ #include "libdlm.h" #include <linux/dlm_device.h> -#define MISC_PREFIX "/dev/misc/" +#define DEV_PREFIX "/dev/" #define DLM_PREFIX "dlm_" -#define DLM_MISC_PREFIX MISC_PREFIX DLM_PREFIX +#define DLM_MISC_PREFIX DEV_PREFIX DLM_PREFIX #define DLM_CONTROL_NAME "dlm-control" -#define DLM_CONTROL_PATH MISC_PREFIX DLM_CONTROL_NAME +#define DLM_CONTROL_PATH DEV_PREFIX DLM_CONTROL_NAME #define DEFAULT_LOCKSPACE "default" /* @@ -427,7 +427,7 @@ static int find_udev_device(const char *lockspace, int minor, char *udev_path) /* look for a device with a truncated name */ - d = opendir(MISC_PREFIX); + d = opendir(DEV_PREFIX); while ((de = readdir(d))) { if (de->d_name[0] == '.') continue; @@ -435,7 +435,7 @@ static int find_udev_device(const char *lockspace, int minor, char *udev_path) continue; if (strncmp(de->d_name, basename, MAX_SYSFS_NAME)) continue; - snprintf(tmp_path, PATH_MAX, MISC_PREFIX "%s", + snprintf(tmp_path, PATH_MAX, DEV_PREFIX "%s", de->d_name); if (stat(tmp_path, &st)) continue;

1 0

cluster: STABLE31 - Update udev rules to deal with new udev model
by Fabio M. Di Nitto 08 Feb '11

08 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=17… Commit: 17dbf63a93049318c985ef4449293778a5fad3d7 Parent: ffa68348491b46319760ad2459a297ec3897f611 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue Feb 8 16:36:46 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue Feb 8 16:36:46 2011 +0100 Update udev rules to deal with new udev model dlm devices are now created in /dev directly, a compat symlink is then created in /dev/misc to avoid any kind of breakage. Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- dlm/libdlm/51-dlm.rules | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlm/libdlm/51-dlm.rules b/dlm/libdlm/51-dlm.rules index f71e79d..0f22134 100644 --- a/dlm/libdlm/51-dlm.rules +++ b/dlm/libdlm/51-dlm.rules @@ -1,5 +1,2 @@ -KERNEL=="dlm-control", NAME="misc/dlm-control", MODE="0666" -KERNEL=="dlm-monitor", NAME="misc/dlm-monitor", MODE="0666" -KERNEL=="dlm_default", NAME="misc/dlm_default", MODE="0666" -KERNEL=="dlm_*", NAME="misc/%k", MODE="0660" - +KERNEL=="dlm-control|dlm-monitor|dlm_default", MODE="0666", SYMLINK+="misc/%k" +KERNEL=="dlm_*", MODE="0660", SYMLINK+="misc/%k"

1 0

cluster: STABLE31 - udev rules: install in /lib/udev/rules.d
by Fabio M. Di Nitto 08 Feb '11

08 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ff… Commit: ffa68348491b46319760ad2459a297ec3897f611 Parent: ada14ea123c508224f758cd2eb8c5a51c3c19dc0 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue Feb 8 15:18:08 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue Feb 8 15:18:08 2011 +0100 udev rules: install in /lib/udev/rules.d now all major distributions have switched to /lib/.. from /etc.. we can safely move upstream too Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- make/install.mk | 4 ++-- make/uninstall.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/make/install.mk b/make/install.mk index fa6ac92..e3c1c9d 100644 --- a/make/install.mk +++ b/make/install.mk @@ -41,10 +41,10 @@ ifdef INITDT done endif ifdef UDEVT - install -d ${DESTDIR}/etc/udev/rules.d + install -d ${DESTDIR}/lib/udev/rules.d set -e; \ for i in ${UDEVT}; do \ - install -m644 $(S)/$$i ${DESTDIR}/etc/udev/rules.d; \ + install -m644 $(S)/$$i ${DESTDIR}/lib/udev/rules.d; \ done endif ifdef DOCS diff --git a/make/uninstall.mk b/make/uninstall.mk index 01e8d2d..6f84727 100644 --- a/make/uninstall.mk +++ b/make/uninstall.mk @@ -24,7 +24,7 @@ ifdef INITDT ${UNINSTALL} ${INITDT} ${initddir} endif ifdef UDEVT - ${UNINSTALL} ${UDEVT} ${DESTDIR}/etc/udev/rules.d + ${UNINSTALL} ${UDEVT} ${DESTDIR}/lib/udev/rules.d endif ifdef DOCS ${UNINSTALL} ${DOCS} ${docdir}

1 0

fence-agents: master - build: cleanup configure.ac
by Fabio M. Di Nitto 08 Feb '11

08 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 9b1a7fa8ad83152d729017accf3dff2ffbe90ea3 Parent: 66ad000089dc330e2467bdf233763cc07a96fba7 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue Feb 8 09:29:56 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue Feb 8 09:29:56 2011 +0100 build: cleanup configure.ac drop reference to corosync that's not required to build anymore add entries from autoscan Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- configure.ac | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 639769f..f1ad0ef 100644 --- a/configure.ac +++ b/configure.ac @@ -58,6 +58,8 @@ AC_PROG_LN_S AC_PROG_INSTALL AC_PROG_MAKE_SET AC_PROG_AWK +AC_PROG_CXX +AC_PROG_RANLIB ## local helper functions @@ -82,7 +84,7 @@ check_lib_no_libs() { LIBS=$ac_check_lib_save_LIBS } -# corosync libs +# external libs PKG_CHECK_MODULES([nss],[nss]) PKG_CHECK_MODULES([nspr],[nspr])

1 0

fence-agents: the annotated tag v3.1.1 has been created
by Fabio M. Di Nitto 08 Feb '11

08 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 1d42f8ed7eea12b4bd15744bb746ae9d271722cc Parent: 0000000000000000000000000000000000000000 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: 2011-02-08 07:29 +0000 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: 2011-02-08 07:29 +0000 annotated tag: v3.1.1 has been created at 1d42f8ed7eea12b4bd15744bb746ae9d271722cc (tag) tagging 66ad000089dc330e2467bdf233763cc07a96fba7 (commit) replaces v3.1.0 v3.1.1 release Fabio M. Di Nitto (3): Fix build for distributions that don't use bash as default shell build: fix make dist target Update COPYRIGHT file Marek 'marx' Grac (3): fence_ipmilan: Add "diag" option to support "ipmitool chassis power diag" fence_ipmilan: Fix manual page to describe usage with HP iLO 3 fence_eaton_snmp: New fence agent for Eaton devices Ryan O'Hara (6): fence_scsi: identify dm-multipath devices correctly fence_scsi: fix regular expression for grep fence_scsi: always do sg_turs before registration fence_scsi: always do sg_turs for dm-mp devices fence_scsi: verify that on/off actions succeed fence_scsi: properly log errors for all commands

1 0

fence-agents: master - Update COPYRIGHT file
by Fabio M. Di Nitto 08 Feb '11

08 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 66ad000089dc330e2467bdf233763cc07a96fba7 Parent: 8a0edf9d60fcc781bc4222c5f320da3a23c98faf Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue Feb 8 08:26:05 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue Feb 8 08:26:05 2011 +0100 Update COPYRIGHT file bump years to 2011 add fence_eaton_snmp information fix email address to avoid autospam drop fence_xvm bits since the agent has been dropped ages ago Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- doc/COPYRIGHT | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/doc/COPYRIGHT b/doc/COPYRIGHT index 83d51aa..b10071c 100644 --- a/doc/COPYRIGHT +++ b/doc/COPYRIGHT @@ -1,7 +1,7 @@ Unless specified otherwise in the "exceptions section" below: Copyright (C) 1997-2003 Sistina Software, Inc. All rights reserved. -Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved. +Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. Exceptions: @@ -9,27 +9,26 @@ fence/agents/apc_snmp/powernet369.mib: Copyright (c) 2005 American Power Conversion, Inc. PowerNet is a Trademark of American Power Conversion Corp. +fence/agents/eaton_snmp/fence_eaton_snmp.py: + Copyright (c) 2011 eaton.com + Author: Arnaud Quette <ArnaudQuette at Eaton.com> + fence/agents/ifmib/fence_ifmib.py: - Copyright (C) 2008-2010 Ross Vandegrift. + Copyright (C) 2008-2011 Ross Vandegrift. Written by Ross Vandegrift <ross at kallisti.us> fence/agents/intelmodular/fence_intelmodular.pl: - Contributed by Matthew Kent <matt(a)bravenet.com> + Contributed by Matthew Kent <matt at bravenet.com> fence/agents/ipmilan/expect.{c,h}: Copyright (C) 2000 Alan Robertson <alanr at unix.sh> fence/agents/node_assassin/* - Copyright (C) 2009-2010 Madison Kelly/Alteeve's Niche! + Copyright (C) 2009-2011 Madison Kelly/Alteeve's Niche! Author: Digimer <digimer at alteeve.com> -fence/agents/xvm/tcp.c: - Copyright (C) 2000 Mission Critical Linux - Copyright (C) 2002-2010 Red Hat, Inc. All rights reserved. - Author: Jeff Moyer <jmoyer at redhat.com> - fence/man/fence_ifmib.8: - Copyright (C) 2008-2010 Ross Vandegrift. + Copyright (C) 2008-2011 Ross Vandegrift. Written by Ross Vandegrift <ross at kallisti.us> Authors as known by current RCS as of the time of writing:

1 0

fence-agents: master - fence_scsi: properly log errors for all commands
by rohara 07 Feb '11

07 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 8a0edf9d60fcc781bc4222c5f320da3a23c98faf Parent: d9e40ee832d3705c3e952f11efa79d6e155d6277 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Tue Jan 25 11:16:10 2011 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Mon Feb 7 12:42:54 2011 -0600 fence_scsi: properly log errors for all commands There are a number of places in fence_scsi that call sg_persist commands via Perl's qx command. If an error occurs, the script simply dies and reports the name of the subroutine that the script died in. This can be improved by replacing the die call with log_error, such that any errors get properly written to the logfile, if any. This patch also logs the error code returned from the failed command. This patch also redirects stderr to /dev/null for all commands executed via qx. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> Reviewed-by: Lon Hohberger <lhh(a)redhat.com> --- fence/agents/scsi/fence_scsi.pl | 99 ++++++++++++++++++++++++++++++-------- 1 files changed, 78 insertions(+), 21 deletions(-) diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl index 0512f3e..6f68203 100644 --- a/fence/agents/scsi/fence_scsi.pl +++ b/fence/agents/scsi/fence_scsi.pl @@ -185,14 +185,20 @@ sub do_register ($$$) my $cmd; my $out; + my $err; do_reset ($dev); $cmd = "sg_persist -n -o -G -K $host_key -S $node_key -d $dev"; $cmd .= " -Z" if (defined $opt_a); - $out = qx { $cmd }; + $out = qx { $cmd 2> /dev/null }; + $err = ($?>>8); - die "[error]: $self\n" if ($?>>8); + if ($err != 0) { + log_error ("$self (err=$err)"); + } + + # die "[error]: $self\n" if ($?>>8); return; } @@ -216,14 +222,20 @@ sub do_register_ignore ($$) my $cmd; my $out; + my $err; do_reset ($dev); $cmd = "sg_persist -n -o -I -S $node_key -d $dev"; $cmd .= " -Z" if (defined $opt_a); - $out = qx { $cmd }; + $out = qx { $cmd 2> /dev/null }; + $err = ($?>>8); - die "[error]: $self ($dev)\n" if ($?>>8); + if ($err != 0) { + log_error ("$self (err=$err)"); + } + + # die "[error]: $self ($dev)\n" if ($?>>8); return; } @@ -236,9 +248,14 @@ sub do_reserve ($$) log_debug ("$self (host_key=$host_key, dev=$dev)"); my $cmd = "sg_persist -n -o -R -T 5 -K $host_key -d $dev"; - my $out = qx { $cmd }; + my $out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); - die "[error]: $self\n" if ($?>>8); + if ($err != 0) { + log_error ("$self (err=$err)"); + } + + # die "[error]: $self\n" if ($?>>8); return; } @@ -251,9 +268,14 @@ sub do_release ($$) log_debug ("$self (host_key=$host_key, dev=$dev)"); my $cmd = "sg_persist -n -o -L -T 5 -K $host_key -d $dev"; - my $out = qx { $cmd }; + my $out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); - die "[error]: $self\n" if ($?>>8); + if ($err != 0) { + log_error ("$self (err=$err)"); + } + + # die "[error]: $self\n" if ($?>>8); return; } @@ -266,9 +288,14 @@ sub do_preempt ($$$) log_debug ("$self (host_key=$host_key, node_key=$node_key, dev=$dev)"); my $cmd = "sg_persist -n -o -P -T 5 -K $host_key -S $node_key -d $dev"; - my $out = qx { $cmd }; + my $out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); + + if ($err != 0) { + log_error ("$self (err=$err)"); + } - die "[error]: $self\n" if ($?>>8); + # die "[error]: $self\n" if ($?>>8); return; } @@ -281,9 +308,14 @@ sub do_preempt_abort ($$$) log_debug ("$self (host_key=$host_key, node_key=$node_key, dev=$dev)"); my $cmd = "sg_persist -n -o -A -T 5 -K $host_key -S $node_key -d $dev"; - my $out = qx { $cmd }; + my $out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); + + if ($err != 0) { + log_error ("$self (err=$err)"); + } - die "[error]: $self\n" if ($?>>8); + # die "[error]: $self\n" if ($?>>8); return; } @@ -343,9 +375,14 @@ sub get_node_id ($) my $node_id; my $cmd = "cman_tool nodes -n $_[0] -F id"; - my $out = qx { $cmd }; + my $out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); - die "[error]: $self\n" if ($?>>8); + if ($err != 0) { + log_error ("$self (err=$err)"); + } + + # die "[error]: $self\n" if ($?>>8); chomp ($out); @@ -360,9 +397,14 @@ sub get_cluster_id () my $cluster_id; my $cmd = "cman_tool status"; - my @out = qx { $cmd }; + my @out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); - die "[error]: $self\n" if ($?>>8); + if ($err != 0) { + log_error ("$self (err=$err)"); + } + + # die "[error]: $self\n" if ($?>>8); foreach (@out) { chomp; @@ -388,8 +430,13 @@ sub get_devices_clvm () " devices { preferred_names = [ \"^/dev/dm\" ] }'"; my @out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); + + if ($err != 0) { + log_error ("$self (err=$err)"); + } - die "[error]: $self\n" if ($?>>8); + # die "[error]: $self\n" if ($?>>8); foreach (@out) { chomp; @@ -479,9 +526,14 @@ sub get_registration_keys ($) my @keys; my $cmd = "sg_persist -n -i -k -d $dev"; - my @out = qx { $cmd }; + my @out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); + + if ($err != 0) { + log_error ("$self (err=$err)"); + } - die "[error]: $self\n" if ($?>>8); + # die "[error]: $self\n" if ($?>>8); foreach (@out) { chomp; @@ -500,9 +552,14 @@ sub get_reservation_key ($) my $key; my $cmd = "sg_persist -n -i -r -d $dev"; - my @out = qx { $cmd }; + my @out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); + + if ($err != 0) { + log_error ("$self (err=$err)"); + } - die "[error]: $self\n" if ($?>>8); + # die "[error]: $self\n" if ($?>>8); foreach (@out) { chomp;

1 0

fence-agents: master - fence_scsi: verify that on/off actions succeed
by rohara 07 Feb '11

07 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: d9e40ee832d3705c3e952f11efa79d6e155d6277 Parent: 522fef7acb26c7cdc46f5b0da8b20c1900c692b7 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Mon Jan 24 13:54:25 2011 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Mon Feb 7 12:42:39 2011 -0600 fence_scsi: verify that on/off actions succeed This patch adds code to verify that both "on" and "off" actions are successful. This is needed because there seem to be some arrays that do not report an error even when no registration was created, etc. These verification steps takes places after the action has been performed successfully. If an error was encountered while performing either an "on" or "off" action, fence_scsi will exit and no verification will take place. Failure to verify that an action was successful for any device will result is failure. For the "on" action, do_verify_on will check that the key was successfully registered with each devices and that a reservation exists on each device. For the "off" action, do_verify_off will check that the key was removed from each device and that a reservation exists on each device. Resolves: rhbz#644385 Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> Reviewed-by: Lon Hohberger <lhh(a)redhat.com> --- fence/agents/scsi/fence_scsi.pl | 58 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl index 7fcb685..0512f3e 100644 --- a/fence/agents/scsi/fence_scsi.pl +++ b/fence/agents/scsi/fence_scsi.pl @@ -110,6 +110,62 @@ sub do_action_status ($@) } } +sub do_verify_on ($@) +{ + my $self = (caller(0))[3]; + my ($node_key, @devices) = @_; + my $count = 0; + + for $dev (@devices) { + my @keys = grep { /^$node_key$/ } get_registration_keys ($dev); + + ## check that our key is registered + if (scalar (@keys) == 0) { + log_debug ("failed to register key $node_key on device $dev"); + $count++; + next; + } + + ## check that a reservation exists + if (!get_reservation_key ($dev)) { + log_debug ("no reservation exists on device $dev"); + $count++; + } + } + + if ($count != 0) { + log_error ("$self: failed to verify $count devices"); + } +} + +sub do_verify_off ($@) +{ + my $self = (caller(0))[3]; + my ($node_key, @devices) = @_; + my $count = 0; + + for $dev (@devices) { + my @keys = grep { /^$node_key$/ } get_registration_keys ($dev); + + ## check that our key is not registered + if (scalar (@keys) != 0) { + log_debug ("failed to remove key $node_key from device $dev"); + $count++; + next; + } + + ## check that a reservation exists + if (!get_reservation_key ($dev)) { + log_debug ("no reservation exists on device $dev"); + $count++; + } + } + + if ($count != 0) { + log_error ("$self: failed to verify $count devices"); + } +} + sub do_register ($$$) { my $self = (caller(0))[3]; @@ -668,9 +724,11 @@ if (!defined $opt_o) { ## if ($opt_o =~ /^on$/i) { do_action_on ($key, @devices); + do_verify_on ($key, @devices); } elsif ($opt_o =~ /^off$/i) { do_action_off ($key, @devices); + do_verify_off ($key, @devices); } elsif ($opt_o =~ /^status/i) { do_action_status ($key, @devices);

1 0

fence-agents: master - fence_scsi: always do sg_turs for dm-mp devices
by rohara 07 Feb '11

07 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 522fef7acb26c7cdc46f5b0da8b20c1900c692b7 Parent: da047800ec78e8015fb6c82af260f2325b8e27ac Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Mon Jan 24 12:47:23 2011 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Mon Feb 7 12:42:27 2011 -0600 fence_scsi: always do sg_turs for dm-mp devices This patch fixes a with the original patch posted last week. Before attempting to register with a device, we should call sg_turs on the device. If that device is a dm-multipath device, we should call sg_turs on all the paths. This can be done by simply moving the call to do_reset to do_register and do_register_ignore. Also, the patch adds a call to do_reset before doing a "status" action. If a node has been fenced and then proceeds to check its status, it will be in "unit attention" state. Resolves: rhbz#640343 Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> Reviewed-by: Lon Hohberger <lhh(a)redhat.com> --- fence/agents/scsi/fence_scsi.pl | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl index 03c692c..7fcb685 100644 --- a/fence/agents/scsi/fence_scsi.pl +++ b/fence/agents/scsi/fence_scsi.pl @@ -46,7 +46,6 @@ sub do_action_on ($@) log_error ("device $dev does not exist") if (! -e $dev); log_error ("device $dev is not a block device") if (! -b $dev); - do_reset ($dev); do_register_ignore ($node_key, $dev); if (!get_reservation_key ($dev)) { @@ -94,6 +93,8 @@ sub do_action_status ($@) log_error ("device $dev does not exist") if (! -e $dev); log_error ("device $dev is not a block device") if (! -b $dev); + do_reset ($dev); + my @keys = grep { /^$node_key$/ } get_registration_keys ($dev); if (scalar (@keys) != 0) { @@ -129,6 +130,8 @@ sub do_register ($$$) my $cmd; my $out; + do_reset ($dev); + $cmd = "sg_persist -n -o -G -K $host_key -S $node_key -d $dev"; $cmd .= " -Z" if (defined $opt_a); $out = qx { $cmd }; @@ -158,11 +161,13 @@ sub do_register_ignore ($$) my $cmd; my $out; + do_reset ($dev); + $cmd = "sg_persist -n -o -I -S $node_key -d $dev"; $cmd .= " -Z" if (defined $opt_a); $out = qx { $cmd }; - die "[error]: $self\n" if ($?>>8); + die "[error]: $self ($dev)\n" if ($?>>8); return; }

1 0

fence-agents: master - fence_scsi: always do sg_turs before registration
by rohara 07 Feb '11

07 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: da047800ec78e8015fb6c82af260f2325b8e27ac Parent: c9871a397ec024fc9d0ece0fc71b3ee3cca0d480 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Wed Jan 19 14:18:54 2011 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Mon Feb 7 12:41:45 2011 -0600 fence_scsi: always do sg_turs before registration If a node has been fenced, or its key has been forcibly removed from device(s) by another node, the victim will see "unit attention" from the devices if/when it attempts to re-register. This error is normally reported just once, but will cause registration to fail. We can safely avoid this by calling sg_turs prior to each attempt to register with a device. Resolves: rhbz#640343 Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> Reviewed-by: Lon Hohberger <lhh(a)redhat.com> --- fence/agents/scsi/fence_scsi.pl | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl index 38e5210..03c692c 100644 --- a/fence/agents/scsi/fence_scsi.pl +++ b/fence/agents/scsi/fence_scsi.pl @@ -46,6 +46,7 @@ sub do_action_on ($@) log_error ("device $dev does not exist") if (! -e $dev); log_error ("device $dev is not a block device") if (! -b $dev); + do_reset ($dev); do_register_ignore ($node_key, $dev); if (!get_reservation_key ($dev)) { @@ -226,6 +227,23 @@ sub do_preempt_abort ($$$) return; } +sub do_reset (S) +{ + my $self = (caller(0))[3]; + my ($dev) = @_; + + my $cmd = "sg_turs $dev"; + my @out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); + + ## note that it is not necessarily an error is $err is non-zero, + ## so just log the device and status and continue. + + log_debug ("$self (dev=$dev, status=$err)"); + + return; +} + sub key_read () { my $self = (caller(0))[3];

1 0

fence-agents: master - fence_scsi: fix regular expression for grep
by rohara 07 Feb '11

07 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: c9871a397ec024fc9d0ece0fc71b3ee3cca0d480 Parent: e4dbdbf552a70c45957f4da5f6dc578f3e163bc9 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Wed Jan 19 10:57:15 2011 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Mon Feb 7 12:41:15 2011 -0600 fence_scsi: fix regular expression for grep When fence_scsi checks to see if a specific keys is registered for a specific device, it uses grep to look through a list of all registered keys. The existing regular expression was not specific enough, and could result in false positives. This patch fixes the problem by using anchors to make the regular expression more specific. Resolves: rhbz#670910 Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> Reviewed-by: Lon Hohberger <lhh(a)redhat.com> --- fence/agents/scsi/fence_scsi.pl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl index 620af3f..38e5210 100644 --- a/fence/agents/scsi/fence_scsi.pl +++ b/fence/agents/scsi/fence_scsi.pl @@ -71,7 +71,7 @@ sub do_action_off ($@) log_error ("device $dev does not exist") if (! -e $dev); log_error ("device $dev is not a block device") if (! -b $dev); - my @keys = grep { /$node_key/ } get_registration_keys ($dev); + my @keys = grep { /^$node_key$/ } get_registration_keys ($dev); if (scalar (@keys) != 0) { do_preempt_abort ($host_key, $node_key, $dev); @@ -93,7 +93,7 @@ sub do_action_status ($@) log_error ("device $dev does not exist") if (! -e $dev); log_error ("device $dev is not a block device") if (! -b $dev); - my @keys = grep { /$node_key/ } get_registration_keys ($dev); + my @keys = grep { /^$node_key$/ } get_registration_keys ($dev); if (scalar (@keys) != 0) { $dev_count++;

1 0

fence-agents: master - fence_scsi: identify dm-multipath devices correctly
by rohara 07 Feb '11

07 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: e4dbdbf552a70c45957f4da5f6dc578f3e163bc9 Parent: 9316eeaac07eddd979819803d0e93a5646cb70c5 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Tue Jan 18 14:21:02 2011 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Mon Feb 7 12:40:52 2011 -0600 fence_scsi: identify dm-multipath devices correctly Previously, fence_scsi would only identify /dev/dm* devices as being multipath devices. This prevented the use of "friendly" dm-multipath names (eg. /dev/mapper/mpath1). Since fence_scsi can now be passed devices to operate on, it should be able to handle "friendly" names, too. This patch fixes the problem by getting the absolute path of the device at registration time. Resolves: rhbz#644389 Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> Reviewed-by: Lon Hohberger <lhh(a)redhat.com> --- fence/agents/scsi/fence_scsi.pl | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl index 992a3eb..620af3f 100644 --- a/fence/agents/scsi/fence_scsi.pl +++ b/fence/agents/scsi/fence_scsi.pl @@ -1,5 +1,6 @@ #!/usr/bin/perl +use Cwd 'realpath'; use File::Basename; use Getopt::Std; use POSIX; @@ -112,6 +113,8 @@ sub do_register ($$$) my $self = (caller(0))[3]; my ($host_key, $node_key, $dev) = @_; + $dev = realpath ($dev); + if (substr ($dev, 5) =~ /^dm/) { my @slaves = get_mpath_slaves ($dev); foreach (@slaves) { @@ -139,6 +142,8 @@ sub do_register_ignore ($$) my $self = (caller(0))[3]; my ($node_key, $dev) = @_; + $dev = realpath ($dev); + if (substr ($dev, 5) =~ /^dm/) { my @slaves = get_mpath_slaves ($dev); foreach (@slaves) {

1 0

cluster: STABLE31 - cman init: another fix to network manager detection
by Fabio M. Di Nitto 07 Feb '11

07 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ad… Commit: ada14ea123c508224f758cd2eb8c5a51c3c19dc0 Parent: cbf98a5623e7177d497092f7a7b0e170b8b3177e Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Mon Feb 7 17:33:21 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Mon Feb 7 17:33:21 2011 +0100 cman init: another fix to network manager detection 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 45a607e..fbca2fb 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -317,7 +317,7 @@ cluster_disabled_at_boot() network_manager_enabled() { - if status NetworkManager > /dev/null 2>&1 || \ + if status $netmanager > /dev/null 2>&1 || \ chkconfig2 $netmanager; then errmsg="\nNetwork Manager is either running or configured to run. Please disable it in the cluster." return 1

1 0

fence-agents: master - build: fix make dist target
by Fabio M. Di Nitto 07 Feb '11

07 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 9316eeaac07eddd979819803d0e93a5646cb70c5 Parent: 554f73026756db98249997f03a57dd2f6cb9c743 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Mon Feb 7 16:17:54 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Mon Feb 7 16:17:54 2011 +0100 build: fix make dist target this also addresses the issue of a dirty tarball being distributed Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- fence/agents/alom/Makefile.am | 2 +- fence/agents/apc/Makefile.am | 2 +- fence/agents/apc_snmp/Makefile.am | 2 +- fence/agents/bladecenter/Makefile.am | 2 +- fence/agents/cisco_mds/Makefile.am | 2 +- fence/agents/cisco_ucs/Makefile.am | 2 +- fence/agents/drac5/Makefile.am | 2 +- fence/agents/eaton_snmp/Makefile.am | 2 +- fence/agents/eps/Makefile.am | 2 +- fence/agents/ibmblade/Makefile.am | 2 +- fence/agents/ifmib/Makefile.am | 2 +- fence/agents/ilo/Makefile.am | 2 +- fence/agents/ilo_mp/Makefile.am | 2 +- fence/agents/intelmodular/Makefile.am | 2 +- fence/agents/ipmilan/Makefile.am | 2 +- fence/agents/ldom/Makefile.am | 2 +- fence/agents/lpar/Makefile.am | 2 +- fence/agents/node_assassin/Makefile.am | 2 +- fence/agents/rhevm/Makefile.am | 2 +- fence/agents/rsa/Makefile.am | 2 +- fence/agents/sanbox2/Makefile.am | 2 +- fence/agents/virsh/Makefile.am | 2 +- fence/agents/vmware/Makefile.am | 2 +- fence/agents/wti/Makefile.am | 2 +- make/release.mk | 1 - 25 files changed, 24 insertions(+), 25 deletions(-) diff --git a/fence/agents/alom/Makefile.am b/fence/agents/alom/Makefile.am index 68d5fc7..f8781cd 100644 --- a/fence/agents/alom/Makefile.am +++ b/fence/agents/alom/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/apc/Makefile.am b/fence/agents/apc/Makefile.am index 2615aab..e02de1e 100644 --- a/fence/agents/apc/Makefile.am +++ b/fence/agents/apc/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/apc_snmp/Makefile.am b/fence/agents/apc_snmp/Makefile.am index c64dfad..ca75b75 100644 --- a/fence/agents/apc_snmp/Makefile.am +++ b/fence/agents/apc_snmp/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = $(TARGET).py \ sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/bladecenter/Makefile.am b/fence/agents/bladecenter/Makefile.am index 0ee1ff8..6fef8a8 100644 --- a/fence/agents/bladecenter/Makefile.am +++ b/fence/agents/bladecenter/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/cisco_mds/Makefile.am b/fence/agents/cisco_mds/Makefile.am index 04293eb..ce1d67c 100644 --- a/fence/agents/cisco_mds/Makefile.am +++ b/fence/agents/cisco_mds/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/cisco_ucs/Makefile.am b/fence/agents/cisco_ucs/Makefile.am index 77e3a74..9d8ec54 100644 --- a/fence/agents/cisco_ucs/Makefile.am +++ b/fence/agents/cisco_ucs/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/drac5/Makefile.am b/fence/agents/drac5/Makefile.am index 9cf2f0f..80d523c 100644 --- a/fence/agents/drac5/Makefile.am +++ b/fence/agents/drac5/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/eaton_snmp/Makefile.am b/fence/agents/eaton_snmp/Makefile.am index dad91c9..3c0ed3b 100644 --- a/fence/agents/eaton_snmp/Makefile.am +++ b/fence/agents/eaton_snmp/Makefile.am @@ -7,7 +7,7 @@ EXTRA_DIST = $(TARGET).py \ sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/eps/Makefile.am b/fence/agents/eps/Makefile.am index d150254..288dab9 100644 --- a/fence/agents/eps/Makefile.am +++ b/fence/agents/eps/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/ibmblade/Makefile.am b/fence/agents/ibmblade/Makefile.am index c92ed35..83131b7 100644 --- a/fence/agents/ibmblade/Makefile.am +++ b/fence/agents/ibmblade/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/ifmib/Makefile.am b/fence/agents/ifmib/Makefile.am index 21c1078..d188e31 100644 --- a/fence/agents/ifmib/Makefile.am +++ b/fence/agents/ifmib/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py README sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/ilo/Makefile.am b/fence/agents/ilo/Makefile.am index 4c218c2..3808112 100644 --- a/fence/agents/ilo/Makefile.am +++ b/fence/agents/ilo/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/ilo_mp/Makefile.am b/fence/agents/ilo_mp/Makefile.am index d322a3e..854ebc8 100644 --- a/fence/agents/ilo_mp/Makefile.am +++ b/fence/agents/ilo_mp/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/intelmodular/Makefile.am b/fence/agents/intelmodular/Makefile.am index fac0d52..14c56c6 100644 --- a/fence/agents/intelmodular/Makefile.am +++ b/fence/agents/intelmodular/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/ipmilan/Makefile.am b/fence/agents/ipmilan/Makefile.am index dcba792..e2785e2 100644 --- a/fence/agents/ipmilan/Makefile.am +++ b/fence/agents/ipmilan/Makefile.am @@ -6,7 +6,7 @@ noinst_HEADERS = expect.h fence_ipmilan_SOURCES = expect.c ipmilan.c -dist_man_MANS = fence_ipmilan.8 +man_MANS = fence_ipmilan.8 fence_ipmilan.8: fence_ipmilan $(top_srcdir)/fence/agents/lib/fence2man.xsl set -e && \ diff --git a/fence/agents/ldom/Makefile.am b/fence/agents/ldom/Makefile.am index a29346b..a127da4 100644 --- a/fence/agents/ldom/Makefile.am +++ b/fence/agents/ldom/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/lpar/Makefile.am b/fence/agents/lpar/Makefile.am index 3579805..1f72461 100644 --- a/fence/agents/lpar/Makefile.am +++ b/fence/agents/lpar/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/node_assassin/Makefile.am b/fence/agents/node_assassin/Makefile.am index 9208523..6c0f708 100644 --- a/fence/agents/node_assassin/Makefile.am +++ b/fence/agents/node_assassin/Makefile.am @@ -17,7 +17,7 @@ conffile_DATA = $(TARGET).conf sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 $(TARGET): $(TARGET).pl cat $^ | sed \ diff --git a/fence/agents/rhevm/Makefile.am b/fence/agents/rhevm/Makefile.am index fc4635f..cd6222f 100644 --- a/fence/agents/rhevm/Makefile.am +++ b/fence/agents/rhevm/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/rsa/Makefile.am b/fence/agents/rsa/Makefile.am index 4d938be..7280c45 100644 --- a/fence/agents/rsa/Makefile.am +++ b/fence/agents/rsa/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/sanbox2/Makefile.am b/fence/agents/sanbox2/Makefile.am index 896ee4c..5399d9f 100644 --- a/fence/agents/sanbox2/Makefile.am +++ b/fence/agents/sanbox2/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/virsh/Makefile.am b/fence/agents/virsh/Makefile.am index 5b97b16..8d4327c 100644 --- a/fence/agents/virsh/Makefile.am +++ b/fence/agents/virsh/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/vmware/Makefile.am b/fence/agents/vmware/Makefile.am index 3eecf95..c8c3ff8 100644 --- a/fence/agents/vmware/Makefile.am +++ b/fence/agents/vmware/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = fence_vmware.py fence_vmware_helper.pl sbin_SCRIPTS = $(TARGET) -dist_man_MANS = fence_vmware.8 +man_MANS = fence_vmware.8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/wti/Makefile.am b/fence/agents/wti/Makefile.am index 8d778c7..60699c4 100644 --- a/fence/agents/wti/Makefile.am +++ b/fence/agents/wti/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(TARGET).py sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/make/release.mk b/make/release.mk index f3257d9..3a34ace 100644 --- a/make/release.mk +++ b/make/release.mk @@ -35,7 +35,6 @@ endif tarballs: tag ./autogen.sh ./configure - make make distcheck sha256: tarballs $(project)-$(version).sha256

1 0

cluster: RHEL57 - resource-agents: Apache resource with spaces in name fails to start
by Marek Grác 07 Feb '11

07 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6d… Commit: 6d0b3a728aa478d73621fa003be63806d3623b26 Parent: dbbb859091a700db2fc4dcd4e4df4a0dfdaa84b1 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Feb 7 14:12:47 2011 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Feb 7 14:51:57 2011 +0100 resource-agents: Apache resource with spaces in name fails to start Resolve: rhbz#632704 --- rgmanager/src/resources/utils/config-utils.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rgmanager/src/resources/utils/config-utils.sh b/rgmanager/src/resources/utils/config-utils.sh index 60fc6e0..5646fa8 100644 --- a/rgmanager/src/resources/utils/config-utils.sh +++ b/rgmanager/src/resources/utils/config-utils.sh @@ -27,7 +27,7 @@ declare -a ip_keys generate_configTemplate() { - cat > $1 << EOT + cat > "$1" << EOT # # "$1" was created from the "$2" # @@ -53,8 +53,8 @@ sha1_verify() ocf_log debug "Checking: SHA1 checksum of config file $oldFile" - sha1_new=`cat $oldFile | grep -v "# rgmanager-sha1" | sha1sum | sed 's/^$[a-z0-9]\+$ .*$/\1/'` - sha1_old=`tail -n 1 $oldFile | sed 's/^# rgmanager-sha1 $.*$$/\1/' | sed 's/^$[a-z0-9]\+$ .*$/\1/'` + sha1_new=`cat "$oldFile" | grep -v "# rgmanager-sha1" | sha1sum | sed 's/^$[a-z0-9]\+$ .*$/\1/'` + sha1_old=`tail -n 1 "$oldFile" | sed 's/^# rgmanager-sha1 $.*$$/\1/' | sed 's/^$[a-z0-9]\+$ .*$/\1/'` if [ $sha1_new = $sha1_old ]; then ocf_log debug "Checking: SHA1 checksum > succeed" @@ -304,4 +304,4 @@ check_pid_file() { fi return 1; -} \ No newline at end of file +}

1 0

resource-agents: master - resource-agents: Remove netmask from IP address when creating list of them
by Marek Grác 07 Feb '11

07 Feb '11

Gitweb: http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a… Commit: 49ef8ffe48a2fc6a7e4c132bab87b11a76dd8f9e Parent: 4ae988fa61afad242a870571622f4ab2aafadc31 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Feb 7 14:14:39 2011 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Feb 7 14:14:39 2011 +0100 resource-agents: Remove netmask from IP address when creating list of them IP address were copied directly to configuration of various resource agents. Resolves: rhbz#667217 --- rgmanager/src/resources/utils/config-utils.sh.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/utils/config-utils.sh.in b/rgmanager/src/resources/utils/config-utils.sh.in index 2d461bb..dd43d41 100644 --- a/rgmanager/src/resources/utils/config-utils.sh.in +++ b/rgmanager/src/resources/utils/config-utils.sh.in @@ -145,7 +145,9 @@ build_ip_list() break fi - ipaddrs="$ipaddrs $ipaddr" + # remove netmask + iponly=`echo $ipaddr | sed 's/\/.*//'` + ipaddrs="$ipaddrs $iponly" ((x++)) done

1 0

resource-agents: master - resource-agents: Apache resource with spaces in name fails to start
by Marek Grác 07 Feb '11

07 Feb '11

Gitweb: http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a… Commit: 4ae988fa61afad242a870571622f4ab2aafadc31 Parent: a23793faa3c7718177cbbda77363d5fd3765415d Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Feb 7 14:12:47 2011 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Feb 7 14:12:47 2011 +0100 resource-agents: Apache resource with spaces in name fails to start Resolve: rhbz#667222 --- rgmanager/src/resources/utils/config-utils.sh.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rgmanager/src/resources/utils/config-utils.sh.in b/rgmanager/src/resources/utils/config-utils.sh.in index e3a44d0..2d461bb 100644 --- a/rgmanager/src/resources/utils/config-utils.sh.in +++ b/rgmanager/src/resources/utils/config-utils.sh.in @@ -8,7 +8,7 @@ declare -a ip_keys generate_configTemplate() { - cat > $1 << EOT + cat > "$1" << EOT # # "$1" was created from the "$2" # @@ -34,8 +34,8 @@ sha1_verify() ocf_log debug "Checking: SHA1 checksum of config file $oldFile" - sha1_new=`cat $oldFile | grep -v "# rgmanager-sha1" | sha1sum | sed 's/^$[a-z0-9]\+$ .*$/\1/'` - sha1_old=`tail -n 1 $oldFile | sed 's/^# rgmanager-sha1 $.*$$/\1/' | sed 's/^$[a-z0-9]\+$ .*$/\1/'` + sha1_new=`cat "$oldFile" | grep -v "# rgmanager-sha1" | sha1sum | sed 's/^$[a-z0-9]\+$ .*$/\1/'` + sha1_old=`tail -n 1 "$oldFile" | sed 's/^# rgmanager-sha1 $.*$$/\1/' | sed 's/^$[a-z0-9]\+$ .*$/\1/'` if [ "$sha1_new" = "$sha1_old" ]; then ocf_log debug "Checking: SHA1 checksum > succeed"

1 0

cluster: RHEL6 - qdiskd: Fix auto-vote calculation loop
by Lon Hohberger 04 Feb '11

04 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8f… Commit: 8fd8d3f3c52b9efc09d911bd8fdcab3e8742e9cb Parent: b4dc284f463237afb47c88abbfe48a6209ce9a51 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Fri Feb 4 11:19:50 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Fri Feb 4 11:27:43 2011 -0500 qdiskd: Fix auto-vote calculation loop Resolves: rhbz#663433 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/qdisk/disk.c | 1 + cman/qdisk/main.c | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/cman/qdisk/disk.c b/cman/qdisk/disk.c index 1f646ce..9884ea7 100644 --- a/cman/qdisk/disk.c +++ b/cman/qdisk/disk.c @@ -24,6 +24,7 @@ #include <platform.h> #include <unistd.h> #include <time.h> +#include <linux/types.h> #include <linux/fs.h> #include <liblogthread.h> #include <zlib.h> diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c index ebdb018..9262af2 100644 --- a/cman/qdisk/main.c +++ b/cman/qdisk/main.c @@ -1377,32 +1377,33 @@ auto_qdisk_votes(int desc) { int ret = 1; char buf[PATH_MAX]; - char *name; + char *v = NULL, *name = NULL; while (1) { int votes=0; + name = NULL; + snprintf(buf, sizeof(buf)-1, + "/cluster/clusternodes/clusternode[%d]/@name", ret); + if (ccs_get(desc, buf, &name) != 0) + break; + snprintf(buf, sizeof(buf)-1, "/cluster/clusternodes/clusternode[%d]/@votes", ret); - name = NULL; - if (ccs_get(desc, buf, &name) == 0) - votes = atoi(name); - else + if (ccs_get(desc, buf, &v) == 0) { + votes = atoi(v); + free(v); + v = NULL; + } else { votes = 1; + } if (votes != 1) { - free(name); - snprintf(buf, sizeof(buf)-1, - "/cluster/clusternodes/clusternode[%d]/@name", - ret); - - if (ccs_get(desc, buf, &name) == 0) { - logt_print(LOG_ERR, "%s's vote count is %d\n", - name, votes); - free(name); - } + logt_print(LOG_ERR, "%s's vote count is %d\n", + name, votes); + free(name); logt_print(LOG_ERR, "Set all node vote counts to 1 " "or specify qdiskd's votes\n");

1 0

cluster: STABLE31 - qdiskd: Fix auto-vote calculation loop
by Lon Hohberger 04 Feb '11

04 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=cb… Commit: cbf98a5623e7177d497092f7a7b0e170b8b3177e Parent: e2c5e231eb9d6732235a073e2556993891b79e3f Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Fri Feb 4 11:19:50 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Fri Feb 4 11:23:39 2011 -0500 qdiskd: Fix auto-vote calculation loop Resolves: rhbz#663433 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- cman/qdisk/disk.c | 1 + cman/qdisk/main.c | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/cman/qdisk/disk.c b/cman/qdisk/disk.c index 1f646ce..9884ea7 100644 --- a/cman/qdisk/disk.c +++ b/cman/qdisk/disk.c @@ -24,6 +24,7 @@ #include <platform.h> #include <unistd.h> #include <time.h> +#include <linux/types.h> #include <linux/fs.h> #include <liblogthread.h> #include <zlib.h> diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c index ebdb018..9262af2 100644 --- a/cman/qdisk/main.c +++ b/cman/qdisk/main.c @@ -1377,32 +1377,33 @@ auto_qdisk_votes(int desc) { int ret = 1; char buf[PATH_MAX]; - char *name; + char *v = NULL, *name = NULL; while (1) { int votes=0; + name = NULL; + snprintf(buf, sizeof(buf)-1, + "/cluster/clusternodes/clusternode[%d]/@name", ret); + if (ccs_get(desc, buf, &name) != 0) + break; + snprintf(buf, sizeof(buf)-1, "/cluster/clusternodes/clusternode[%d]/@votes", ret); - name = NULL; - if (ccs_get(desc, buf, &name) == 0) - votes = atoi(name); - else + if (ccs_get(desc, buf, &v) == 0) { + votes = atoi(v); + free(v); + v = NULL; + } else { votes = 1; + } if (votes != 1) { - free(name); - snprintf(buf, sizeof(buf)-1, - "/cluster/clusternodes/clusternode[%d]/@name", - ret); - - if (ccs_get(desc, buf, &name) == 0) { - logt_print(LOG_ERR, "%s's vote count is %d\n", - name, votes); - free(name); - } + logt_print(LOG_ERR, "%s's vote count is %d\n", + name, votes); + free(name); logt_print(LOG_ERR, "Set all node vote counts to 1 " "or specify qdiskd's votes\n");

1 0

cluster: RHEL6 - doc: Update cluster_conf.html to match schema
by Lon Hohberger 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b4… Commit: b4dc284f463237afb47c88abbfe48a6209ce9a51 Parent: a6d691f0925effe140e5970522eb1c560da9802e Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Thu Feb 3 16:58:36 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Feb 3 17:46:03 2011 -0500 doc: Update cluster_conf.html to match schema Resolves: rhbz#618705 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- doc/cluster_conf.html | 143 ++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 119 insertions(+), 24 deletions(-) diff --git a/doc/cluster_conf.html b/doc/cluster_conf.html index 17d3f37..5bfafac 100644 --- a/doc/cluster_conf.html +++ b/doc/cluster_conf.html @@ -100,10 +100,6 @@         <<a href="#tag_postgres-8">postgres-8</a> ...>                 <a href="#ref_CHILDREN">CHILDREN</a>         <<a href="#tag_postgres-8">/postgres-8</a>> - <a name="ref_TOMCAT-5"/>TOMCAT-5 definition -        <<a href="#tag_tomcat-5">tomcat-5</a> ...> -                <a href="#ref_CHILDREN">CHILDREN</a> -        <<a href="#tag_tomcat-5">/tomcat-5</a>> <a name="ref_TOMCAT-6"/>TOMCAT-6 definition         <<a href="#tag_tomcat-6">tomcat-6</a> ...>                 <a href="#ref_CHILDREN">CHILDREN</a> @@ -136,6 +132,14 @@         <<a href="#tag_nfsserver">nfsserver</a> ...>                 <a href="#ref_CHILDREN">CHILDREN</a>         <<a href="#tag_nfsserver">/nfsserver</a>> + <a name="ref_ORAINSTANCE"/>ORAINSTANCE definition +        <<a href="#tag_orainstance">orainstance</a> ...> +                <a href="#ref_CHILDREN">CHILDREN</a> +        <<a href="#tag_orainstance">/orainstance</a>> + <a name="ref_ORALISTENER"/>ORALISTENER definition +        <<a href="#tag_oralistener">oralistener</a> ...> +                <a href="#ref_CHILDREN">CHILDREN</a> +        <<a href="#tag_oralistener">/oralistener</a>> <a name="ref_FS"/>FS definition         <<a href="#tag_fs">fs</a> ...>                 <a href="#ref_CHILDREN">CHILDREN</a> @@ -157,7 +161,6 @@         <a href="#ref_SAMBA">SAMBA</a>         <a href="#ref_MYSQL">MYSQL</a>         <a href="#ref_POSTGRES-8">POSTGRES-8</a> -        <a href="#ref_TOMCAT-5">TOMCAT-5</a>         <a href="#ref_TOMCAT-6">TOMCAT-6</a>         <a href="#ref_LVM">LVM</a>         <a href="#ref_VM">VM</a> @@ -166,6 +169,8 @@         <a href="#ref_NAMED">NAMED</a>         <a href="#ref_ASEHAAGENT">ASEHAAGENT</a>         <a href="#ref_NFSSERVER">NFSSERVER</a> +        <a href="#ref_ORAINSTANCE">ORAINSTANCE</a> +        <a href="#ref_ORALISTENER">ORALISTENER</a>         <a href="#ref_FS">FS</a>         <a href="#ref_ORACLEDB">ORACLEDB</a>         <a href="#ref_RESOURCEACTION">RESOURCEACTION</a> @@ -231,6 +236,8 @@ <tr valign="top"><td><a href="#tag_nfsserver">nfsserver</a></td><td>This defines an NFS server resource.</td></tr> <tr valign="top"><td><a href="#tag_openldap">openldap</a></td><td>Defines an Open LDAP server</td></tr> <tr valign="top"><td><a href="#tag_oracledb">oracledb</a></td><td>Oracle 10g Failover Instance</td></tr> +<tr valign="top"><td><a href="#tag_orainstance">orainstance</a></td><td>Oracle 10g Failover Instance</td></tr> +<tr valign="top"><td><a href="#tag_oralistener">oralistener</a></td><td>Oracle 10g Listener Instance</td></tr> <tr valign="top"><td><a href="#tag_postgres-8">postgres-8</a></td><td>Defines a PostgreSQL server</td></tr> <tr valign="top"><td><a href="#tag_quorumd">quorumd</a></td><td>This element and its attributes define parameters for the quorum disk daemon, quorumd. qdisk(5).</td></tr> <tr valign="top"><td><a href="#tag_resources">resources</a></td><td>Defines global resources which may be referenced in services. You may redefine actions for resources here, but child resource definitions are ignored in this section.</td></tr> @@ -240,7 +247,6 @@ <tr valign="top"><td><a href="#tag_SAPInstance">SAPInstance</a></td><td>SAP instance resource agent</td></tr> <tr valign="top"><td><a href="#tag_script">script</a></td><td>LSB-compliant init script as a clustered resource.</td></tr> <tr valign="top"><td><a href="#tag_service">service</a></td><td>Defines a service (resource group).</td></tr> -<tr valign="top"><td><a href="#tag_tomcat-5">tomcat-5</a></td><td>Defines a Tomcat server</td></tr> <tr valign="top"><td><a href="#tag_tomcat-6">tomcat-6</a></td><td>Defines a Tomcat server</td></tr> <tr valign="top"><td><a href="#tag_totem">totem</a></td><td>OpenAIS msg transport protocol</td></tr> <tr valign="top"><td><a href="#tag_unfence">unfence</a></td><td>Contains devices for unfencing the node. fence_node(8)</td></tr> @@ -281,6 +287,8 @@ Defines an Apache web server <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_ASEHAagent"/>ASEHAagent</h3> @@ -303,6 +311,8 @@ Sybase ASE Failover Instance <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_cluster"/>cluster</h3> @@ -331,6 +341,8 @@ Defines a cluster file system mount. <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_clusternode"/>clusternode</h3> @@ -371,6 +383,7 @@ The cman element contains attributes that define the following cluster-wide para <tr><td>port</td><td> </td></tr> <tr><td>quorum_dev_poll</td><td>The amount of time after a qdisk poll, in milliseconds, before a quorum disk is considered dead. The quorum disk daemon, qdisk, periodically sends hello messages to cman and ais, indicating that qdisk is present. If qdisk takes more time to send a hello message to cman and ais than by quorum_dev_poll, then cman declares qdisk dead and prints a message indicating that connection to the quorum device has been lost.</td></tr> <tr><td>shutdown_timeout</td><td>Timeout period, in milliseconds, to allow a service to respond during a shutdown.</td></tr> + <tr><td>transport</td><td>Specifies transport mechanism to use. Available values are udp (multicast default), udpb (broadcast), udpu (unicast) and rdma (Infiniband). corosync.conf(5)</td></tr> <tr><td>two_node</td><td>The two_node attribute allows you to configure a cluster with only two nodes. Ordinarily, the loss of quorum after one of two nodes fails prevents the remaining node from continuing (if both nodes have one vote.) To enable a two-node cluster, set the two_node value equal to 1. If the two_node value is enabled, the expected_votes value must be set to 1.</td></tr> <tr><td>upgrading</td><td>Set this if you are performing a rolling upgrade of the cluster between major releases.</td></tr> </table> @@ -389,13 +402,16 @@ Defines the properties of a device used for fencing or unfencing a node. fenced( <tr><td>community</td><td>Set the community string</td></tr> <tr><td>cserver</td><td>The hostname (and optionally the username in the form of username@hostname) assigned to the device. Refer to the fence_egenera(8) man page for more information.</td></tr> <tr><td>debug</td><td>Specify (stdin) or increment (command line) debug level</td></tr> + <tr><td>delay</td><td>Wait this many seconds before fencing is started. fence_egenera(8)</td></tr> <tr><td>device</td><td>The device the switch is connected to on the controlling host.</td></tr> <tr><td>devices</td><td>List of devices to fence (separated by commas).</td></tr> <tr><td>domain</td><td>Virtual Machine (domain name) to fence (deprecated)</td></tr> <tr><td>drac_version</td><td>Force DRAC version to use</td></tr> + <tr><td>esh</td><td>Path to the esh command on the cserver. fence_egenera(8)</td></tr> <tr><td>exec</td><td>Command to execute</td></tr> <tr><td>hash</td><td>Packet hash strength (none, sha1, [sha256], sha512)</td></tr> <tr><td>help</td><td>Display help and exit</td></tr> + <tr><td>hidden_page</td><td>Name of hidden page</td></tr> <tr><td>hmc_version</td><td>Force HMC version to use (3 or 4)</td></tr> <tr><td>identity_file</td><td>Identity file for ssh</td></tr> <tr><td>inet4_only</td><td>Forces agent to use IPv4 addresses only</td></tr> @@ -409,8 +425,11 @@ Defines the properties of a device used for fencing or unfencing a node. fenced( <tr><td>lanplus</td><td>For IPMI LAN only. Set value to either True or 1; leave out for false.</td></tr> <tr><td>logfile</td><td>Location to output logs from fence_scsi.</td></tr> <tr><td>login</td><td>The login name used to access the device. </td></tr> + <tr><td>login_timeout</td><td>Wait X seconds for cmd prompt after login</td></tr> + <tr><td>lpan</td><td>The lpan to operate on. fence_egenera(8)</td></tr> <tr><td>managed</td><td>Managed system name</td></tr> <tr><td>method</td><td>Method to fence (onoff or cycle)</td></tr> + <tr><td>missing_as_off</td><td>Missing port returns OFF instead of failure</td></tr> <tr><td>module_name</td><td>DRAC/MC module name</td></tr> <tr><td>multicast_address</td><td>Multicast address (default=225.0.0.12 / ff05::3:1)</td></tr> <tr><td>nodename</td><td>Name of the node to be fenced. Refer to fence_scsi(8) for more information.</td></tr> @@ -419,7 +438,11 @@ Defines the properties of a device used for fencing or unfencing a node. fenced( <tr><td>passwd</td><td>The password used to authenticate the connection to the device.</td></tr> <tr><td>passwd_script</td><td>The script that supplies a password for access to the fence device. Using this supersedes the Password parameter.</td></tr> <tr><td>port</td><td>The switch outlet number.</td></tr> + <tr><td>power_timeout</td><td>Test X seconds for status change after ON/OFF</td></tr> + <tr><td>power_wait</td><td>Wait X seconds after issuing ON/OFF</td></tr> + <tr><td>pserver</td><td>The pserver to operate on. fence_egenera(8)</td></tr> <tr><td>retrans</td><td>Multicast retransmit time (in 1/10sec; default=20)</td></tr> + <tr><td>retry_on</td><td>Count of attempts to retry power on</td></tr> <tr><td>ribcl</td><td>Force ribcl version to use</td></tr> <tr><td>rpowerpath</td><td></td></tr> <tr><td>secure</td><td>SSH connection</td></tr> @@ -427,6 +450,7 @@ Defines the properties of a device used for fencing or unfencing a node. fenced( <tr><td>serial_device</td><td>Serial device (default=/dev/ttyS1)</td></tr> <tr><td>serial_params</td><td>Serial Parameters (default=115200,8N1)</td></tr> <tr><td>servers</td><td>The hostname of each GNBD to disable. For multiple hostnames, separate each hostname with a space.</td></tr> + <tr><td>shell_timeout</td><td>Wait X seconds for cmd prompt after issuing command</td></tr> <tr><td>snmp_auth_prot</td><td>Set authentication protocol (MD5|SHA)</td></tr> <tr><td>snmp_priv_passwd</td><td>Set privacy protocol password</td></tr> <tr><td>snmp_priv_passwd_script</td><td>Script to run to retrieve privacy password</td></tr> @@ -437,6 +461,7 @@ Defines the properties of a device used for fencing or unfencing a node. fenced( <tr><td>switch</td><td>Physical switch number on device</td></tr> <tr><td>timeout</td><td>Fencing timeout (in seconds; default=30)</td></tr> <tr><td>udpport</td><td>UDP/TCP port to use for connection with device</td></tr> + <tr><td>user</td><td>See fence_egenera(8)</td></tr> <tr><td>use_uuid</td><td>Treat [domain] as UUID instead of domain name. This is provided for compatibility with older fence_xvmd installations.</td></tr> <tr><td>verbose</td><td>Verbose mode</td></tr> <tr><td>version</td><td>Display version information and exit</td></tr> @@ -526,13 +551,16 @@ Defines fence device properties. fenced(8) <tr><td>community</td><td>Set the community string</td></tr> <tr><td>cserver</td><td>The hostname (and optionally the username in the form of username@hostname) assigned to the device. Refer to the fence_egenera(8) man page for more information.</td></tr> <tr><td>debug</td><td>Specify (stdin) or increment (command line) debug level</td></tr> + <tr><td>delay</td><td>Wait this many seconds before fencing is started. fence_egenera(8)</td></tr> <tr><td>device</td><td>The device the switch is connected to on the controlling host.</td></tr> <tr><td>devices</td><td>List of devices to fence (separated by commas).</td></tr> <tr><td>domain</td><td>Virtual Machine (domain name) to fence (deprecated)</td></tr> <tr><td>drac_version</td><td>Force DRAC version to use</td></tr> + <tr><td>esh</td><td>Path to the esh command on the cserver. fence_egenera(8)</td></tr> <tr><td>exec</td><td>Command to execute</td></tr> <tr><td>hash</td><td>Packet hash strength (none, sha1, [sha256], sha512)</td></tr> <tr><td>help</td><td>Display help and exit</td></tr> + <tr><td>hidden_page</td><td>Name of hidden page</td></tr> <tr><td>hmc_version</td><td>Force HMC version to use (3 or 4)</td></tr> <tr><td>identity_file</td><td>Identity file for ssh</td></tr> <tr><td>inet4_only</td><td>Forces agent to use IPv4 addresses only</td></tr> @@ -546,8 +574,11 @@ Defines fence device properties. fenced(8) <tr><td>lanplus</td><td>For IPMI LAN only. Set value to either True or 1; leave out for false.</td></tr> <tr><td>logfile</td><td>Location to output logs from fence_scsi.</td></tr> <tr><td>login</td><td>The login name used to access the device. </td></tr> + <tr><td>login_timeout</td><td>Wait X seconds for cmd prompt after login</td></tr> + <tr><td>lpan</td><td>The lpan to operate on. fence_egenera(8)</td></tr> <tr><td>managed</td><td>Managed system name</td></tr> <tr><td>method</td><td>Method to fence (onoff or cycle)</td></tr> + <tr><td>missing_as_off</td><td>Missing port returns OFF instead of failure</td></tr> <tr><td>module_name</td><td>DRAC/MC module name</td></tr> <tr><td>multicast_address</td><td>Multicast address (default=225.0.0.12 / ff05::3:1)</td></tr> <tr><td>nodename</td><td>Name of the node to be fenced. Refer to fence_scsi(8) for more information.</td></tr> @@ -556,7 +587,11 @@ Defines fence device properties. fenced(8) <tr><td>passwd</td><td>The password used to authenticate the connection to the device.</td></tr> <tr><td>passwd_script</td><td>The script that supplies a password for access to the fence device. Using this supersedes the Password parameter.</td></tr> <tr><td>port</td><td>The switch outlet number.</td></tr> + <tr><td>power_timeout</td><td>Test X seconds for status change after ON/OFF</td></tr> + <tr><td>power_wait</td><td>Wait X seconds after issuing ON/OFF</td></tr> + <tr><td>pserver</td><td>The pserver to operate on. fence_egenera(8)</td></tr> <tr><td>retrans</td><td>Multicast retransmit time (in 1/10sec; default=20)</td></tr> + <tr><td>retry_on</td><td>Count of attempts to retry power on</td></tr> <tr><td>ribcl</td><td>Force ribcl version to use</td></tr> <tr><td>rpowerpath</td><td></td></tr> <tr><td>secure</td><td>SSH connection</td></tr> @@ -564,6 +599,7 @@ Defines fence device properties. fenced(8) <tr><td>serial_device</td><td>Serial device (default=/dev/ttyS1)</td></tr> <tr><td>serial_params</td><td>Serial Parameters (default=115200,8N1)</td></tr> <tr><td>servers</td><td>The hostname of each GNBD to disable. For multiple hostnames, separate each hostname with a space.</td></tr> + <tr><td>shell_timeout</td><td>Wait X seconds for cmd prompt after issuing command</td></tr> <tr><td>snmp_auth_prot</td><td>Set authentication protocol (MD5|SHA)</td></tr> <tr><td>snmp_priv_passwd</td><td>Set privacy protocol password</td></tr> <tr><td>snmp_priv_passwd_script</td><td>Script to run to retrieve privacy password</td></tr> @@ -574,6 +610,7 @@ Defines fence device properties. fenced(8) <tr><td>switch</td><td>Physical switch number on device</td></tr> <tr><td>timeout</td><td>Fencing timeout (in seconds; default=30)</td></tr> <tr><td>udpport</td><td>UDP/TCP port to use for connection with device</td></tr> + <tr><td>user</td><td>See fence_egenera(8)</td></tr> <tr><td>use_uuid</td><td>Treat [domain] as UUID instead of domain name. This is provided for compatibility with older fence_xvmd installations.</td></tr> <tr><td>verbose</td><td>Verbose mode</td></tr> <tr><td>version</td><td>Display version information and exit</td></tr> @@ -632,6 +669,8 @@ Defines a file system mount. <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_gfs_controld"/>gfs_controld</h3> @@ -681,6 +720,7 @@ This is an IP address. <table><tr valign="top"><td>Attribute</td><td>Description</td></tr> <tr><td>address</td><td>IP Address</td></tr> + <tr><td>disable_rdisc</td><td>Disable updating of routing using RDISC protocol</td></tr> <tr><td>family</td><td>Family</td></tr> <tr><td>monitor_link</td><td>Monitor NIC Link</td></tr> <tr><td>nfslock</td><td>Enable NFS lock workarounds</td></tr> @@ -690,6 +730,8 @@ This is an IP address. <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_lockspace"/>lockspace</h3> @@ -742,6 +784,8 @@ LVM Failover script <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_master"/>master</h3> @@ -782,6 +826,8 @@ Defines a MySQL database server <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_named"/>named</h3> @@ -800,6 +846,8 @@ Defines an instance of named server <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_netfs"/>netfs</h3> @@ -819,6 +867,8 @@ Defines an NFS/CIFS file system mount. <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_nfsclient"/>nfsclient</h3> @@ -839,6 +889,8 @@ Defines an NFS client. <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_nfsexport"/>nfsexport</h3> @@ -854,6 +906,8 @@ This defines an NFS export. <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_nfsserver"/>nfsserver</h3> @@ -868,6 +922,8 @@ This defines an NFS server resource. <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_openldap"/>openldap</h3> @@ -885,6 +941,8 @@ Defines an Open LDAP server <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_oracledb"/>oracledb</h3> @@ -902,6 +960,42 @@ Oracle 10g Failover Instance <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> +</table> +Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> +<h3><a name="tag_orainstance"/>orainstance</h3> +Oracle 10g Failover Instance + +<table><tr valign="top"><td>Attribute</td><td>Description</td></tr> + <tr><td>home</td><td>Oracle Home Directory</td></tr> + <tr><td>listeners</td><td>Oracle listeners</td></tr> + <tr><td>lockfile</td><td>Pathname for lockfile</td></tr> + <tr><td>name</td><td>Oracle SID</td></tr> + <tr><td>ref</td><td>Reference to existing orainstance resource in the resources section.</td></tr> + <tr><td>user</td><td>Oracle User Name</td></tr> + <tr><td>__enforce_timeouts</td><td>Consider a timeout for operations as fatal.</td></tr> + <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> + <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> + <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> +</table> +Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> +<h3><a name="tag_oralistener"/>oralistener</h3> +Oracle 10g Listener Instance + +<table><tr valign="top"><td>Attribute</td><td>Description</td></tr> + <tr><td>home</td><td>Oracle Home Directory</td></tr> + <tr><td>name</td><td>Listener name</td></tr> + <tr><td>ref</td><td>Reference to existing oralistener resource in the resources section.</td></tr> + <tr><td>user</td><td>Oracle User Name</td></tr> + <tr><td>__enforce_timeouts</td><td>Consider a timeout for operations as fatal.</td></tr> + <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> + <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> + <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_postgres-8"/>postgres-8</h3> @@ -919,6 +1013,8 @@ Defines a PostgreSQL server <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_quorumd"/>quorumd</h3> @@ -941,6 +1037,9 @@ This element and its attributes define parameters for the quorum disk daemon, qu <tr><td>status_file</td><td>Debugging file. qdisk(5).</td></tr> <tr><td>stop_cman</td><td>Stop cman if the quorum disk cannot be found during startup. qdisk(5).</td></tr> <tr><td>tko</td><td>The number of cycles a node must miss to be declared dead. qdisk(5).</td></tr> + <tr><td>tko_up</td><td>Amount of positive changes before a host is considered online. qdisk(5).</td></tr> + <tr><td>upgrade_wait</td><td>Amount of cycles wait for conflicts for a bid for master status. qdisk(5).</td></tr> + <tr><td>use_uptime</td><td>Use /proc/uptime instead of gettimeofday(). qdisk(5).</td></tr> <tr><td>votes</td><td>The number of votes the quorum daemon advertises to CMAN when it has a high enough score. qdisk(5).</td></tr> </table> Children: <a href="#tag_heuristic">heuristic</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> @@ -975,6 +1074,8 @@ Dynamic smbd/nmbd resource agent <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_SAPDatabase"/>SAPDatabase</h3> @@ -1001,6 +1102,8 @@ SAP database resource agent <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_SAPInstance"/>SAPInstance</h3> @@ -1022,6 +1125,8 @@ SAP instance resource agent <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_script"/>script</h3> @@ -1036,6 +1141,8 @@ LSB-compliant init script as a clustered resource. <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_service"/>service</h3> @@ -1059,24 +1166,8 @@ Defines a service (resource group). <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> -</table> -Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> -<h3><a name="tag_tomcat-5"/>tomcat-5</h3> -Defines a Tomcat server - -<table><tr valign="top"><td>Attribute</td><td>Description</td></tr> - <tr><td>catalina_base</td><td>Catalina base directory (differs for each service)</td></tr> - <tr><td>catalina_options</td><td>Other command-line options for Catalina</td></tr> - <tr><td>config_file</td><td>Config File</td></tr> - <tr><td>name</td><td>Name</td></tr> - <tr><td>ref</td><td>Reference to existing tomcat-5 resource in the resources section.</td></tr> - <tr><td>service_name</td><td>Inherit the service name.</td></tr> - <tr><td>shutdown_wait</td><td>Wait X seconds for correct end of service shutdown</td></tr> - <tr><td>tomcat_user</td><td>User who runs the Tomcat server</td></tr> - <tr><td>__enforce_timeouts</td><td>Consider a timeout for operations as fatal.</td></tr> - <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> - <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> - <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_tomcat-6"/>tomcat-6</h3> @@ -1092,6 +1183,8 @@ Defines a Tomcat server <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> <h3><a name="tag_totem"/>totem</h3> @@ -1140,6 +1233,8 @@ Defines a Virtual Machine <tr><td>__failure_expire_time</td><td>Amount of time before a failure is forgotten.</td></tr> <tr><td>__independent_subtree</td><td>Treat this and all children as an independent subtree.</td></tr> <tr><td>__max_failures</td><td>Maximum number of failures before returning a failure to a status check.</td></tr> + <tr><td>__max_restarts</td><td>Maximum number restarts for an independent subtree before giving up.</td></tr> + <tr><td>__restart_expire_time</td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr> </table> Children: <a href="#ref_CHILDREN">CHILDREN</a> <a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a> </html>

1 0

cluster: RHEL6 - config: Update schema
by Lon Hohberger 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a6… Commit: a6d691f0925effe140e5970522eb1c560da9802e Parent: 3505bc008d71100acf8b11bcfc494873904957ef Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Thu Feb 3 16:34:30 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Feb 3 17:46:01 2011 -0500 config: Update schema Resolves: rhbz#618705 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- config/tools/xml/cluster.rng.in | 848 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 783 insertions(+), 65 deletions(-) diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in index 505e07a..75bbd28 100644 --- a/config/tools/xml/cluster.rng.in +++ b/config/tools/xml/cluster.rng.in @@ -1011,6 +1011,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1038,6 +1044,9 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="sleeptime" rha:description="Amount of time (seconds) to sleep."/> </optional> + <optional> + <attribute name="disable_rdisc" rha:description="Disable updating of routing using RDISC protocol"/> + </optional> </group> </choice> <optional> @@ -1053,6 +1062,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1105,6 +1120,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1144,6 +1165,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1178,6 +1205,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1223,6 +1256,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1273,6 +1312,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1318,6 +1363,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1363,6 +1414,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1408,6 +1465,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1456,6 +1519,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1501,52 +1570,10 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> - <ref name="CHILDREN"/> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> </optional> - </element> - </define> - - - <define name="TOMCAT-5"> - <element name="tomcat-5" rha:description="Defines a Tomcat server"> - <choice> - <group> -  - <attribute name="ref" rha:description="Reference to existing tomcat-5 resource in the resources section."/> - </group> - <group> - <attribute name="name" rha:description="Name"/> - <optional> - <attribute name="config_file" rha:description="Config File"/> - </optional> - <optional> - <attribute name="tomcat_user" rha:description="User who runs the Tomcat server"/> - </optional> - <optional> - <attribute name="catalina_options" rha:description="Other command-line options for Catalina"/> - </optional> - <optional> - <attribute name="catalina_base" rha:description="Catalina base directory (differs for each service)"/> - </optional> - <optional> - <attribute name="shutdown_wait" rha:description="Wait X seconds for correct end of service shutdown"/> - </optional> - <optional> - <attribute name="service_name" rha:description="Inherit the service name."/> - </optional> - </group> - </choice> <optional> - <attribute name="__independent_subtree" rha:description="Treat this and all children as an independent subtree."/> - </optional> - <optional> - <attribute name="__enforce_timeouts" rha:description="Consider a timeout for operations as fatal."/> - </optional> - <optional> - <attribute name="__max_failures" rha:description="Maximum number of failures before returning a failure to a status check."/> - </optional> - <optional> - <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> </optional> <optional> <ref name="CHILDREN"/> @@ -1588,6 +1615,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1628,6 +1661,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1712,6 +1751,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1769,6 +1814,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1839,6 +1890,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1887,6 +1944,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1927,6 +1990,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -1963,6 +2032,94 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> + <ref name="CHILDREN"/> + </optional> + </element> + </define> + + + <define name="ORAINSTANCE"> + <element name="orainstance" rha:description="Oracle 10g Failover Instance"> + <choice> + <group> +  + <attribute name="ref" rha:description="Reference to existing orainstance resource in the resources section."/> + </group> + <group> + <attribute name="name" rha:description="Oracle SID"/> + <attribute name="user" rha:description="Oracle User Name"/> + <attribute name="home" rha:description="Oracle Home Directory"/> + <optional> + <attribute name="listeners" rha:description="Oracle listeners"/> + </optional> + <optional> + <attribute name="lockfile" rha:description="Pathname for lockfile"/> + </optional> + </group> + </choice> + <optional> + <attribute name="__independent_subtree" rha:description="Treat this and all children as an independent subtree."/> + </optional> + <optional> + <attribute name="__enforce_timeouts" rha:description="Consider a timeout for operations as fatal."/> + </optional> + <optional> + <attribute name="__max_failures" rha:description="Maximum number of failures before returning a failure to a status check."/> + </optional> + <optional> + <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> + </optional> + <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> + <ref name="CHILDREN"/> + </optional> + </element> + </define> + + + <define name="ORALISTENER"> + <element name="oralistener" rha:description="Oracle 10g Listener Instance"> + <choice> + <group> +  + <attribute name="ref" rha:description="Reference to existing oralistener resource in the resources section."/> + </group> + <group> + <attribute name="name" rha:description="Listener name"/> + <attribute name="user" rha:description="Oracle User Name"/> + <attribute name="home" rha:description="Oracle Home Directory"/> + </group> + </choice> + <optional> + <attribute name="__independent_subtree" rha:description="Treat this and all children as an independent subtree."/> + </optional> + <optional> + <attribute name="__enforce_timeouts" rha:description="Consider a timeout for operations as fatal."/> + </optional> + <optional> + <attribute name="__max_failures" rha:description="Maximum number of failures before returning a failure to a status check."/> + </optional> + <optional> + <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> + </optional> + <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -2019,6 +2176,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -2060,6 +2223,12 @@ To validate your cluster.conf against this schema, run: <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element> @@ -2081,7 +2250,6 @@ To validate your cluster.conf against this schema, run: <ref name="SAMBA"/> <ref name="MYSQL"/> <ref name="POSTGRES-8"/> - <ref name="TOMCAT-5"/> <ref name="TOMCAT-6"/> <ref name="LVM"/> <ref name="VM"/> @@ -2090,6 +2258,8 @@ To validate your cluster.conf against this schema, run: <ref name="NAMED"/> <ref name="ASEHAAGENT"/> <ref name="NFSSERVER"/> + <ref name="ORAINSTANCE"/> + <ref name="ORALISTENER"/> <ref name="FS"/> <ref name="ORACLEDB"/> <ref name="RESOURCEACTION"/> @@ -2186,8 +2356,10 @@ To validate your cluster.conf against this schema, run: the impilan fence device.-->  <group> + <optional> <attribute name="ipaddr" rha:description="IP address or the name of the device." rha:sample="rack007"/> + </optional> <optional> <attribute name="login" rha:description="The login name used to access the device. " rha:sample="admin"/> @@ -2386,6 +2558,11 @@ To validate your cluster.conf against this schema, run:   +  +  +  +  +  <group> <optional> @@ -2419,6 +2596,9 @@ To validate your cluster.conf against this schema, run: <attribute name="secure" rha:description="SSH connection" /> </optional> <optional> + <attribute name="identity_file" rha:description="Identity file for ssh" /> + </optional> + <optional> <attribute name="vmware_datacenter" rha:description="Show only machines in specified datacenter" /> </optional> <optional> @@ -2436,6 +2616,24 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> @@ -2463,6 +2661,9 @@ To validate your cluster.conf against this schema, run: <attribute name="secure" rha:description="SSH connection" /> </optional> <optional> + <attribute name="identity_file" rha:description="Identity file for ssh" /> + </optional> + <optional> <attribute name="partition" rha:description="Partition name" /> </optional> <optional> @@ -2498,6 +2699,24 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> @@ -2557,6 +2776,27 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="missing_as_off" rha:description="Missing port returns OFF instead of failure" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> @@ -2628,6 +2868,24 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> @@ -2699,6 +2957,24 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> @@ -2726,6 +3002,9 @@ To validate your cluster.conf against this schema, run: <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> </optional> <optional> + <attribute name="hidden_page" rha:description="Name of hidden page" /> + </optional> + <optional> <attribute name="verbose" rha:description="Verbose mode" /> </optional> <optional> @@ -2740,6 +3019,12 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> @@ -2799,8 +3084,120 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> +  +  +  + +  + <group> + <optional> + <attribute name="option"/>  + </optional> + <optional> + <attribute name="action" rha:description="Fencing Action" /> + </optional> + <optional> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + </optional> + <optional> + <attribute name="login" rha:description="Login Name" /> + </optional> + <optional> + <attribute name="passwd" rha:description="Login password or passphrase" /> + </optional> + <optional> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> + </optional> + <optional> + <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> + </optional> + <optional> + <attribute name="snmp_version" rha:description="Specifies SNMP version to use (1,2c,3)" /> + </optional> + <optional> + <attribute name="community" rha:description="Set the community string" /> + </optional> + <optional> + <attribute name="snmp_auth_prot" rha:description="Set authentication protocol (MD5|SHA)" /> + </optional> + <optional> + <attribute name="snmp_sec_level" rha:description="Set security level (noAuthNoPriv|authNoPriv|authPriv)" /> + </optional> + <optional> + <attribute name="snmp_priv_prot" rha:description="Set privacy protocol (DES|AES)" /> + </optional> + <optional> + <attribute name="snmp_priv_passwd" rha:description="Set privacy protocol password" /> + </optional> + <optional> + <attribute name="snmp_priv_passwd_script" rha:description="Script to run to retrieve privacy password" /> + </optional> + <optional> + <attribute name="udpport" rha:description="UDP/TCP port to use for connection with device" /> + </optional> + <optional> + <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" /> + </optional> + <optional> + <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" /> + </optional> + <optional> + <attribute name="verbose" rha:description="Verbose mode" /> + </optional> + <optional> + <attribute name="debug" rha:description="Write debug information to given file" /> + </optional> + <optional> + <attribute name="version" rha:description="Display version information and exit" /> + </optional> + <optional> + <attribute name="help" rha:description="Display help and exit" /> + </optional> + <optional> + <attribute name="separator" rha:description="Separator for CSV created by operation list" /> + </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> + </group> + +  +   <group> @@ -2826,7 +3223,7 @@ To validate your cluster.conf against this schema, run: <attribute name="login" rha:description="Username/Login (if required) to control power on IPMI device" /> </optional> <optional> - <attribute name="action" rha:description="Operation to perform. Valid operations: on, off, reboot, status, list, monitor or metadata" /> + <attribute name="action" rha:description="Operation to perform. Valid operations: on, off, reboot, status, list, diag, monitor or metadata" /> </optional> <optional> <attribute name="timeout" rha:description="Timeout (sec) for IPMI operation" /> @@ -2838,6 +3235,12 @@ To validate your cluster.conf against this schema, run: <attribute name="method" rha:description="Method to fence (onoff or cycle)" /> </optional> <optional> + <attribute name="power_wait" rha:description="Wait X seconds after on/off operation" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> + <optional> <attribute name="verbose" rha:description="Verbose mode" /> </optional> </group> @@ -2870,6 +3273,9 @@ To validate your cluster.conf against this schema, run: <attribute name="secure" rha:description="SSH connection" /> </optional> <optional> + <attribute name="identity_file" rha:description="Identity file for ssh" /> + </optional> + <optional> <attribute name="ipport" rha:description="TCP port to use for connection with device" /> </optional> <optional> @@ -2884,6 +3290,92 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="help" rha:description="Display help and exit" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> + </group> + + +  + <group> + <optional> + <attribute name="option"/>  + </optional> + <optional> + <attribute name="action" rha:description="Fencing Action" /> + </optional> + <optional> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + </optional> + <optional> + <attribute name="login" rha:description="Login Name" /> + </optional> + <optional> + <attribute name="passwd" rha:description="Login password or passphrase" /> + </optional> + <optional> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> + </optional> + <optional> + <attribute name="ssl" rha:description="SSL connection" /> + </optional> + <optional> + <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" /> + </optional> + <optional> + <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" /> + </optional> + <optional> + <attribute name="ipport" rha:description="TCP port to use for connection with device" /> + </optional> + <optional> + <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> + </optional> + <optional> + <attribute name="verbose" rha:description="Verbose mode" /> + </optional> + <optional> + <attribute name="debug" rha:description="Write debug information to given file" /> + </optional> + <optional> + <attribute name="version" rha:description="Display version information and exit" /> + </optional> + <optional> + <attribute name="help" rha:description="Display help and exit" /> + </optional> + <optional> + <attribute name="separator" rha:description="Separator for CSV created by operation list" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> @@ -2940,8 +3432,28 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> +  +   <group> @@ -2970,6 +3482,9 @@ To validate your cluster.conf against this schema, run: <attribute name="secure" rha:description="SSH connection" /> </optional> <optional> + <attribute name="identity_file" rha:description="Identity file for ssh" /> + </optional> + <optional> <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> </optional> <optional> @@ -2996,8 +3511,27 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> +   <group> @@ -3026,6 +3560,9 @@ To validate your cluster.conf against this schema, run: <attribute name="secure" rha:description="SSH connection" /> </optional> <optional> + <attribute name="identity_file" rha:description="Identity file for ssh" /> + </optional> + <optional> <attribute name="drac_version" rha:description="Force DRAC version to use" /> </optional> <optional> @@ -3055,8 +3592,55 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> +  +  + +  + <group> + <optional> + <attribute name="option"/>  + </optional> + <optional> + <attribute name="aptpl" rha:description="Use APTPL flag for registrations" /> + </optional> + <optional> + <attribute name="devices" rha:description="List of devices to be used for fencing action" /> + </optional> + <optional> + <attribute name="logfile" rha:description="File to write error/debug messages" /> + </optional> + <optional> + <attribute name="key" rha:description="Key value to be used for fencing action" /> + </optional> + <optional> + <attribute name="action" rha:description="Fencing action" /> + </optional> + <optional> + <attribute name="nodename" rha:description="Name of node" /> + </optional> + </group> + +   <group> @@ -3082,6 +3666,9 @@ To validate your cluster.conf against this schema, run: <attribute name="secure" rha:description="SSH connection" /> </optional> <optional> + <attribute name="identity_file" rha:description="Identity file for ssh" /> + </optional> + <optional> <attribute name="cmd_prompt" rha:description="Force command prompt" /> </optional> <optional> @@ -3108,6 +3695,24 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> @@ -3138,6 +3743,9 @@ To validate your cluster.conf against this schema, run: <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> </optional> <optional> + <attribute name="identity_file" rha:description="Identity file for ssh" /> + </optional> + <optional> <attribute name="switch" rha:description="Physical switch number on device" /> </optional> <optional> @@ -3164,6 +3772,24 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> @@ -3191,6 +3817,9 @@ To validate your cluster.conf against this schema, run: <attribute name="secure" rha:description="SSH connection" /> </optional> <optional> + <attribute name="identity_file" rha:description="Identity file for ssh" /> + </optional> + <optional> <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" /> </optional> <optional> @@ -3211,10 +3840,28 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="help" rha:description="Display help and exit" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> -  +  <group> <optional> <attribute name="option"/>  @@ -3235,55 +3882,53 @@ To validate your cluster.conf against this schema, run: <attribute name="passwd_script" rha:description="Script to retrieve password" /> </optional> <optional> - <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> - </optional> - <optional> - <attribute name="snmp_version" rha:description="Specifies SNMP version to use (1,2c,3)" /> + <attribute name="ssl" rha:description="SSL connection" /> </optional> <optional> - <attribute name="community" rha:description="Set the community string" /> + <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" /> </optional> <optional> - <attribute name="snmp_auth_prot" rha:description="Set authentication protocol (MD5|SHA)" /> + <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" /> </optional> <optional> - <attribute name="snmp_sec_level" rha:description="Set security level (noAuthNoPriv|authNoPriv|authPriv)" /> + <attribute name="ipport" rha:description="TCP port to use for connection with device" /> </optional> <optional> - <attribute name="snmp_priv_prot" rha:description="Set privacy protocol (DES|AES)" /> + <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> </optional> <optional> - <attribute name="snmp_priv_passwd" rha:description="Set privacy protocol password" /> + <attribute name="verbose" rha:description="Verbose mode" /> </optional> <optional> - <attribute name="snmp_priv_passwd_script" rha:description="Script to run to retrieve privacy password" /> + <attribute name="debug" rha:description="Write debug information to given file" /> </optional> <optional> - <attribute name="udpport" rha:description="UDP/TCP port to use for connection with device" /> + <attribute name="version" rha:description="Display version information and exit" /> </optional> <optional> - <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" /> + <attribute name="help" rha:description="Display help and exit" /> </optional> <optional> - <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" /> + <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> <optional> - <attribute name="verbose" rha:description="Verbose mode" /> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> </optional> <optional> - <attribute name="debug" rha:description="Write debug information to given file" /> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> </optional> <optional> - <attribute name="version" rha:description="Display version information and exit" /> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> </optional> <optional> - <attribute name="help" rha:description="Display help and exit" /> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> </optional> <optional> - <attribute name="separator" rha:description="Separator for CSV created by operation list" /> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> </optional> </group> +   <group> @@ -3329,8 +3974,27 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> +   <group> @@ -3400,6 +4064,24 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> @@ -3450,6 +4132,24 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="help" rha:description="Display help and exit" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group> @@ -3521,6 +4221,24 @@ To validate your cluster.conf against this schema, run: <optional> <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> + <optional> + <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" /> + </optional> + <optional> + <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" /> + </optional> + <optional> + <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" /> + </optional> + <optional> + <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" /> + </optional> + <optional> + <attribute name="retry_on" rha:description="Count of attempts to retry power on" /> + </optional> + <optional> + <attribute name="delay" rha:description="Wait X seconds before fencing is started" /> + </optional> </group>

1 0

fence-agents: master - Fix build for distributions that don't use bash as default shell
by Fabio M. Di Nitto 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 554f73026756db98249997f03a57dd2f6cb9c743 Parent: 39e735e3091706af66ab7bd56135eee441878d51 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Thu Feb 3 21:47:15 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Thu Feb 3 21:47:15 2011 +0100 Fix build for distributions that don't use bash as default shell Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- make/fencebuild.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/make/fencebuild.mk b/make/fencebuild.mk index c53d226..5da3128 100644 --- a/make/fencebuild.mk +++ b/make/fencebuild.mk @@ -1,5 +1,5 @@ $(TARGET): - sh $(top_srcdir)/scripts/fenceparse \ + bash $(top_srcdir)/scripts/fenceparse \ $(top_srcdir)/make/copyright.cf REDHAT_COPYRIGHT \ $(VERSION) \ $(abs_srcdir) $@ | \

1 0

cluster: RHEL6 - build: allow dbus notification code to be disabled
by Fabio M. Di Nitto 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=35… Commit: 3505bc008d71100acf8b11bcfc494873904957ef Parent: c37913ef41d4284da754a7044f72f4419d4f6b1c Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Wed Feb 2 10:34:58 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Thu Feb 3 21:27:55 2011 +0100 build: allow dbus notification code to be disabled default is to build with dbus support Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- configure | 7 +++++++ make/defines.mk.input | 1 + rgmanager/src/daemons/Makefile | 6 +++++- 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/configure b/configure index cde3be6..2644fa7 100755 --- a/configure +++ b/configure @@ -88,6 +88,7 @@ my %options = ( enable_legacy_code => \$enable_legacy_code, enable_contrib => \$enable_contrib, enable_pacemaker => \$enable_pacemaker, + disable_dbus => \$disable_dbus, somajor => \$somajor, sominor => \$sominor, release_version => \$release_version, @@ -179,6 +180,7 @@ my $err = &GetOptions (\%options, 'enable_legacy_code', 'enable_contrib', 'enable_pacemaker', + 'disable_dbus', 'without_common', 'without_config', 'without_cman', @@ -274,6 +276,7 @@ if ($help || !$err) { print "--enable_contrib\tEnable build of community contributed code/tools. (Default: no)\n"; print "--enable_legacy_code\tEnable build of old/obsolete/unsupported code/tools. (Default: no)\n"; print "--enable_pacemaker\tEnable building of Pacemaker-specific pieces\n"; + print "--disable_dbus\tDisable built-in support for dbus notifications. (Default: no)\n"; print "--without_common\tDisable common building (Default: enabled)\n"; print "--without_config\tDisable config building (Default: enabled)\n"; print "--without_cman\tDisable cman building (Default: enabled)\n"; @@ -620,6 +623,9 @@ if (!$enable_legacy_code) { if (!$enable_pacemaker) { $enable_pacemaker=""; } +if (!$disable_dbus) { + $disable_dbus=""; +} if (!$without_common) { $without_common=""; } @@ -775,6 +781,7 @@ while (<IFILE>) { $_ =~ s/\@ENABLE_LEGACY_CODE\@/$enable_legacy_code/; $_ =~ s/\@ENABLE_CONTRIB\@/$enable_contrib/; $_ =~ s/\@ENABLE_PACEMAKER\@/$enable_pacemaker/; + $_ =~ s/\@DISABLE_DBUS\@/$disable_dbus/; $_ =~ s/\@DISABLE_COMMON\@/$without_common/; $_ =~ s/\@DISABLE_CONFIG\@/$without_config/; $_ =~ s/\@DISABLE_CMAN\@/$without_cman/; diff --git a/make/defines.mk.input b/make/defines.mk.input index 2834872..ca6a4d7 100644 --- a/make/defines.mk.input +++ b/make/defines.mk.input @@ -74,6 +74,7 @@ legacy_code ?= @ENABLE_LEGACY_CODE@ contrib_code ?= @ENABLE_CONTRIB@ enable_pacemaker ?= @ENABLE_PACEMAKER@ enable_gfs-kernel/src/gfs ?= @ENABLE_GFSKERNEL@ +disable_dbus ?= @DISABLE_DBUS@ without_common ?= @DISABLE_COMMON@ without_config ?= @DISABLE_CONFIG@ without_cman ?= @DISABLE_CMAN@ diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile index 9619990..7218c53 100644 --- a/rgmanager/src/daemons/Makefile +++ b/rgmanager/src/daemons/Makefile @@ -47,7 +47,6 @@ CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${logtincdir} CFLAGS += `xml2-config --cflags` -I${slangincdir} CFLAGS += -I$(S)/../../include CFLAGS += -I${incdir} -CFLAGS += `pkg-config --cflags dbus-1` NOCCS_CFLAGS += -DNO_CCS @@ -61,7 +60,12 @@ DLM_LDFLAGS += -L${dlmlibdir} -ldlm XML2_LDFLAGS += `xml2-config --libs` SLANG_LDFLAGS += -L${slanglibdir} -lslang EXTRA_LDFLAGS += -lpthread + +# dbus support for notifications +ifndef disable_dbus +CFLAGS += -DDBUS `pkg-config --cflags dbus-1` DBUS_LDFLAGS += `pkg-config --libs dbus-1` +endif LDDEPS += ../clulib/libclulib.a

1 0

cluster: RHEL6 - rgmanager: Match fenced's option to disable DBus
by Lon Hohberger 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c3… Commit: c37913ef41d4284da754a7044f72f4419d4f6b1c Parent: 6f7651001c3ab013f0d8bd68d0ff08978817c6dd Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Feb 2 14:21:29 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Feb 3 15:12:00 2011 -0500 rgmanager: Match fenced's option to disable DBus Resolves: rhbz#657756 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/man/rgmanager.8 | 2 +- rgmanager/src/daemons/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rgmanager/man/rgmanager.8 b/rgmanager/man/rgmanager.8 index a4e2c73..2b018d2 100644 --- a/rgmanager/man/rgmanager.8 +++ b/rgmanager/man/rgmanager.8 @@ -371,7 +371,7 @@ will leave the virtual machine running. Run in the foreground (do not fork). .IP \-d Enable debug-level logging. -.IP \-D +.IP \-q Disable DBus signals which are normally sent when services change state. .IP \-w Disable internal process monitoring (for debugging). diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index dad379a..02cd2dc 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -951,7 +951,7 @@ main(int argc, char **argv) pthread_t th; cman_handle_t clu = NULL; - while ((rv = getopt(argc, argv, "wfdND")) != EOF) { + while ((rv = getopt(argc, argv, "wfdNq")) != EOF) { switch (rv) { case 'w': wd = 0; @@ -965,7 +965,7 @@ main(int argc, char **argv) case 'f': foreground = 1; break; - case 'D': + case 'q': rgm_dbus_notify = 0; break; default:

1 0

cluster: RHEL6 - rgmanager: minor dbus cleanups
by Lon Hohberger 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6f… Commit: 6f7651001c3ab013f0d8bd68d0ff08978817c6dd Parent: cb93b21cd08d6c6ed206d1cc026c8f66f67bec93 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Feb 2 14:15:32 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Feb 3 15:11:59 2011 -0500 rgmanager: minor dbus cleanups Resolves: rhbz#657756 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/src/daemons/update-dbus.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c index c9bbf40..f465d1d 100644 --- a/rgmanager/src/daemons/update-dbus.c +++ b/rgmanager/src/daemons/update-dbus.c @@ -47,7 +47,7 @@ rgm_dbus_init(void) dbc = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err); if (!dbc) { - logt_print(LOG_ERR, + logt_print(LOG_DEBUG, "DBus Failed to initialize: dbus_bus_get: %s\n", err.message); dbus_error_free(&err); @@ -72,7 +72,7 @@ rgm_dbus_init(void) #ifdef DBUS static int -_rgm_dbus_release(int err) +_rgm_dbus_release(void) { pthread_t t; @@ -83,7 +83,7 @@ _rgm_dbus_release(int err) * to wake up, so just have it poll XXX */ /* if the thread left because the dbus connection died, - this block is avoided since the thread exits */ + this block is avoided */ if (th) { t = th; th = 0; @@ -94,15 +94,13 @@ _rgm_dbus_release(int err) dbus_connection_unref(db); db = NULL; - if (err) - logt_print(LOG_ERR, "DBus Connection Lost\n"); - else - logt_print(LOG_DEBUG, "DBus Released\n"); + logt_print(LOG_DEBUG, "DBus Released\n"); return 0; } #endif +/* Clean shutdown (e.g. when exiting */ int rgm_dbus_release(void) #ifdef DBUS @@ -110,7 +108,7 @@ rgm_dbus_release(void) int ret; pthread_mutex_lock(&mu); - ret = _rgm_dbus_release(0); + ret = _rgm_dbus_release(); pthread_mutex_unlock(&mu); return ret; } @@ -122,6 +120,9 @@ rgm_dbus_release(void) #ifdef DBUS +/* Auto-flush thread. Since sending only guarantees queueing, + * we need this thread to push things out over dbus in the + * background */ static void * _dbus_auto_flush(void *arg) { @@ -154,8 +155,15 @@ _rgm_dbus_notify(const char *svcname, pthread_mutex_lock(&mu); + /* Check to ensure the connection is still valid. If it + * isn't, clean up and shut down the dbus connection. + * + * The main rgmanager thread will periodically try to + * reinitialize the dbus notification subsystem unless + * the administrator ran rgmanager with the -D command + * line option. + */ if (dbus_connection_get_is_connected(db) != TRUE) { - _rgm_dbus_release(1); goto out_unlock; } @@ -192,6 +200,9 @@ out_free: } +/* + * view-formation callback function + */ int32_t rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) { @@ -242,7 +253,7 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) if (ret < 0) { logt_print(LOG_ERR, "Error sending update for %s; " - "notifications disabled\n", key); + "DBus notifications disabled\n", key); rgm_dbus_release(); }

1 0

cluster: RHEL6 - rgmanager: Retry dbus if we get disconnected
by Lon Hohberger 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=cb… Commit: cb93b21cd08d6c6ed206d1cc026c8f66f67bec93 Parent: 7a2fb0827053eeba08bd254c46cc01506a6ed492 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Feb 2 13:48:10 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Feb 3 15:11:59 2011 -0500 rgmanager: Retry dbus if we get disconnected Resolves: rhbz#657756 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/src/daemons/main.c | 9 ++++- rgmanager/src/daemons/update-dbus.c | 60 ++++++++++++++++++++++++----------- 2 files changed, 48 insertions(+), 21 deletions(-) diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 1929072..dad379a 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -684,6 +684,8 @@ event_loop(msgctx_t *localctx, msgctx_t *clusterctx) dump_internal_state("/var/lib/cluster/rgmanager-dump"); } + rgm_dbus_init(); + while (running && (tv.tv_sec || tv.tv_usec)) { FD_ZERO(&rfds); max = -1; @@ -1035,8 +1037,11 @@ main(int argc, char **argv) configure_rgmanager(-1, debug, &cluster_timeout); logt_print(LOG_NOTICE, "Resource Group Manager Starting\n"); - if (rgm_dbus_notify && rgm_dbus_init() != 0) - logt_print(LOG_NOTICE, "Failed to initialize DBus\n"); + if (rgm_dbus_notify && rgm_dbus_init() != 0) { + rgm_dbus_notify = 0; + logt_print(LOG_NOTICE, "Failed to initialize DBus; " + "notifications disabled\n"); + } if (init_resource_groups(0, do_init) != 0) { logt_print(LOG_CRIT, "#8: Couldn't initialize services\n"); diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c index a3fb5e7..c9bbf40 100644 --- a/rgmanager/src/daemons/update-dbus.c +++ b/rgmanager/src/daemons/update-dbus.c @@ -21,8 +21,6 @@ static DBusConnection *db = NULL; static pthread_mutex_t mu = PTHREAD_MUTEX_INITIALIZER; static pthread_t th = 0; -static char _err[512]; -static int err_set = 0; #endif /* Set this to the desired value prior to calling rgm_dbus_init() */ @@ -39,20 +37,29 @@ rgm_dbus_init(void) if (!rgm_dbus_notify) return 0; + pthread_mutex_lock(&mu); + if (db) { + pthread_mutex_unlock(&mu); + return 0; + } + dbus_error_init(&err); - dbc = dbus_bus_get(DBUS_BUS_SYSTEM, &err); + dbc = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err); if (!dbc) { - snprintf(_err, sizeof(_err), - "dbus_bus_get: %s", err.message); - err_set = 1; + logt_print(LOG_ERR, + "DBus Failed to initialize: dbus_bus_get: %s\n", + err.message); dbus_error_free(&err); + pthread_mutex_unlock(&mu); return -1; } dbus_connection_set_exit_on_disconnect(dbc, FALSE); db = dbc; + pthread_mutex_unlock(&mu); + logt_print(LOG_DEBUG, "DBus Notifications Initialized\n"); return 0; } #else @@ -63,9 +70,9 @@ rgm_dbus_init(void) #endif -int -rgm_dbus_release(void) #ifdef DBUS +static int +_rgm_dbus_release(int err) { pthread_t t; @@ -74,17 +81,39 @@ rgm_dbus_release(void) /* tell thread to exit - not sure how to tell dbus * to wake up, so just have it poll XXX */ + + /* if the thread left because the dbus connection died, + this block is avoided since the thread exits */ if (th) { t = th; th = 0; pthread_join(t, NULL); } + dbus_connection_close(db); dbus_connection_unref(db); db = NULL; + if (err) + logt_print(LOG_ERR, "DBus Connection Lost\n"); + else + logt_print(LOG_DEBUG, "DBus Released\n"); return 0; } +#endif + + +int +rgm_dbus_release(void) +#ifdef DBUS +{ + int ret; + + pthread_mutex_lock(&mu); + ret = _rgm_dbus_release(0); + pthread_mutex_unlock(&mu); + return ret; +} #else { return 0; @@ -98,14 +127,12 @@ _dbus_auto_flush(void *arg) { /* DBus connection functions are thread safe */ dbus_connection_ref(db); - while (dbus_connection_read_write(db, 500)) { if (!th) break; } dbus_connection_unref(db); - th = 0; return NULL; } @@ -121,11 +148,6 @@ _rgm_dbus_notify(const char *svcname, DBusMessage *msg = NULL; int ret = -1; - if (err_set) { - fprintf(stderr, "%s\n", _err); - err_set = 0; - } - if (!db) { goto out_free; } @@ -133,9 +155,7 @@ _rgm_dbus_notify(const char *svcname, pthread_mutex_lock(&mu); if (dbus_connection_get_is_connected(db) != TRUE) { - err_set = 1; - snprintf(_err, sizeof(_err), "DBus connection lost"); - rgm_dbus_release(); + _rgm_dbus_release(1); goto out_unlock; } @@ -184,6 +204,8 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) if (!rgm_dbus_notify) goto out_free; + if (!db) + goto out_free; if (view == 1) goto out_free; if (size != (sizeof(*st))) @@ -209,6 +231,7 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) if (!last) last = "(none)"; + flags[0] = 0; rg_flags_str(flags, sizeof(flags), st->rs_flags, (char *)" "); if (flags[0] == 0) snprintf(flags, sizeof(flags), "(none)"); @@ -221,7 +244,6 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) logt_print(LOG_ERR, "Error sending update for %s; " "notifications disabled\n", key); rgm_dbus_release(); - rgm_dbus_notify = 0; } out_free:

1 0

cluster: RHEL6 - rgmanager: Clean up dbus notifications
by Lon Hohberger 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7a… Commit: 7a2fb0827053eeba08bd254c46cc01506a6ed492 Parent: f1cc6c0c9df06f393717c48c38b8140a897db1e2 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Feb 2 09:28:22 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Feb 3 15:11:59 2011 -0500 rgmanager: Clean up dbus notifications Resolves: rhbz#657756 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/include/rg_dbus.h | 20 ++++-- rgmanager/src/daemons/Makefile | 2 +- rgmanager/src/daemons/main.c | 82 +-------------------------- rgmanager/src/daemons/update-dbus.c | 105 ++++++++++++++++++++++++++++++++--- 4 files changed, 115 insertions(+), 94 deletions(-) diff --git a/rgmanager/include/rg_dbus.h b/rgmanager/include/rg_dbus.h index 6454f29..3ef5ae1 100644 --- a/rgmanager/include/rg_dbus.h +++ b/rgmanager/include/rg_dbus.h @@ -1,14 +1,20 @@ -#ifdef DBUS #ifndef _RGM_DBUS_H #define _RGM_DBUS_H int rgm_dbus_init(void); int rgm_dbus_release(void); -int rgm_dbus_notify(const char *svcname, - const char *svcstatus, - const char *svcflags, - const char *svcowner, - const char *svclast); +extern int rgm_dbus_notify; -#endif +#ifdef DBUS + +#define RGM_DBUS_DEFAULT 1 +#define RGM_DBUS_UPDATE (rgm_dbus_notify?rgm_dbus_update:0) +int32_t rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size); + +#else + +#define RGM_DBUS_DEFAULT 0 +#define RGM_DBUS_UPDATE NULL + +#endif /* DBUS */ #endif diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile index 4dbbe5a..9619990 100644 --- a/rgmanager/src/daemons/Makefile +++ b/rgmanager/src/daemons/Makefile @@ -41,7 +41,7 @@ OBJS2= test-noccs.o \ rg_locks-noccs.o \ event_config-noccs.o -CFLAGS += -DDBUS -DSHAREDIR=\"${sharedir}\" -D_GNU_SOURCE +CFLAGS += -DSHAREDIR=\"${sharedir}\" -D_GNU_SOURCE CFLAGS += -fPIC CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${logtincdir} CFLAGS += `xml2-config --cflags` -I${slangincdir} diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 303e0c0..1929072 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -43,9 +43,6 @@ static int signalled = 0; static uint8_t ALIGNED port = RG_PORT; static char *rgmanager_lsname = (char *)"rgmanager"; /* XXX default */ static int status_poll_interval = DEFAULT_CHECK_INTERVAL; -#ifdef DBUS -static int state_notify = 1; -#endif static void segfault(int __attribute__ ((unused)) sig) @@ -938,68 +935,6 @@ shutdown_thread(void __attribute__ ((unused)) *arg) } -#ifdef DBUS -static int32_t -svc_update(char *key, uint64_t view, void *data, uint32_t size) -{ - char flags[64]; - rg_state_t *st; - cluster_member_list_t *m; - const char *owner; - const char *last; - int ret = 0; - - if (!state_notify) - goto out_free; - if (view == 1) - goto out_free; - if (size != (sizeof(*st))) - goto out_free; - - st = (rg_state_t *)data; - swab_rg_state_t(st); - - /* Don't send transitional states */ - if (st->rs_state == RG_STATE_STARTING || - st->rs_state == RG_STATE_STOPPING) - goto out_free; - - m = member_list(); - if (!m) - goto out_free; - - owner = memb_id_to_name(m, st->rs_owner); - last = memb_id_to_name(m, st->rs_last_owner); - - if (!owner) - owner = "(none)"; - if (!last) - last = "(none)"; - - rg_flags_str(flags, sizeof(flags), st->rs_flags, (char *)" "); - if (flags[0] == 0) - snprintf(flags, sizeof(flags), "(none)"); - - ret = rgm_dbus_notify(st->rs_name, - rg_state_str(st->rs_state), - (char *)flags, owner, last); - - if (ret < 0) { - logt_print(LOG_ERR, "Error sending update for %s; " - "notifications disabled\n", key); - rgm_dbus_release(); - state_notify = 0; - } - -out_free: - if (m) - free_member_list(m); - free(data); - return 0; -} -#endif - - #ifdef WRAP_THREADS void dump_thread_states(FILE *); #endif @@ -1029,9 +964,7 @@ main(int argc, char **argv) foreground = 1; break; case 'D': -#ifdef DBUS - state_notify = 0; -#endif + rgm_dbus_notify = 0; break; default: return 1; @@ -1102,10 +1035,8 @@ main(int argc, char **argv) configure_rgmanager(-1, debug, &cluster_timeout); logt_print(LOG_NOTICE, "Resource Group Manager Starting\n"); -#ifdef DBUS - if (state_notify && rgm_dbus_init() != 0) + if (rgm_dbus_notify && rgm_dbus_init() != 0) logt_print(LOG_NOTICE, "Failed to initialize DBus\n"); -#endif if (init_resource_groups(0, do_init) != 0) { logt_print(LOG_CRIT, "#8: Couldn't initialize services\n"); @@ -1149,11 +1080,8 @@ main(int argc, char **argv) ds_key_init("rg_lockdown", 32, 10); #else - if (vf_init(me.cn_nodeid, port, NULL, -#ifdef DBUS /* Ugly */ - state_notify ? svc_update : -#endif - NULL, cluster_timeout) != 0) { + if (vf_init(me.cn_nodeid, port, NULL, RGM_DBUS_UPDATE, + cluster_timeout) != 0) { logt_print(LOG_CRIT, "#11: Couldn't set up VF listen socket\n"); goto out_ls; } @@ -1185,9 +1113,7 @@ out_ls: clu_lock_finished(rgmanager_lsname); out: -#ifdef DBUS rgm_dbus_release(); -#endif logt_print(LOG_NOTICE, "Shutdown complete, exiting\n"); cman_finish(clu); diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c index 9e3078d..a3fb5e7 100644 --- a/rgmanager/src/daemons/update-dbus.c +++ b/rgmanager/src/daemons/update-dbus.c @@ -1,11 +1,18 @@ /* DBus notifications */ +#include <stdint.h> +#include <rg_dbus.h> +#include <errno.h> + +#ifdef DBUS + #include <stdio.h> #include <stdint.h> #include <resgroup.h> #include <poll.h> #include <dbus/dbus.h> -#include <rg_dbus.h> -#ifdef DBUS +#include <liblogthread.h> +#include <members.h> + #define DBUS_RGM_NAME "com.redhat.cluster.rgmanager" #define DBUS_RGM_IFACE "com.redhat.cluster.rgmanager" @@ -16,13 +23,22 @@ static pthread_mutex_t mu = PTHREAD_MUTEX_INITIALIZER; static pthread_t th = 0; static char _err[512]; static int err_set = 0; +#endif + +/* Set this to the desired value prior to calling rgm_dbus_init() */ +int rgm_dbus_notify = RGM_DBUS_DEFAULT; + int rgm_dbus_init(void) +#ifdef DBUS { DBusConnection *dbc = NULL; DBusError err; + if (!rgm_dbus_notify) + return 0; + dbus_error_init(&err); dbc = dbus_bus_get(DBUS_BUS_SYSTEM, &err); @@ -39,10 +55,17 @@ rgm_dbus_init(void) db = dbc; return 0; } +#else +{ + errno = ENOSYS; + return -1; +} +#endif int rgm_dbus_release(void) +#ifdef DBUS { pthread_t t; @@ -62,8 +85,14 @@ rgm_dbus_release(void) return 0; } +#else +{ + return 0; +} +#endif +#ifdef DBUS static void * _dbus_auto_flush(void *arg) { @@ -82,12 +111,12 @@ _dbus_auto_flush(void *arg) } -int -rgm_dbus_notify(const char *svcname, - const char *svcstatus, - const char *svcflags, - const char *svcowner, - const char *svclast) +static int +_rgm_dbus_notify(const char *svcname, + const char *svcstatus, + const char *svcflags, + const char *svcowner, + const char *svclast) { DBusMessage *msg = NULL; int ret = -1; @@ -141,4 +170,64 @@ out_unlock: out_free: return ret; } + + +int32_t +rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) +{ + char flags[64]; + rg_state_t *st; + cluster_member_list_t *m = NULL; + const char *owner; + const char *last; + int ret = 0; + + if (!rgm_dbus_notify) + goto out_free; + if (view == 1) + goto out_free; + if (size != (sizeof(*st))) + goto out_free; + + st = (rg_state_t *)data; + swab_rg_state_t(st); + + /* Don't send transitional states */ + if (st->rs_state == RG_STATE_STARTING || + st->rs_state == RG_STATE_STOPPING) + goto out_free; + + m = member_list(); + if (!m) + goto out_free; + + owner = memb_id_to_name(m, st->rs_owner); + last = memb_id_to_name(m, st->rs_last_owner); + + if (!owner) + owner = "(none)"; + if (!last) + last = "(none)"; + + rg_flags_str(flags, sizeof(flags), st->rs_flags, (char *)" "); + if (flags[0] == 0) + snprintf(flags, sizeof(flags), "(none)"); + + ret = _rgm_dbus_notify(st->rs_name, + rg_state_str(st->rs_state), + (char *)flags, owner, last); + + if (ret < 0) { + logt_print(LOG_ERR, "Error sending update for %s; " + "notifications disabled\n", key); + rgm_dbus_release(); + rgm_dbus_notify = 0; + } + +out_free: + if (m) + free_member_list(m); + free(data); + return 0; +} #endif

1 0

cluster: RHEL6 - rgmanager: DBus notifications for service state changes
by Lon Hohberger 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f1… Commit: f1cc6c0c9df06f393717c48c38b8140a897db1e2 Parent: 0f8d260207c686dd683da11b04868c483038a9ef Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Tue Feb 1 14:20:34 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Feb 3 15:11:59 2011 -0500 rgmanager: DBus notifications for service state changes Resolves: rhbz#657756 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/include/rg_dbus.h | 14 ++++ rgmanager/man/rgmanager.8 | 2 + rgmanager/src/daemons/Makefile | 7 +- rgmanager/src/daemons/main.c | 88 ++++++++++++++++++++- rgmanager/src/daemons/update-dbus.c | 144 +++++++++++++++++++++++++++++++++++ 5 files changed, 250 insertions(+), 5 deletions(-) diff --git a/rgmanager/include/rg_dbus.h b/rgmanager/include/rg_dbus.h new file mode 100644 index 0000000..6454f29 --- /dev/null +++ b/rgmanager/include/rg_dbus.h @@ -0,0 +1,14 @@ +#ifdef DBUS +#ifndef _RGM_DBUS_H +#define _RGM_DBUS_H + +int rgm_dbus_init(void); +int rgm_dbus_release(void); +int rgm_dbus_notify(const char *svcname, + const char *svcstatus, + const char *svcflags, + const char *svcowner, + const char *svclast); + +#endif +#endif diff --git a/rgmanager/man/rgmanager.8 b/rgmanager/man/rgmanager.8 index 39b2195..a4e2c73 100644 --- a/rgmanager/man/rgmanager.8 +++ b/rgmanager/man/rgmanager.8 @@ -371,6 +371,8 @@ will leave the virtual machine running. Run in the foreground (do not fork). .IP \-d Enable debug-level logging. +.IP \-D +Disable DBus signals which are normally sent when services change state. .IP \-w Disable internal process monitoring (for debugging). .IP \-N diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile index 94e0dbb..4dbbe5a 100644 --- a/rgmanager/src/daemons/Makefile +++ b/rgmanager/src/daemons/Makefile @@ -29,6 +29,7 @@ OBJS1= fo_domain.o \ service_op.o \ slang_event.o \ event_config.o \ + update-dbus.o \ watchdog.o OBJS2= test-noccs.o \ @@ -40,12 +41,13 @@ OBJS2= test-noccs.o \ rg_locks-noccs.o \ event_config-noccs.o -CFLAGS += -DSHAREDIR=\"${sharedir}\" -D_GNU_SOURCE +CFLAGS += -DDBUS -DSHAREDIR=\"${sharedir}\" -D_GNU_SOURCE CFLAGS += -fPIC CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${logtincdir} CFLAGS += `xml2-config --cflags` -I${slangincdir} CFLAGS += -I$(S)/../../include CFLAGS += -I${incdir} +CFLAGS += `pkg-config --cflags dbus-1` NOCCS_CFLAGS += -DNO_CCS @@ -59,6 +61,7 @@ DLM_LDFLAGS += -L${dlmlibdir} -ldlm XML2_LDFLAGS += `xml2-config --libs` SLANG_LDFLAGS += -L${slanglibdir} -lslang EXTRA_LDFLAGS += -lpthread +DBUS_LDFLAGS += `pkg-config --libs dbus-1` LDDEPS += ../clulib/libclulib.a @@ -66,7 +69,7 @@ ${TARGET1}: ${OBJS1} ${LDDEPS} $(CC) -o $@ $^ $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \ $(DLM_LDFLAGS) $(XML2_LDFLAGS) \ $(SLANG_LDFLAGS) $(EXTRA_LDFLAGS) \ - $(LOGSYS_LDFLAGS) $(LD_FLAGS) + $(LOGSYS_LDFLAGS) $(LD_FLAGS) $(DBUS_LDFLAGS) # # Our test program links against the local allocator so that diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 4e34246..303e0c0 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -23,6 +23,7 @@ #include <members.h> #include <daemon_init.h> #include <groups.h> +#include <rg_dbus.h> #ifdef WRAP_THREADS void dump_thread_states(FILE *); @@ -42,7 +43,9 @@ static int signalled = 0; static uint8_t ALIGNED port = RG_PORT; static char *rgmanager_lsname = (char *)"rgmanager"; /* XXX default */ static int status_poll_interval = DEFAULT_CHECK_INTERVAL; - +#ifdef DBUS +static int state_notify = 1; +#endif static void segfault(int __attribute__ ((unused)) sig) @@ -935,6 +938,68 @@ shutdown_thread(void __attribute__ ((unused)) *arg) } +#ifdef DBUS +static int32_t +svc_update(char *key, uint64_t view, void *data, uint32_t size) +{ + char flags[64]; + rg_state_t *st; + cluster_member_list_t *m; + const char *owner; + const char *last; + int ret = 0; + + if (!state_notify) + goto out_free; + if (view == 1) + goto out_free; + if (size != (sizeof(*st))) + goto out_free; + + st = (rg_state_t *)data; + swab_rg_state_t(st); + + /* Don't send transitional states */ + if (st->rs_state == RG_STATE_STARTING || + st->rs_state == RG_STATE_STOPPING) + goto out_free; + + m = member_list(); + if (!m) + goto out_free; + + owner = memb_id_to_name(m, st->rs_owner); + last = memb_id_to_name(m, st->rs_last_owner); + + if (!owner) + owner = "(none)"; + if (!last) + last = "(none)"; + + rg_flags_str(flags, sizeof(flags), st->rs_flags, (char *)" "); + if (flags[0] == 0) + snprintf(flags, sizeof(flags), "(none)"); + + ret = rgm_dbus_notify(st->rs_name, + rg_state_str(st->rs_state), + (char *)flags, owner, last); + + if (ret < 0) { + logt_print(LOG_ERR, "Error sending update for %s; " + "notifications disabled\n", key); + rgm_dbus_release(); + state_notify = 0; + } + +out_free: + if (m) + free_member_list(m); + free(data); + return 0; +} +#endif + + #ifdef WRAP_THREADS void dump_thread_states(FILE *); #endif @@ -949,7 +1014,7 @@ main(int argc, char **argv) pthread_t th; cman_handle_t clu = NULL; - while ((rv = getopt(argc, argv, "wfdN")) != EOF) { + while ((rv = getopt(argc, argv, "wfdND")) != EOF) { switch (rv) { case 'w': wd = 0; @@ -963,6 +1028,11 @@ main(int argc, char **argv) case 'f': foreground = 1; break; + case 'D': +#ifdef DBUS + state_notify = 0; +#endif + break; default: return 1; break; @@ -1032,6 +1102,11 @@ main(int argc, char **argv) configure_rgmanager(-1, debug, &cluster_timeout); logt_print(LOG_NOTICE, "Resource Group Manager Starting\n"); +#ifdef DBUS + if (state_notify && rgm_dbus_init() != 0) + logt_print(LOG_NOTICE, "Failed to initialize DBus\n"); +#endif + if (init_resource_groups(0, do_init) != 0) { logt_print(LOG_CRIT, "#8: Couldn't initialize services\n"); goto out_ls; @@ -1074,7 +1149,11 @@ main(int argc, char **argv) ds_key_init("rg_lockdown", 32, 10); #else - if (vf_init(me.cn_nodeid, port, NULL, NULL, cluster_timeout) != 0) { + if (vf_init(me.cn_nodeid, port, NULL, +#ifdef DBUS /* Ugly */ + state_notify ? svc_update : +#endif + NULL, cluster_timeout) != 0) { logt_print(LOG_CRIT, "#11: Couldn't set up VF listen socket\n"); goto out_ls; } @@ -1106,6 +1185,9 @@ out_ls: clu_lock_finished(rgmanager_lsname); out: +#ifdef DBUS + rgm_dbus_release(); +#endif logt_print(LOG_NOTICE, "Shutdown complete, exiting\n"); cman_finish(clu); diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c new file mode 100644 index 0000000..9e3078d --- /dev/null +++ b/rgmanager/src/daemons/update-dbus.c @@ -0,0 +1,144 @@ +/* DBus notifications */ +#include <stdio.h> +#include <stdint.h> +#include <resgroup.h> +#include <poll.h> +#include <dbus/dbus.h> +#include <rg_dbus.h> +#ifdef DBUS + +#define DBUS_RGM_NAME "com.redhat.cluster.rgmanager" +#define DBUS_RGM_IFACE "com.redhat.cluster.rgmanager" +#define DBUS_RGM_PATH "/com/redhat/cluster/rgmanager" + +static DBusConnection *db = NULL; +static pthread_mutex_t mu = PTHREAD_MUTEX_INITIALIZER; +static pthread_t th = 0; +static char _err[512]; +static int err_set = 0; + +int +rgm_dbus_init(void) +{ + DBusConnection *dbc = NULL; + DBusError err; + + dbus_error_init(&err); + + dbc = dbus_bus_get(DBUS_BUS_SYSTEM, &err); + if (!dbc) { + snprintf(_err, sizeof(_err), + "dbus_bus_get: %s", err.message); + err_set = 1; + dbus_error_free(&err); + return -1; + } + + dbus_connection_set_exit_on_disconnect(dbc, FALSE); + + db = dbc; + return 0; +} + + +int +rgm_dbus_release(void) +{ + pthread_t t; + + if (!db) + return 0; + + /* tell thread to exit - not sure how to tell dbus + * to wake up, so just have it poll XXX */ + if (th) { + t = th; + th = 0; + pthread_join(t, NULL); + } + + dbus_connection_unref(db); + db = NULL; + + return 0; +} + + +static void * +_dbus_auto_flush(void *arg) +{ + /* DBus connection functions are thread safe */ + dbus_connection_ref(db); + + while (dbus_connection_read_write(db, 500)) { + if (!th) + break; + } + + dbus_connection_unref(db); + + th = 0; + return NULL; +} + + +int +rgm_dbus_notify(const char *svcname, + const char *svcstatus, + const char *svcflags, + const char *svcowner, + const char *svclast) +{ + DBusMessage *msg = NULL; + int ret = -1; + + if (err_set) { + fprintf(stderr, "%s\n", _err); + err_set = 0; + } + + if (!db) { + goto out_free; + } + + pthread_mutex_lock(&mu); + + if (dbus_connection_get_is_connected(db) != TRUE) { + err_set = 1; + snprintf(_err, sizeof(_err), "DBus connection lost"); + rgm_dbus_release(); + goto out_unlock; + } + + if (!th) { + /* start auto-flush thread if needed */ + pthread_create(&th, NULL, _dbus_auto_flush, NULL); + } + + if (!(msg = dbus_message_new_signal(DBUS_RGM_PATH, + DBUS_RGM_IFACE, + "ServiceStateChange"))) { + goto out_unlock; + } + + if (!dbus_message_append_args(msg, + DBUS_TYPE_STRING, &svcname, + DBUS_TYPE_STRING, &svcstatus, + DBUS_TYPE_STRING, &svcflags, + DBUS_TYPE_STRING, &svcowner, + DBUS_TYPE_STRING, &svclast, + DBUS_TYPE_INVALID)) { + goto out_unlock; + } + + dbus_connection_send(db, msg, NULL); + ret = 0; + +out_unlock: + pthread_mutex_unlock(&mu); + if (msg) + dbus_message_unref(msg); +out_free: + return ret; +} +#endif

1 0

cluster: STABLE31 - fenced: update fenced man page with -q option
by rohara 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e2… Commit: e2c5e231eb9d6732235a073e2556993891b79e3f Parent: 77ad746968784f1ede7d79f368ffbf01a7cd75cd Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Thu Feb 3 14:06:01 2011 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Thu Feb 3 14:11:44 2011 -0600 fenced: update fenced man page with -q option The new dbus code in fenced can be disabled with the -q command line option. Add -q option to fenced man page. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> Reviewed-by: David Teigland <teigland(a)redhat.com> --- fence/man/fenced.8 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/fence/man/fenced.8 b/fence/man/fenced.8 index c3496fb..64f26e0 100644 --- a/fence/man/fenced.8 +++ b/fence/man/fenced.8 @@ -142,6 +142,9 @@ All nodes are in a clean state to start. Do no startup fencing. .B \-s Skip startup fencing of nodes with no defined fence methods. .TP +.B \-q +Disable dbus signals. +.TP .BI \-j " secs" Post-join fencing delay. Default 6. .TP

1 0

cluster: RHEL6 - fenced: update fenced man page with -q option
by rohara 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0f… Commit: 0f8d260207c686dd683da11b04868c483038a9ef Parent: 4536bfb712dffa40a0e26910a8977babd902743e Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Thu Feb 3 14:06:01 2011 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Thu Feb 3 14:06:01 2011 -0600 fenced: update fenced man page with -q option The new dbus code in fenced can be disabled with the -q command line option. Add -q option to fenced man page. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> Reviewed-by: David Teigland <teigland(a)redhat.com> --- fence/man/fenced.8 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/fence/man/fenced.8 b/fence/man/fenced.8 index c3496fb..64f26e0 100644 --- a/fence/man/fenced.8 +++ b/fence/man/fenced.8 @@ -142,6 +142,9 @@ All nodes are in a clean state to start. Do no startup fencing. .B \-s Skip startup fencing of nodes with no defined fence methods. .TP +.B \-q +Disable dbus signals. +.TP .BI \-j " secs" Post-join fencing delay. Default 6. .TP

1 0

cluster: STABLE31 - fenced: send dbus signal when node is fenced
by rohara 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=77… Commit: 77ad746968784f1ede7d79f368ffbf01a7cd75cd Parent: 5d044c3b62d51c688257faecd69bbf3112d7728f Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Wed Feb 2 18:15:32 2011 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Thu Feb 3 13:57:14 2011 -0600 fenced: send dbus signal when node is fenced This patch adds the ability to send a dbus signal when a node is fenced. This code is can reestablish a connection with dbus if necessary. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> Reviewed-by: David Teigland <teigland(a)redhat.com> --- fence/fenced/Makefile | 8 ++++- fence/fenced/config.c | 2 + fence/fenced/config.h | 3 ++ fence/fenced/dbus.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ fence/fenced/fd.h | 6 +++ fence/fenced/main.c | 14 +++++++- fence/fenced/recover.c | 4 ++ 7 files changed, 121 insertions(+), 3 deletions(-) diff --git a/fence/fenced/Makefile b/fence/fenced/Makefile index 7455544..902c299 100644 --- a/fence/fenced/Makefile +++ b/fence/fenced/Makefile @@ -16,7 +16,8 @@ OBJS= config.o \ main.o \ member_cman.o \ recover.o \ - logging.o + logging.o \ + dbus.o CFLAGS += -D_FILE_OFFSET_BITS=64 CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${logtincdir} -I${corosyncincdir} @@ -30,6 +31,11 @@ LDFLAGS += -L${corosynclibdir} -lcpg -lpthread LDFLAGS += -L../../group/lib -l group LDFLAGS += -L${libdir} +ifndef disable_dbus +CFLAGS += $(shell pkg-config --cflags dbus-1) -DDBUS +LDFLAGS += $(shell pkg-config --libs dbus-1) +endif + LDDEPS += ../../group/lib/libgroup.a ${TARGET}: ${OBJS} ${LDDEPS} diff --git a/fence/fenced/config.c b/fence/fenced/config.c index 37f98f9..0517c2a 100644 --- a/fence/fenced/config.c +++ b/fence/fenced/config.c @@ -9,6 +9,7 @@ int ccs_handle; int optd_groupd_compat; int optd_debug_logfile; int optd_clean_start; +int optd_disable_dbus; int optd_skip_undefined; int optd_post_join_delay; int optd_post_fail_delay; @@ -20,6 +21,7 @@ int optd_override_path; int cfgd_groupd_compat = DEFAULT_GROUPD_COMPAT; int cfgd_debug_logfile = DEFAULT_DEBUG_LOGFILE; int cfgd_clean_start = DEFAULT_CLEAN_START; +int cfgd_disable_dbus = DEFAULT_DISABLE_DBUS; int cfgd_skip_undefined = DEFAULT_SKIP_UNDEFINED; int cfgd_post_join_delay = DEFAULT_POST_JOIN_DELAY; int cfgd_post_fail_delay = DEFAULT_POST_FAIL_DELAY; diff --git a/fence/fenced/config.h b/fence/fenced/config.h index f65af0e..d17ed1a 100644 --- a/fence/fenced/config.h +++ b/fence/fenced/config.h @@ -4,6 +4,7 @@ #define DEFAULT_GROUPD_COMPAT 0 #define DEFAULT_DEBUG_LOGFILE 0 #define DEFAULT_CLEAN_START 0 +#define DEFAULT_DISABLE_DBUS 0 #define DEFAULT_SKIP_UNDEFINED 0 #define DEFAULT_POST_JOIN_DELAY 6 #define DEFAULT_POST_FAIL_DELAY 0 @@ -13,6 +14,7 @@ extern int optd_groupd_compat; extern int optd_debug_logfile; extern int optd_clean_start; +extern int optd_disable_dbus; extern int optd_skip_undefined; extern int optd_post_join_delay; extern int optd_post_fail_delay; @@ -22,6 +24,7 @@ extern int optd_override_path; extern int cfgd_groupd_compat; extern int cfgd_debug_logfile; extern int cfgd_clean_start; +extern int cfgd_disable_dbus; extern int cfgd_skip_undefined; extern int cfgd_post_join_delay; extern int cfgd_post_fail_delay; diff --git a/fence/fenced/dbus.c b/fence/fenced/dbus.c new file mode 100644 index 0000000..5d1e1d5 --- /dev/null +++ b/fence/fenced/dbus.c @@ -0,0 +1,87 @@ +#include "fd.h" +#include "config.h" + +#ifdef DBUS +#include <dbus/dbus.h> + +#define DBUS_FENCE_NAME "com.redhat.cluster.fence" +#define DBUS_FENCE_IFACE "com.redhat.cluster.fence" +#define DBUS_FENCE_PATH "/com/redhat/cluster/fence" + +static DBusConnection *bus = NULL; + +void fd_dbus_init(void) +{ + if (!(bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, NULL))) { + log_error("failed to get dbus connection"); + } else { + log_debug("connected to dbus %s", dbus_bus_get_unique_name(bus)); + } +} + +void fd_dbus_exit(void) +{ + if (bus) { + dbus_connection_close(bus); + dbus_connection_unref(bus); + } + bus = NULL; +} + +void fd_dbus_send(const char *nodename, int nodeid, int result) +{ + DBusMessage *msg = NULL; + + if (bus && !dbus_connection_read_write(bus, 1)) { + log_debug("disconnected from dbus"); + fd_dbus_exit(); + } + + if (!bus) { + fd_dbus_init(); + } + + if (!bus) { + goto out; + } + + if (!(msg = dbus_message_new_signal(DBUS_FENCE_PATH, + DBUS_FENCE_IFACE, + "FenceNode"))) { + log_error("failed to create dbus signal"); + goto out; + } + + if (!dbus_message_append_args(msg, + DBUS_TYPE_STRING, &nodename, + DBUS_TYPE_INT32, &nodeid, + DBUS_TYPE_INT32, &result, + DBUS_TYPE_INVALID)) { + log_error("failed to append args to dbus signal"); + goto out; + } + + dbus_connection_send(bus, msg, NULL); + dbus_connection_flush(bus); + +out: + if (msg) { + dbus_message_unref(msg); + } +} + +#else + +void fd_dbus_init(void) +{ +} + +void fd_dbus_exit(void) +{ +} + +void fd_dbus_send(const char *nodename, int nodeid, int result) +{ +} + +#endif /* DBUS */ diff --git a/fence/fenced/fd.h b/fence/fenced/fd.h index a5a78bf..21855b2 100644 --- a/fence/fenced/fd.h +++ b/fence/fenced/fd.h @@ -286,5 +286,11 @@ void init_logging(void); void setup_logging(void); void close_logging(void); +/* dbus.c */ + +void fd_dbus_init(void); +void fd_dbus_exit(void); +void fd_dbus_send(const char *nodename, int nodeid, int result); + #endif /* __FD_DOT_H__ */ diff --git a/fence/fenced/main.c b/fence/fenced/main.c index 1c61962..a9fecb5 100644 --- a/fence/fenced/main.c +++ b/fence/fenced/main.c @@ -902,7 +902,7 @@ static void print_usage(void) printf(" -j <secs> Post-join fencing delay (default %d)\n", DEFAULT_POST_JOIN_DELAY); printf(" -f <secs> Post-fail fencing delay (default %d)\n", DEFAULT_POST_FAIL_DELAY); printf(" -R <secs> Override time (default %d)\n", DEFAULT_OVERRIDE_TIME); - + printf(" -q Disable dbus signals\n"); printf(" -O <path> Override path (default %s)\n", DEFAULT_OVERRIDE_PATH); printf(" -h Print this help, then exit\n"); printf(" -V Print program version information, then exit\n"); @@ -912,7 +912,7 @@ static void print_usage(void) printf("\n"); } -#define OPTION_STRING "Lg:cj:f:Dn:O:hVSse:r:" +#define OPTION_STRING "Lg:cj:f:Dn:O:hVSse:r:q" static void read_arguments(int argc, char **argv) { @@ -970,6 +970,11 @@ static void read_arguments(int argc, char **argv) cfgd_override_path = strdup(optarg); break; + case 'q': + optd_disable_dbus = 1; + cfgd_disable_dbus = 1; + break; + case 'r': register_controlled_dir(optarg); break; @@ -1029,8 +1034,13 @@ int main(int argc, char **argv) log_level(LOG_INFO, "fenced %s started", RELEASE_VERSION); signal(SIGTERM, sigterm_handler); + if (!cfgd_disable_dbus) { + fd_dbus_init(); + } + loop(); + fd_dbus_exit(); unlink(LOCKFILE_NAME); return 0; } diff --git a/fence/fenced/recover.c b/fence/fenced/recover.c index a7ca047..13014c8 100644 --- a/fence/fenced/recover.c +++ b/fence/fenced/recover.c @@ -384,6 +384,10 @@ void fence_victims(struct fd *fd) log_error("fence %s %s", node->name, error ? "failed" : "success"); + if (!cfgd_disable_dbus) { + fd_dbus_send(node->name, node->nodeid, error); + } + skip_log_message: if (!error) { node->local_victim_done = 1;

1 0

cluster: RHEL6 - fenced: send dbus signal when node is fenced
by rohara 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=45… Commit: 4536bfb712dffa40a0e26910a8977babd902743e Parent: 5cb72e7ab6105f78af396a7e68d19ddaf3d06289 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Wed Feb 2 18:15:32 2011 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Thu Feb 3 13:54:47 2011 -0600 fenced: send dbus signal when node is fenced This patch adds the ability to send a dbus signal when a node is fenced. This code is can reestablish a connection with dbus if necessary. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> Reviewed-by: David Teigland <teigland(a)redhat.com> --- fence/fenced/Makefile | 8 ++++- fence/fenced/config.c | 2 + fence/fenced/config.h | 3 ++ fence/fenced/dbus.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ fence/fenced/fd.h | 6 +++ fence/fenced/main.c | 14 +++++++- fence/fenced/recover.c | 4 ++ 7 files changed, 121 insertions(+), 3 deletions(-) diff --git a/fence/fenced/Makefile b/fence/fenced/Makefile index 7455544..902c299 100644 --- a/fence/fenced/Makefile +++ b/fence/fenced/Makefile @@ -16,7 +16,8 @@ OBJS= config.o \ main.o \ member_cman.o \ recover.o \ - logging.o + logging.o \ + dbus.o CFLAGS += -D_FILE_OFFSET_BITS=64 CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${logtincdir} -I${corosyncincdir} @@ -30,6 +31,11 @@ LDFLAGS += -L${corosynclibdir} -lcpg -lpthread LDFLAGS += -L../../group/lib -l group LDFLAGS += -L${libdir} +ifndef disable_dbus +CFLAGS += $(shell pkg-config --cflags dbus-1) -DDBUS +LDFLAGS += $(shell pkg-config --libs dbus-1) +endif + LDDEPS += ../../group/lib/libgroup.a ${TARGET}: ${OBJS} ${LDDEPS} diff --git a/fence/fenced/config.c b/fence/fenced/config.c index 37f98f9..0517c2a 100644 --- a/fence/fenced/config.c +++ b/fence/fenced/config.c @@ -9,6 +9,7 @@ int ccs_handle; int optd_groupd_compat; int optd_debug_logfile; int optd_clean_start; +int optd_disable_dbus; int optd_skip_undefined; int optd_post_join_delay; int optd_post_fail_delay; @@ -20,6 +21,7 @@ int optd_override_path; int cfgd_groupd_compat = DEFAULT_GROUPD_COMPAT; int cfgd_debug_logfile = DEFAULT_DEBUG_LOGFILE; int cfgd_clean_start = DEFAULT_CLEAN_START; +int cfgd_disable_dbus = DEFAULT_DISABLE_DBUS; int cfgd_skip_undefined = DEFAULT_SKIP_UNDEFINED; int cfgd_post_join_delay = DEFAULT_POST_JOIN_DELAY; int cfgd_post_fail_delay = DEFAULT_POST_FAIL_DELAY; diff --git a/fence/fenced/config.h b/fence/fenced/config.h index f65af0e..d17ed1a 100644 --- a/fence/fenced/config.h +++ b/fence/fenced/config.h @@ -4,6 +4,7 @@ #define DEFAULT_GROUPD_COMPAT 0 #define DEFAULT_DEBUG_LOGFILE 0 #define DEFAULT_CLEAN_START 0 +#define DEFAULT_DISABLE_DBUS 0 #define DEFAULT_SKIP_UNDEFINED 0 #define DEFAULT_POST_JOIN_DELAY 6 #define DEFAULT_POST_FAIL_DELAY 0 @@ -13,6 +14,7 @@ extern int optd_groupd_compat; extern int optd_debug_logfile; extern int optd_clean_start; +extern int optd_disable_dbus; extern int optd_skip_undefined; extern int optd_post_join_delay; extern int optd_post_fail_delay; @@ -22,6 +24,7 @@ extern int optd_override_path; extern int cfgd_groupd_compat; extern int cfgd_debug_logfile; extern int cfgd_clean_start; +extern int cfgd_disable_dbus; extern int cfgd_skip_undefined; extern int cfgd_post_join_delay; extern int cfgd_post_fail_delay; diff --git a/fence/fenced/dbus.c b/fence/fenced/dbus.c new file mode 100644 index 0000000..5d1e1d5 --- /dev/null +++ b/fence/fenced/dbus.c @@ -0,0 +1,87 @@ +#include "fd.h" +#include "config.h" + +#ifdef DBUS +#include <dbus/dbus.h> + +#define DBUS_FENCE_NAME "com.redhat.cluster.fence" +#define DBUS_FENCE_IFACE "com.redhat.cluster.fence" +#define DBUS_FENCE_PATH "/com/redhat/cluster/fence" + +static DBusConnection *bus = NULL; + +void fd_dbus_init(void) +{ + if (!(bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, NULL))) { + log_error("failed to get dbus connection"); + } else { + log_debug("connected to dbus %s", dbus_bus_get_unique_name(bus)); + } +} + +void fd_dbus_exit(void) +{ + if (bus) { + dbus_connection_close(bus); + dbus_connection_unref(bus); + } + bus = NULL; +} + +void fd_dbus_send(const char *nodename, int nodeid, int result) +{ + DBusMessage *msg = NULL; + + if (bus && !dbus_connection_read_write(bus, 1)) { + log_debug("disconnected from dbus"); + fd_dbus_exit(); + } + + if (!bus) { + fd_dbus_init(); + } + + if (!bus) { + goto out; + } + + if (!(msg = dbus_message_new_signal(DBUS_FENCE_PATH, + DBUS_FENCE_IFACE, + "FenceNode"))) { + log_error("failed to create dbus signal"); + goto out; + } + + if (!dbus_message_append_args(msg, + DBUS_TYPE_STRING, &nodename, + DBUS_TYPE_INT32, &nodeid, + DBUS_TYPE_INT32, &result, + DBUS_TYPE_INVALID)) { + log_error("failed to append args to dbus signal"); + goto out; + } + + dbus_connection_send(bus, msg, NULL); + dbus_connection_flush(bus); + +out: + if (msg) { + dbus_message_unref(msg); + } +} + +#else + +void fd_dbus_init(void) +{ +} + +void fd_dbus_exit(void) +{ +} + +void fd_dbus_send(const char *nodename, int nodeid, int result) +{ +} + +#endif /* DBUS */ diff --git a/fence/fenced/fd.h b/fence/fenced/fd.h index a5a78bf..21855b2 100644 --- a/fence/fenced/fd.h +++ b/fence/fenced/fd.h @@ -286,5 +286,11 @@ void init_logging(void); void setup_logging(void); void close_logging(void); +/* dbus.c */ + +void fd_dbus_init(void); +void fd_dbus_exit(void); +void fd_dbus_send(const char *nodename, int nodeid, int result); + #endif /* __FD_DOT_H__ */ diff --git a/fence/fenced/main.c b/fence/fenced/main.c index e5ab568..835dc76 100644 --- a/fence/fenced/main.c +++ b/fence/fenced/main.c @@ -902,7 +902,7 @@ static void print_usage(void) printf(" -j <secs> Post-join fencing delay (default %d)\n", DEFAULT_POST_JOIN_DELAY); printf(" -f <secs> Post-fail fencing delay (default %d)\n", DEFAULT_POST_FAIL_DELAY); printf(" -R <secs> Override time (default %d)\n", DEFAULT_OVERRIDE_TIME); - + printf(" -q Disable dbus signals\n"); printf(" -O <path> Override path (default %s)\n", DEFAULT_OVERRIDE_PATH); printf(" -h Print this help, then exit\n"); printf(" -V Print program version information, then exit\n"); @@ -912,7 +912,7 @@ static void print_usage(void) printf("\n"); } -#define OPTION_STRING "Lg:cj:f:Dn:O:hVSse:r:" +#define OPTION_STRING "Lg:cj:f:Dn:O:hVSse:r:q" static void read_arguments(int argc, char **argv) { @@ -970,6 +970,11 @@ static void read_arguments(int argc, char **argv) cfgd_override_path = strdup(optarg); break; + case 'q': + optd_disable_dbus = 1; + cfgd_disable_dbus = 1; + break; + case 'r': register_controlled_dir(optarg); break; @@ -1042,8 +1047,13 @@ int main(int argc, char **argv) signal(SIGTERM, sigterm_handler); set_oom_adj(-16); + if (!cfgd_disable_dbus) { + fd_dbus_init(); + } + loop(); + fd_dbus_exit(); unlink(LOCKFILE_NAME); return 0; } diff --git a/fence/fenced/recover.c b/fence/fenced/recover.c index a7ca047..13014c8 100644 --- a/fence/fenced/recover.c +++ b/fence/fenced/recover.c @@ -384,6 +384,10 @@ void fence_victims(struct fd *fd) log_error("fence %s %s", node->name, error ? "failed" : "success"); + if (!cfgd_disable_dbus) { + fd_dbus_send(node->name, node->nodeid, error); + } + skip_log_message: if (!error) { node->local_victim_done = 1;

1 0

cluster: RHEL6 - gfs2_edit: fix segfault in set_bitmap when block is in rgrp
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5c… Commit: 5cb72e7ab6105f78af396a7e68d19ddaf3d06289 Parent: 04ed614339bb64003f3cc42af9994ff637313618 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Thu Feb 3 12:18:49 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Feb 3 12:18:49 2011 -0600 gfs2_edit: fix segfault in set_bitmap when block is in rgrp If you called libgfs2 function gfs2_set_bitmap to set a bit but specified a block outside the data blocks, it would segfault. rhbz#674843 --- gfs2/libgfs2/fs_bits.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gfs2/libgfs2/fs_bits.c b/gfs2/libgfs2/fs_bits.c index 7409bed..38ef92c 100644 --- a/gfs2/libgfs2/fs_bits.c +++ b/gfs2/libgfs2/fs_bits.c @@ -168,7 +168,7 @@ int gfs2_set_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, int state) rgd = gfs2_blk2rgrpd(sdp, blkno); - if(!rgd) + if(!rgd || blkno < rgd->ri.ri_data0) return -1; rgrp_block = (uint32_t)(blkno - rgd->ri.ri_data0);

1 0

cluster: RHEL6 - gfs2_edit: Fix bitmap editing function
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=04… Commit: 04ed614339bb64003f3cc42af9994ff637313618 Parent: 8bad0161fb746d58889758d5d2b0e28ed8e3bcbc Author: Steven Whitehouse <swhiteho(a)redhat.com> AuthorDate: Wed Oct 27 10:47:34 2010 +0100 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Feb 3 11:59:04 2011 -0600 gfs2_edit: Fix bitmap editing function The bitmap editing function wasn't reading in the rgrp, so that it would fail with a NULL pointer dereference. rhbz#674843 --- gfs2/edit/hexedit.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index c82ddae..abeed18 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -2557,28 +2557,28 @@ static void find_change_block_alloc(int *newval) if (ablock == sbd.sb_addr) printf("3 (the superblock is not in the bitmap)\n"); else { - if (newval) { - if (gfs2_set_bitmap(&sbd, ablock, *newval)) - printf("-1 (block invalid or part of an rgrp).\n"); - else - printf("%d\n", *newval); - } else { - rgd = gfs2_blk2rgrpd(&sbd, ablock); - if (rgd) { - gfs2_rgrp_read(&sbd, rgd); + rgd = gfs2_blk2rgrpd(&sbd, ablock); + if (rgd) { + gfs2_rgrp_read(&sbd, rgd); + if (newval) { + if (gfs2_set_bitmap(&sbd, ablock, *newval)) + printf("-1 (block invalid or part of an rgrp).\n"); + else + printf("%d\n", *newval); + } else { type = gfs2_get_bitmap(&sbd, ablock, rgd); - gfs2_rgrp_relse(rgd); if (type < 0) { printf("-1 (block invalid or part of " "an rgrp).\n"); exit(-1); } printf("%d (%s)\n", type, allocdesc[gfs1][type]); - } else { - gfs2_rgrp_free(&sbd.rglist); - printf("-1 (block invalid or part of an rgrp).\n"); - exit(-1); } + gfs2_rgrp_relse(rgd); + } else { + gfs2_rgrp_free(&sbd.rglist); + printf("-1 (block invalid or part of an rgrp).\n"); + exit(-1); } } gfs2_rgrp_free(&sbd.rglist);

1 0

cluster: RHEL6 - gfs2_edit: fix careless compiler warning
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8b… Commit: 8bad0161fb746d58889758d5d2b0e28ed8e3bcbc Parent: 578af431fb74985e39ba8c3acf43459bd476947f Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Thu Feb 3 11:04:20 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Feb 3 11:33:25 2011 -0600 gfs2_edit: fix careless compiler warning This patch fixes a couple compiler warnings I accidentally introduced with the previous patches. rhbz#674843 --- gfs2/edit/hexedit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 2a88a40..c82ddae 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -3143,9 +3143,9 @@ static void check_journal_wrap(uint64_t seq, uint64_t *highest_seq) *highest_seq = seq; } -int is_meta(struct gfs2_buffer_head *bh) +static int is_meta(struct gfs2_buffer_head *lbh) { - uint32_t check_magic = ((struct gfs2_meta_header *)(bh->b_data))->mh_magic; + uint32_t check_magic = ((struct gfs2_meta_header *)(lbh->b_data))->mh_magic; check_magic = be32_to_cpu(check_magic); if (check_magic == GFS2_MAGIC)

1 0

cluster: RHEL6 - gfs2_edit: Fix error message on blockalloc when outside bitmap
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=57… Commit: 578af431fb74985e39ba8c3acf43459bd476947f Parent: 0bfad0d0504aa0c2a2cfa973d79367f3208f8c04 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Thu Feb 3 10:35:37 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Feb 3 11:32:27 2011 -0600 gfs2_edit: Fix error message on blockalloc when outside bitmap If you specify gfs2_edit <block> blockalloc X and the block is part of the rgrp or bitmaps, it was not giving a proper error message. This patch adds an error message. rhbz#674843 --- gfs2/edit/hexedit.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index bb59758..2a88a40 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -2568,6 +2568,11 @@ static void find_change_block_alloc(int *newval) gfs2_rgrp_read(&sbd, rgd); type = gfs2_get_bitmap(&sbd, ablock, rgd); gfs2_rgrp_relse(rgd); + if (type < 0) { + printf("-1 (block invalid or part of " + "an rgrp).\n"); + exit(-1); + } printf("%d (%s)\n", type, allocdesc[gfs1][type]); } else { gfs2_rgrp_free(&sbd.rglist);

1 0

cluster: RHEL6 - gfs2_edit: add -d option for printing journal details
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0b… Commit: 0bfad0d0504aa0c2a2cfa973d79367f3208f8c04 Parent: d7f914ed829bdcddbc69fcc0c152142d12f3cd1b Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Thu Feb 3 08:18:32 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Feb 3 11:27:27 2011 -0600 gfs2_edit: add -d option for printing journal details This patch adds a new parameter "-d" to gfs2_edit. If -d is specified, printing a journal will dump the details of the metadata blocks contained in the journal, as well as the usual log descriptors and log headers. This makes it easier to find dinode revisions in the journal. rhbz#674843 --- gfs2/edit/hexedit.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index fd12c0d..bb59758 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -38,6 +38,7 @@ struct gfs2_leaf *lleaf; struct gfs2_log_header *llh; struct gfs2_log_descriptor *lld; int pgnum; +int details = 0; int display(int identify_only); @@ -3137,13 +3138,23 @@ static void check_journal_wrap(uint64_t seq, uint64_t *highest_seq) *highest_seq = seq; } +int is_meta(struct gfs2_buffer_head *bh) +{ + uint32_t check_magic = ((struct gfs2_meta_header *)(bh->b_data))->mh_magic; + + check_magic = be32_to_cpu(check_magic); + if (check_magic == GFS2_MAGIC) + return 1; + return 0; +} + /* ------------------------------------------------------------------------ */ /* dump_journal - dump a journal file's contents. */ /* ------------------------------------------------------------------------ */ static void dump_journal(const char *journal) { struct gfs2_buffer_head *j_bh = NULL, dummy_bh; - uint64_t jblock, j_size, jb, abs_block; + uint64_t jblock, j_size, jb, abs_block, saveblk; int error, start_line, journal_num; struct gfs2_inode *j_inode = NULL; int ld_blocks = 0; @@ -3259,6 +3270,11 @@ static void dump_journal(const char *journal) ld_blocks -= print_ld_blocks((uint64_t *)dummy_bh.b_data, (dummy_bh.b_data + sbd.bsize), start_line); + } else if (details && is_meta(&dummy_bh)) { + saveblk = block; + block = abs_block; + display(0); + block = saveblk; } } brelse(j_bh); @@ -3284,6 +3300,7 @@ static void usage(void) fprintf(stderr,"rgflags rgnum [new flags] - print or modify flags for rg #rgnum (0 - X)\n"); fprintf(stderr,"-V prints version number.\n"); fprintf(stderr,"-c 1 selects alternate color scheme 1\n"); + fprintf(stderr,"-d prints details (for printing journals)\n"); fprintf(stderr,"-p prints GFS2 structures or blocks to stdout.\n"); fprintf(stderr," sb - prints the superblock.\n"); fprintf(stderr," size - prints the filesystem size.\n"); @@ -3368,6 +3385,9 @@ static void parameterpass1(int argc, char *argv[], int i) it out later */ dmode = GFS2_MODE; } + else if (!strcasecmp(argv[i], "-d") || + !strcasecmp(argv[i], "-details")) + details = 1; else if (!strcasecmp(argv[i], "savemeta")) termlines = 0; else if (!strcasecmp(argv[i], "savemetaslow"))

1 0

cluster: RHEL6 - gfs2_edit: has problems printing gfs1 journals
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d7… Commit: d7f914ed829bdcddbc69fcc0c152142d12f3cd1b Parent: 87f0950748b045b50e7ce18a8baf6e0ac81a1492 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Thu Feb 3 08:13:35 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Feb 3 11:27:02 2011 -0600 gfs2_edit: has problems printing gfs1 journals The gfs2_edit tool was releasing the buffer too soon while printing out journals. It worked for gfs2 journals, but not for gfs1 journals. This patch moves the buffer release later in the function so that gfs1 journals will print correctly. rhbz#674843 --- gfs2/edit/hexedit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 4fc8a43..fd12c0d 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -2023,7 +2023,6 @@ static uint64_t find_journal_block(const char *journal, uint64_t *j_size) if (!gfs1) do_dinode_extended(&di, jindex_bh); /* parse dir. */ - brelse(jindex_bh); if (gfs1) { struct gfs2_inode *jiinode; @@ -2048,6 +2047,7 @@ static uint64_t find_journal_block(const char *journal, uint64_t *j_size) *j_size = jdi.di_size; brelse(j_bh); } + brelse(jindex_bh); return jblock; }

1 0

cluster: RHEL6 - gfs2_edit: print large block numbers better
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=87… Commit: 87f0950748b045b50e7ce18a8baf6e0ac81a1492 Parent: 4cb8599397ca7a519e5b95b76824536b8c4b6e33 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Feb 2 15:57:18 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Feb 3 11:25:35 2011 -0600 gfs2_edit: print large block numbers better The gfs2_edit tool was obscuring block number on the display when the block number got big enough. This patch makes it print the block number so that it looks better when it gets big. rhbz#674843 --- gfs2/edit/hexedit.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 467885e..4fc8a43 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -1059,18 +1059,10 @@ int display_block_type(int from_restore) if (termlines) { if (edit_row[dmode] == -1) COLORS_NORMAL; - move(line,30); - } - else - print_gfs2(" "); - if (!from_restore) { - print_gfs2("of %" PRIu64 " (0x%" PRIx64 ")", max_block, - max_block); - if (termlines) - move(line, 55); - else - printf(" "); } + print_gfs2(" "); + if (!from_restore) + print_gfs2("of %llu (0x%llx) ", max_block, max_block); if (block == RGLIST_DUMMY_BLOCK) { ret_type = GFS2_METATYPE_RG; struct_len = gfs1 ? sizeof(struct gfs_rgrp) : sizeof(struct gfs2_rgrp);

1 0

cluster: RHEL6 - gfs2_edit: handle corrupt file systems better
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4c… Commit: 4cb8599397ca7a519e5b95b76824536b8c4b6e33 Parent: fe9dc9c97b5cc3173582f815cbfa4e619333fce9 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Feb 2 15:49:22 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Feb 3 11:17:52 2011 -0600 gfs2_edit: handle corrupt file systems better This patch adds some checks to gfs2_edit so that it will not segfault when it encounters certain types of file system corruption. This makes it a more useful tool for examining corrupt metadata sets. rhbz#674843 --- gfs2/edit/hexedit.c | 10 ++++++---- gfs2/libgfs2/fs_bits.c | 2 ++ gfs2/libgfs2/rgrp.c | 5 +++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index d900c93..467885e 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -1792,11 +1792,13 @@ static void read_superblock(int fd) sbd.bsize = sbd.sd_sb.sb_bsize; if (!sbd.bsize) sbd.bsize = GFS2_DEFAULT_BSIZE; - if (compute_constants(&sbd)) { - fprintf(stderr, "Bad constants (1)\n"); - exit(-1); + compute_constants(&sbd); + if (gfs1 || (sbd.sd_sb.sb_header.mh_magic == GFS2_MAGIC && + sbd.sd_sb.sb_header.mh_type == GFS2_METATYPE_SB)) + block = 0x10 * (GFS2_DEFAULT_BSIZE / sbd.bsize); + else { + block = starting_blk = 0; } - block = 0x10 * (GFS2_DEFAULT_BSIZE / sbd.bsize); device_geometry(&sbd); if (fix_device_geometry(&sbd)) { fprintf(stderr, "Device is too small (%"PRIu64" bytes)\n", diff --git a/gfs2/libgfs2/fs_bits.c b/gfs2/libgfs2/fs_bits.c index c2934a6..7409bed 100644 --- a/gfs2/libgfs2/fs_bits.c +++ b/gfs2/libgfs2/fs_bits.c @@ -230,6 +230,8 @@ int gfs2_get_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, if (i >= rgd->ri.ri_length) return -1; + if (!rgd->bh || !rgd->bh[i]) + return 0; byte = (unsigned char *)(rgd->bh[i]->b_data + bits->bi_offset) + (rgrp_block/GFS2_NBBY - bits->bi_start); bit = (rgrp_block % GFS2_NBBY) * GFS2_BIT_SIZE; diff --git a/gfs2/libgfs2/rgrp.c b/gfs2/libgfs2/rgrp.c index b35c241..0f34e33 100644 --- a/gfs2/libgfs2/rgrp.c +++ b/gfs2/libgfs2/rgrp.c @@ -167,8 +167,9 @@ void gfs2_rgrp_relse(struct rgrp_list *rgd) int x, length = rgd->ri.ri_length; for (x = 0; x < length; x++) { - if (rgd->bh && rgd->bh[x]) { - brelse(rgd->bh[x]); + if (rgd->bh) { + if (rgd->bh[x]) + brelse(rgd->bh[x]); rgd->bh[x] = NULL; } }

1 0

gfs2-utils: master - gfs2_edit: fix segfault in set_bitmap when block is in rgrp
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: 897437313adc8801b38ea42abc4fd07bd486ce3e Parent: 7acf4bd2e7176cabf87d47f0c4d8677f99e08544 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Thu Feb 3 12:18:49 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Feb 3 12:27:44 2011 -0600 gfs2_edit: fix segfault in set_bitmap when block is in rgrp If you called libgfs2 function gfs2_set_bitmap to set a bit but specified a block outside the data blocks, it would segfault. rhbz#674843 --- gfs2/libgfs2/fs_bits.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gfs2/libgfs2/fs_bits.c b/gfs2/libgfs2/fs_bits.c index 7d37d57..97172df 100644 --- a/gfs2/libgfs2/fs_bits.c +++ b/gfs2/libgfs2/fs_bits.c @@ -170,7 +170,7 @@ int gfs2_set_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, int state) rgd = gfs2_blk2rgrpd(sdp, blkno); - if(!rgd) + if(!rgd || blkno < rgd->ri.ri_data0) return -1; rgrp_block = (uint32_t)(blkno - rgd->ri.ri_data0);

1 0

gfs2-utils: master - gfs2_edit: fix careless compiler warning
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: 7acf4bd2e7176cabf87d47f0c4d8677f99e08544 Parent: bdaaf3f4ef1a3df196bb900ec7ade2017362569b Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Thu Feb 3 11:04:20 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Feb 3 11:04:20 2011 -0600 gfs2_edit: fix careless compiler warning This patch fixes a couple compiler warnings I accidentally introduced with the previous patches. rhbz#674843 --- gfs2/edit/hexedit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index ea3ad28..d8f8841 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -3145,9 +3145,9 @@ static void check_journal_wrap(uint64_t seq, uint64_t *highest_seq) *highest_seq = seq; } -int is_meta(struct gfs2_buffer_head *bh) +static int is_meta(struct gfs2_buffer_head *lbh) { - uint32_t check_magic = ((struct gfs2_meta_header *)(bh->b_data))->mh_magic; + uint32_t check_magic = ((struct gfs2_meta_header *)(lbh->b_data))->mh_magic; check_magic = be32_to_cpu(check_magic); if (check_magic == GFS2_MAGIC)

1 0

gfs2-utils: master - gfs2_edit: Fix error message on blockalloc when outside bitmap
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: bdaaf3f4ef1a3df196bb900ec7ade2017362569b Parent: 2e5a1389b93b17013445bda32824fb8638bc8d74 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Thu Feb 3 10:35:37 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Feb 3 10:35:37 2011 -0600 gfs2_edit: Fix error message on blockalloc when outside bitmap If you specify gfs2_edit <block> blockalloc X and the block is part of the rgrp or bitmaps, it was not giving a proper error message. This patch adds an error message. rhbz#674843 --- gfs2/edit/hexedit.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 27dbd9d..ea3ad28 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -2569,6 +2569,11 @@ static void find_change_block_alloc(int *newval) printf("%d\n", *newval); } else { type = gfs2_get_bitmap(&sbd, ablock, rgd); + if (type < 0) { + printf("-1 (block invalid or part of " + "an rgrp).\n"); + exit(-1); + } printf("%d (%s)\n", type, allocdesc[gfs1][type]); } gfs2_rgrp_relse(rgd);

1 0

gfs2-utils: master - gfs2_edit: add -d option for printing journal details
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: 2e5a1389b93b17013445bda32824fb8638bc8d74 Parent: c81702e92ff710c3c12ccca13e8c30eff269427f Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Thu Feb 3 08:18:32 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Feb 3 08:18:32 2011 -0600 gfs2_edit: add -d option for printing journal details This patch adds a new parameter "-d" to gfs2_edit. If -d is specified, printing a journal will dump the details of the metadata blocks contained in the journal, as well as the usual log descriptors and log headers. This makes it easier to find dinode revisions in the journal. rhbz#674843 --- gfs2/edit/hexedit.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index aa49d50..27dbd9d 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -40,6 +40,7 @@ struct gfs2_leaf *lleaf; struct gfs2_log_header *llh; struct gfs2_log_descriptor *lld; int pgnum; +int details = 0; int display(int identify_only); @@ -3139,13 +3140,23 @@ static void check_journal_wrap(uint64_t seq, uint64_t *highest_seq) *highest_seq = seq; } +int is_meta(struct gfs2_buffer_head *bh) +{ + uint32_t check_magic = ((struct gfs2_meta_header *)(bh->b_data))->mh_magic; + + check_magic = be32_to_cpu(check_magic); + if (check_magic == GFS2_MAGIC) + return 1; + return 0; +} + /* ------------------------------------------------------------------------ */ /* dump_journal - dump a journal file's contents. */ /* ------------------------------------------------------------------------ */ static void dump_journal(const char *journal) { struct gfs2_buffer_head *j_bh = NULL, dummy_bh; - uint64_t jblock, j_size, jb, abs_block; + uint64_t jblock, j_size, jb, abs_block, saveblk; int error, start_line, journal_num; struct gfs2_inode *j_inode = NULL; int ld_blocks = 0; @@ -3261,6 +3272,11 @@ static void dump_journal(const char *journal) ld_blocks -= print_ld_blocks((uint64_t *)dummy_bh.b_data, (dummy_bh.b_data + sbd.bsize), start_line); + } else if (details && is_meta(&dummy_bh)) { + saveblk = block; + block = abs_block; + display(0); + block = saveblk; } } brelse(j_bh); @@ -3286,6 +3302,7 @@ static void usage(void) fprintf(stderr,"rgflags rgnum [new flags] - print or modify flags for rg #rgnum (0 - X)\n"); fprintf(stderr,"-V prints version number.\n"); fprintf(stderr,"-c 1 selects alternate color scheme 1\n"); + fprintf(stderr,"-d prints details (for printing journals)\n"); fprintf(stderr,"-p prints GFS2 structures or blocks to stdout.\n"); fprintf(stderr," sb - prints the superblock.\n"); fprintf(stderr," size - prints the filesystem size.\n"); @@ -3370,6 +3387,9 @@ static void parameterpass1(int argc, char *argv[], int i) it out later */ dmode = GFS2_MODE; } + else if (!strcasecmp(argv[i], "-d") || + !strcasecmp(argv[i], "-details")) + details = 1; else if (!strcasecmp(argv[i], "savemeta")) termlines = 0; else if (!strcasecmp(argv[i], "savemetaslow"))

1 0

gfs2-utils: master - gfs2_edit: has problems printing gfs1 journals
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: c81702e92ff710c3c12ccca13e8c30eff269427f Parent: dde989e50401270fbfd8882c10e44e401afd78ec Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Thu Feb 3 08:13:35 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Feb 3 08:13:35 2011 -0600 gfs2_edit: has problems printing gfs1 journals The gfs2_edit tool was releasing the buffer too soon while printing out journals. It worked for gfs2 journals, but not for gfs1 journals. This patch moves the buffer release later in the function so that gfs1 journals will print correctly. rhbz#656371 --- gfs2/edit/hexedit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 13d432f..aa49d50 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -2025,7 +2025,6 @@ static uint64_t find_journal_block(const char *journal, uint64_t *j_size) if (!gfs1) do_dinode_extended(&di, jindex_bh); /* parse dir. */ - brelse(jindex_bh); if (gfs1) { struct gfs2_inode *jiinode; @@ -2050,6 +2049,7 @@ static uint64_t find_journal_block(const char *journal, uint64_t *j_size) *j_size = jdi.di_size; brelse(j_bh); } + brelse(jindex_bh); return jblock; }

1 0

gfs2-utils: master - gfs2_edit: print large block numbers better
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: dde989e50401270fbfd8882c10e44e401afd78ec Parent: 5c35d4c605b171c8e431990ac137816ac65f2b0f Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Feb 2 15:57:18 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 15:57:18 2011 -0600 gfs2_edit: print large block numbers better The gfs2_edit tool was obscuring block number on the display when the block number got big enough. This patch makes it print the block number so that it looks better when it gets big. rhbz#656371 --- gfs2/edit/hexedit.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index cdcdecd..13d432f 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -1061,17 +1061,10 @@ int display_block_type(int from_restore) if (termlines) { if (edit_row[dmode] == -1) COLORS_NORMAL; - move(line,30); - } - else - print_gfs2(" "); - if (!from_restore) { - print_gfs2("of %llu (0x%llx)", max_block, max_block); - if (termlines) - move(line, 55); - else - printf(" "); } + print_gfs2(" "); + if (!from_restore) + print_gfs2("of %llu (0x%llx) ", max_block, max_block); if (block == RGLIST_DUMMY_BLOCK) { ret_type = GFS2_METATYPE_RG; struct_len = gfs1 ? sizeof(struct gfs_rgrp) : sizeof(struct gfs2_rgrp);

1 0

gfs2-utils: master - gfs2_edit: handle corrupt file systems better
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: 5c35d4c605b171c8e431990ac137816ac65f2b0f Parent: d8c8af9612e2e00b8d8739a3d72ca9669a593878 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Feb 2 15:49:22 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 15:49:22 2011 -0600 gfs2_edit: handle corrupt file systems better This patch adds some checks to gfs2_edit so that it will not segfault when it encounters certain types of file system corruption. This makes it a more useful tool for examining corrupt metadata sets. rhbz#656371 --- gfs2/edit/hexedit.c | 10 ++++++---- gfs2/libgfs2/fs_bits.c | 2 ++ gfs2/libgfs2/rgrp.c | 5 +++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 2472bbf..cdcdecd 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -1793,11 +1793,13 @@ static void read_superblock(int fd) sbd.bsize = sbd.sd_sb.sb_bsize; if (!sbd.bsize) sbd.bsize = GFS2_DEFAULT_BSIZE; - if (compute_constants(&sbd)) { - fprintf(stderr, "Bad constants (1)\n"); - exit(-1); + compute_constants(&sbd); + if (gfs1 || (sbd.sd_sb.sb_header.mh_magic == GFS2_MAGIC && + sbd.sd_sb.sb_header.mh_type == GFS2_METATYPE_SB)) + block = 0x10 * (GFS2_DEFAULT_BSIZE / sbd.bsize); + else { + block = starting_blk = 0; } - block = 0x10 * (GFS2_DEFAULT_BSIZE / sbd.bsize); device_geometry(&sbd); if (fix_device_geometry(&sbd)) { fprintf(stderr, "Device is too small (%llu bytes)\n", diff --git a/gfs2/libgfs2/fs_bits.c b/gfs2/libgfs2/fs_bits.c index 6f096f3..7d37d57 100644 --- a/gfs2/libgfs2/fs_bits.c +++ b/gfs2/libgfs2/fs_bits.c @@ -232,6 +232,8 @@ int gfs2_get_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, if (i >= rgd->ri.ri_length) return -1; + if (!rgd->bh || !rgd->bh[i]) + return 0; byte = (unsigned char *)(rgd->bh[i]->b_data + bits->bi_offset) + (rgrp_block/GFS2_NBBY - bits->bi_start); bit = (rgrp_block % GFS2_NBBY) * GFS2_BIT_SIZE; diff --git a/gfs2/libgfs2/rgrp.c b/gfs2/libgfs2/rgrp.c index 2a6fa3f..2ec55b5 100644 --- a/gfs2/libgfs2/rgrp.c +++ b/gfs2/libgfs2/rgrp.c @@ -169,8 +169,9 @@ void gfs2_rgrp_relse(struct rgrp_list *rgd) int x, length = rgd->ri.ri_length; for (x = 0; x < length; x++) { - if (rgd->bh && rgd->bh[x]) { - brelse(rgd->bh[x]); + if (rgd->bh) { + if (rgd->bh[x]) + brelse(rgd->bh[x]); rgd->bh[x] = NULL; } }

1 0

resource-agents: master - fs-lib: fix do_monitor device mapping
by Fabio M. Di Nitto 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a… Commit: a23793faa3c7718177cbbda77363d5fd3765415d Parent: f9960d41fb8adced22c83e6db73d950b31f7cde1 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Thu Feb 3 17:33:25 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Thu Feb 3 17:33:25 2011 +0100 fs-lib: fix do_monitor device mapping do_monitor needs to expand _device key to the real device before performing checks Resolves: rhbz#669832 Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/src/resources/utils/fs-lib.sh | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/utils/fs-lib.sh b/rgmanager/src/resources/utils/fs-lib.sh index 4f242f7..7b933f8 100644 --- a/rgmanager/src/resources/utils/fs-lib.sh +++ b/rgmanager/src/resources/utils/fs-lib.sh @@ -866,7 +866,18 @@ do_stop() { do_monitor() { - is_mounted "${OCF_RESKEY_device}" "${OCF_RESKEY_mountpoint}" + # + # Get the device + # + real_device "$OCF_RESKEY_device" + dev="$REAL_DEVICE" + if [ -z "$dev" ]; then + ocf_log err "\ +start_filesystem: Could not match $OCF_RESKEY_device with a real device" + return $OCF_ERR_ARGS + fi + + is_mounted "$dev" "${OCF_RESKEY_mountpoint}" if [ $? -ne $YES ]; then ocf_log err "${OCF_RESOURCE_INSTANCE}: ${OCF_RESKEY_device} is not mounted on ${OCF_RESKEY_mountpoint}"

1 0

cluster: RHEL6 - rgmanager: Support convalesce w/ central_processing
by Lon Hohberger 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=fe… Commit: fe9dc9c97b5cc3173582f815cbfa4e619333fce9 Parent: 27822b33fa334cefe8ba1783eb74c046de849865 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Thu Sep 9 10:58:17 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Feb 3 11:23:02 2011 -0500 rgmanager: Support convalesce w/ central_processing This is just a split of commit 3b03b46fe7d3c7d747db9a2b7721cc56aef458f2 in to two parts for the respective packages. Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/include/event.h | 1 + rgmanager/src/daemons/service_op.c | 84 +++++++++++++++++++++++++++++++++++ rgmanager/src/daemons/slang_event.c | 18 +++++++- 3 files changed, 102 insertions(+), 1 deletions(-) diff --git a/rgmanager/include/event.h b/rgmanager/include/event.h index a9a8235..ad3fe39 100644 --- a/rgmanager/include/event.h +++ b/rgmanager/include/event.h @@ -124,6 +124,7 @@ void set_transition_throttling(int nsecs); int service_op_start(char *svcName, int *target_list, int target_list_len, int *new_owner); int service_op_stop(char *svcName, int do_disable, int event_type); +int service_op_convalesce(const char *svcName); int service_op_migrate(char *svcName, int target_node); diff --git a/rgmanager/src/daemons/service_op.c b/rgmanager/src/daemons/service_op.c index 112b267..f094129 100644 --- a/rgmanager/src/daemons/service_op.c +++ b/rgmanager/src/daemons/service_op.c @@ -186,6 +186,90 @@ service_op_stop(char *svcName, int do_disable, int event_type) } +int +service_op_convalesce(const char *svcName) +{ + SmMessageSt msg; + int msg_ret; + msgctx_t ctx; + rg_state_t svcStatus; + int msgtarget = my_id(); + + /* Build the message header */ + msg.sm_hdr.gh_magic = GENERIC_HDR_MAGIC; + msg.sm_hdr.gh_command = RG_ACTION_REQUEST; + msg.sm_hdr.gh_arg1 = RG_ACTION_MASTER; + msg.sm_hdr.gh_length = sizeof (SmMessageSt); + + msg.sm_data.d_action = RG_CONVALESCE; + + strncpy(msg.sm_data.d_svcName, svcName, + sizeof(msg.sm_data.d_svcName)); + msg.sm_data.d_ret = 0; + msg.sm_data.d_svcOwner = 0; + + /* Open a connection to the local node - it will decide what to + do in this case. XXX inefficient; should queue requests + locally and immediately forward requests otherwise */ + + if (get_service_state_internal(svcName, &svcStatus) < 0) + return RG_EFAIL; + if (svcStatus.rs_owner > 0) { + if (member_online(svcStatus.rs_owner)) { + msgtarget = svcStatus.rs_owner; + } else { + /* If the owner is not online, + mark the service as 'stopped' but + otherwise, do nothing. + */ + return svc_stop(svcName, RG_STOP); + } + } + + if (msg_open(MSG_CLUSTER, msgtarget, RG_PORT, &ctx, 2 * cluster_timeout)< 0) { + logt_print(LOG_ERR, + "#58: Failed opening connection to member #%d\n", + my_id()); + return -1; + } + + /* Encode */ + swab_SmMessageSt(&msg); + + /* Send stop message to the other node */ + if (msg_send(&ctx, &msg, sizeof (SmMessageSt)) < + (int)sizeof (SmMessageSt)) { + logt_print(LOG_ERR, "Failed to send complete message\n"); + msg_close(&ctx); + return -1; + } + + /* Check the response */ + do { + msg_ret = msg_receive(&ctx, &msg, + sizeof (SmMessageSt), 10); + if ((msg_ret == -1 && errno != ETIMEDOUT) || + (msg_ret > 0)) { + break; + } + } while(1); + + if (msg_ret != sizeof (SmMessageSt)) { + logt_print(LOG_WARNING, "Strange response size: %d vs %d\n", + msg_ret, (int)sizeof(SmMessageSt)); + return 0; /* XXX really UNKNOWN */ + } + + /* Got a valid response from other node. */ + msg_close(&ctx); + + /* Decode */ + swab_SmMessageSt(&msg); + + return msg.sm_data.d_ret; +} + + /* service_op_migrate() - send a virtual machine to another host in the cluster diff --git a/rgmanager/src/daemons/slang_event.c b/rgmanager/src/daemons/slang_event.c index 55f0341..0b9f0d0 100644 --- a/rgmanager/src/daemons/slang_event.c +++ b/rgmanager/src/daemons/slang_event.c @@ -86,7 +86,8 @@ static int _user_restart = RG_RESTART, _user_migrate = RG_MIGRATE, _user_freeze = RG_FREEZE, - _user_unfreeze = RG_UNFREEZE; + _user_unfreeze = RG_UNFREEZE, + _user_convalesce = RG_CONVALESCE; SLang_Intrin_Var_Type rgmanager_vars[] = @@ -139,6 +140,7 @@ SLang_Intrin_Var_Type rgmanager_vars[] = MAKE_VARIABLE((char *)"USER_MIGRATE", &_user_migrate, SLANG_INT_TYPE, 1), MAKE_VARIABLE((char *)"USER_FREEZE", &_user_freeze, SLANG_INT_TYPE, 1), MAKE_VARIABLE((char *)"USER_UNFREEZE", &_user_unfreeze,SLANG_INT_TYPE, 1), + MAKE_VARIABLE((char *)"USER_CONVALESCE",&_user_convalesce,SLANG_INT_TYPE, 1), /* Errors */ MAKE_VARIABLE((char *)"rg_error", &_rg_err, SLANG_INT_TYPE, 1), @@ -444,6 +446,18 @@ sl_service_property(char *svcName, char *prop) /** usage: + service_convalesce(name); + */ +static int +sl_convalesce_service(const char *svcname) +{ + return service_op_convalesce(svcname); +} + + +/** + usage: + stop_service(name, disable_flag); */ static int @@ -1034,6 +1048,8 @@ static SLang_Intrin_Fun_Type rgmanager_slang[] = SLANG_VOID_TYPE), MAKE_INTRINSIC_0((char *)"service_stop", sl_stop_service, SLANG_INT_TYPE), + MAKE_INTRINSIC_S((char *)"service_convalesce", sl_convalesce_service, + SLANG_INT_TYPE), MAKE_INTRINSIC_0((char *)"service_start", sl_start_service, SLANG_INT_TYPE), MAKE_INTRINSIC_0((char *)"service_migrate", sl_migrate_service,

1 0

cluster: RHEL6 - resource-agents: Support convalesce w/ central_processing
by Lon Hohberger 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=27… Commit: 27822b33fa334cefe8ba1783eb74c046de849865 Parent: 216c64116be3b5edad1ea7fcdcde298c67074b44 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Thu Sep 9 10:58:17 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Feb 3 11:23:02 2011 -0500 resource-agents: Support convalesce w/ central_processing This is just a split of commit 3b03b46fe7d3c7d747db9a2b7721cc56aef458f2 in to two parts for the respective packages. Resolves: rhbz#674710 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/default_event_script.sl | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/rgmanager/src/resources/default_event_script.sl b/rgmanager/src/resources/default_event_script.sl index fad22ac..4eae767 100644 --- a/rgmanager/src/resources/default_event_script.sl +++ b/rgmanager/src/resources/default_event_script.sl @@ -597,6 +597,10 @@ define default_user_event_handler() ret = service_migrate(service_name, user_target); + } else if (user_request == USER_CONVALESCE) { + + ret = service_convalesce(service_name); + } return ret;

1 0

cluster: RHEL6 - Revert "rgmanager: Support convalesce w/ central_processing"
by Lon Hohberger 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=21… Commit: 216c64116be3b5edad1ea7fcdcde298c67074b44 Parent: b3e375c0554149173390b542de1ef3674da3d128 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Feb 2 20:17:45 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Feb 3 11:23:02 2011 -0500 Revert "rgmanager: Support convalesce w/ central_processing" This reverts commit 3b03b46fe7d3c7d747db9a2b7721cc56aef458f2. --- rgmanager/include/event.h | 1 - rgmanager/src/daemons/service_op.c | 84 ----------------------- rgmanager/src/daemons/slang_event.c | 18 +----- rgmanager/src/resources/default_event_script.sl | 4 - 4 files changed, 1 insertions(+), 106 deletions(-) diff --git a/rgmanager/include/event.h b/rgmanager/include/event.h index ad3fe39..a9a8235 100644 --- a/rgmanager/include/event.h +++ b/rgmanager/include/event.h @@ -124,7 +124,6 @@ void set_transition_throttling(int nsecs); int service_op_start(char *svcName, int *target_list, int target_list_len, int *new_owner); int service_op_stop(char *svcName, int do_disable, int event_type); -int service_op_convalesce(const char *svcName); int service_op_migrate(char *svcName, int target_node); diff --git a/rgmanager/src/daemons/service_op.c b/rgmanager/src/daemons/service_op.c index f094129..112b267 100644 --- a/rgmanager/src/daemons/service_op.c +++ b/rgmanager/src/daemons/service_op.c @@ -186,90 +186,6 @@ service_op_stop(char *svcName, int do_disable, int event_type) } -int -service_op_convalesce(const char *svcName) -{ - SmMessageSt msg; - int msg_ret; - msgctx_t ctx; - rg_state_t svcStatus; - int msgtarget = my_id(); - - /* Build the message header */ - msg.sm_hdr.gh_magic = GENERIC_HDR_MAGIC; - msg.sm_hdr.gh_command = RG_ACTION_REQUEST; - msg.sm_hdr.gh_arg1 = RG_ACTION_MASTER; - msg.sm_hdr.gh_length = sizeof (SmMessageSt); - - msg.sm_data.d_action = RG_CONVALESCE; - - strncpy(msg.sm_data.d_svcName, svcName, - sizeof(msg.sm_data.d_svcName)); - msg.sm_data.d_ret = 0; - msg.sm_data.d_svcOwner = 0; - - /* Open a connection to the local node - it will decide what to - do in this case. XXX inefficient; should queue requests - locally and immediately forward requests otherwise */ - - if (get_service_state_internal(svcName, &svcStatus) < 0) - return RG_EFAIL; - if (svcStatus.rs_owner > 0) { - if (member_online(svcStatus.rs_owner)) { - msgtarget = svcStatus.rs_owner; - } else { - /* If the owner is not online, - mark the service as 'stopped' but - otherwise, do nothing. - */ - return svc_stop(svcName, RG_STOP); - } - } - - if (msg_open(MSG_CLUSTER, msgtarget, RG_PORT, &ctx, 2 * cluster_timeout)< 0) { - logt_print(LOG_ERR, - "#58: Failed opening connection to member #%d\n", - my_id()); - return -1; - } - - /* Encode */ - swab_SmMessageSt(&msg); - - /* Send stop message to the other node */ - if (msg_send(&ctx, &msg, sizeof (SmMessageSt)) < - (int)sizeof (SmMessageSt)) { - logt_print(LOG_ERR, "Failed to send complete message\n"); - msg_close(&ctx); - return -1; - } - - /* Check the response */ - do { - msg_ret = msg_receive(&ctx, &msg, - sizeof (SmMessageSt), 10); - if ((msg_ret == -1 && errno != ETIMEDOUT) || - (msg_ret > 0)) { - break; - } - } while(1); - - if (msg_ret != sizeof (SmMessageSt)) { - logt_print(LOG_WARNING, "Strange response size: %d vs %d\n", - msg_ret, (int)sizeof(SmMessageSt)); - return 0; /* XXX really UNKNOWN */ - } - - /* Got a valid response from other node. */ - msg_close(&ctx); - - /* Decode */ - swab_SmMessageSt(&msg); - - return msg.sm_data.d_ret; -} - - /* service_op_migrate() - send a virtual machine to another host in the cluster diff --git a/rgmanager/src/daemons/slang_event.c b/rgmanager/src/daemons/slang_event.c index 0b9f0d0..55f0341 100644 --- a/rgmanager/src/daemons/slang_event.c +++ b/rgmanager/src/daemons/slang_event.c @@ -86,8 +86,7 @@ static int _user_restart = RG_RESTART, _user_migrate = RG_MIGRATE, _user_freeze = RG_FREEZE, - _user_unfreeze = RG_UNFREEZE, - _user_convalesce = RG_CONVALESCE; + _user_unfreeze = RG_UNFREEZE; SLang_Intrin_Var_Type rgmanager_vars[] = @@ -140,7 +139,6 @@ SLang_Intrin_Var_Type rgmanager_vars[] = MAKE_VARIABLE((char *)"USER_MIGRATE", &_user_migrate, SLANG_INT_TYPE, 1), MAKE_VARIABLE((char *)"USER_FREEZE", &_user_freeze, SLANG_INT_TYPE, 1), MAKE_VARIABLE((char *)"USER_UNFREEZE", &_user_unfreeze,SLANG_INT_TYPE, 1), - MAKE_VARIABLE((char *)"USER_CONVALESCE",&_user_convalesce,SLANG_INT_TYPE, 1), /* Errors */ MAKE_VARIABLE((char *)"rg_error", &_rg_err, SLANG_INT_TYPE, 1), @@ -446,18 +444,6 @@ sl_service_property(char *svcName, char *prop) /** usage: - service_convalesce(name); - */ -static int -sl_convalesce_service(const char *svcname) -{ - return service_op_convalesce(svcname); -} - - -/** - usage: - stop_service(name, disable_flag); */ static int @@ -1048,8 +1034,6 @@ static SLang_Intrin_Fun_Type rgmanager_slang[] = SLANG_VOID_TYPE), MAKE_INTRINSIC_0((char *)"service_stop", sl_stop_service, SLANG_INT_TYPE), - MAKE_INTRINSIC_S((char *)"service_convalesce", sl_convalesce_service, - SLANG_INT_TYPE), MAKE_INTRINSIC_0((char *)"service_start", sl_start_service, SLANG_INT_TYPE), MAKE_INTRINSIC_0((char *)"service_migrate", sl_migrate_service, diff --git a/rgmanager/src/resources/default_event_script.sl b/rgmanager/src/resources/default_event_script.sl index 4eae767..fad22ac 100644 --- a/rgmanager/src/resources/default_event_script.sl +++ b/rgmanager/src/resources/default_event_script.sl @@ -597,10 +597,6 @@ define default_user_event_handler() ret = service_migrate(service_name, user_target); - } else if (user_request == USER_CONVALESCE) { - - ret = service_convalesce(service_name); - } return ret;

1 0

cluster: RHEL57 - gfs2_edit: Fix bitmap editing function
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=db… Commit: dbbb859091a700db2fc4dcd4e4df4a0dfdaa84b1 Parent: f09ef2ba0c4f4e6fb7a28138c36e2c4c38816bf5 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Thu Feb 3 09:52:32 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Feb 3 09:52:32 2011 -0600 gfs2_edit: Fix bitmap editing function The bitmap editing function wasn't reading in the rgrp, so that it would fail with a NULL pointer dereference. rhbz#656371 --- gfs2/edit/hexedit.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index c4249e1..6604376 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -2572,23 +2572,28 @@ static void find_change_block_alloc(int *newval) if (ablock == sbd.sb_addr) printf("3 (the superblock is not in the bitmap)\n"); else { - if (newval) { - if (gfs2_set_bitmap(&sbd, ablock, *newval)) - printf("-1 (block invalid or part of an rgrp).\n"); - else - printf("%d\n", *newval); - } else { - rgd = gfs2_blk2rgrpd(&sbd, ablock); - if (rgd) { - gfs2_rgrp_read(&sbd, rgd); + rgd = gfs2_blk2rgrpd(&sbd, ablock); + if (rgd) { + gfs2_rgrp_read(&sbd, rgd); + if (newval) { + if (gfs2_set_bitmap(&sbd, ablock, *newval)) + printf("-1 (block invalid or part of an rgrp).\n"); + else + printf("%d\n", *newval); + } else { type = gfs2_get_bitmap(&sbd, ablock, rgd); - gfs2_rgrp_relse(rgd); + if (type < 0) { + printf("-1 (block invalid or part of " + "an rgrp).\n"); + exit(-1); + } printf("%d (%s)\n", type, allocdesc[gfs1][type]); - } else { - gfs2_rgrp_free(&sbd.rglist); - printf("-1 (block invalid or part of an rgrp).\n"); - exit(-1); } + gfs2_rgrp_relse(rgd); + } else { + gfs2_rgrp_free(&sbd.rglist); + printf("-1 (block invalid or part of an rgrp).\n"); + exit(-1); } } gfs2_rgrp_free(&sbd.rglist);

1 0

cluster: RHEL6 - fence_scsi: properly log errors for all commands
by rohara 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b3… Commit: b3e375c0554149173390b542de1ef3674da3d128 Parent: f5e2f9078450566f543eb03d22cf9078af9a9c07 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Tue Jan 25 11:16:10 2011 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Wed Feb 2 20:41:15 2011 -0600 fence_scsi: properly log errors for all commands There are a number of places in fence_scsi that call sg_persist commands via Perl's qx command. If an error occurs, the script simply dies and reports the name of the subroutine that the script died in. This can be improved by replacing the die call with log_error, such that any errors get properly written to the logfile, if any. This patch also logs the error code returned from the failed command. This patch also redirects stderr to /dev/null for all commands executed via qx. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> Reviewed-by: Lon Hohberger <lhh(a)redhat.com> --- fence/agents/scsi/fence_scsi.pl | 99 ++++++++++++++++++++++++++++++-------- 1 files changed, 78 insertions(+), 21 deletions(-) diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl index efeeba3..ae658ab 100644 --- a/fence/agents/scsi/fence_scsi.pl +++ b/fence/agents/scsi/fence_scsi.pl @@ -185,14 +185,20 @@ sub do_register ($$$) my $cmd; my $out; + my $err; do_reset ($dev); $cmd = "sg_persist -n -o -G -K $host_key -S $node_key -d $dev"; $cmd .= " -Z" if (defined $opt_a); - $out = qx { $cmd }; + $out = qx { $cmd 2> /dev/null }; + $err = ($?>>8); - die "[error]: $self\n" if ($?>>8); + if ($err != 0) { + log_error ("$self (err=$err)"); + } + + # die "[error]: $self\n" if ($?>>8); return; } @@ -216,14 +222,20 @@ sub do_register_ignore ($$) my $cmd; my $out; + my $err; do_reset ($dev); $cmd = "sg_persist -n -o -I -S $node_key -d $dev"; $cmd .= " -Z" if (defined $opt_a); - $out = qx { $cmd }; + $out = qx { $cmd 2> /dev/null }; + $err = ($?>>8); - die "[error]: $self ($dev)\n" if ($?>>8); + if ($err != 0) { + log_error ("$self (err=$err)"); + } + + # die "[error]: $self ($dev)\n" if ($?>>8); return; } @@ -236,9 +248,14 @@ sub do_reserve ($$) log_debug ("$self (host_key=$host_key, dev=$dev)"); my $cmd = "sg_persist -n -o -R -T 5 -K $host_key -d $dev"; - my $out = qx { $cmd }; + my $out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); - die "[error]: $self\n" if ($?>>8); + if ($err != 0) { + log_error ("$self (err=$err)"); + } + + # die "[error]: $self\n" if ($?>>8); return; } @@ -251,9 +268,14 @@ sub do_release ($$) log_debug ("$self (host_key=$host_key, dev=$dev)"); my $cmd = "sg_persist -n -o -L -T 5 -K $host_key -d $dev"; - my $out = qx { $cmd }; + my $out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); - die "[error]: $self\n" if ($?>>8); + if ($err != 0) { + log_error ("$self (err=$err)"); + } + + # die "[error]: $self\n" if ($?>>8); return; } @@ -266,9 +288,14 @@ sub do_preempt ($$$) log_debug ("$self (host_key=$host_key, node_key=$node_key, dev=$dev)"); my $cmd = "sg_persist -n -o -P -T 5 -K $host_key -S $node_key -d $dev"; - my $out = qx { $cmd }; + my $out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); + + if ($err != 0) { + log_error ("$self (err=$err)"); + } - die "[error]: $self\n" if ($?>>8); + # die "[error]: $self\n" if ($?>>8); return; } @@ -281,9 +308,14 @@ sub do_preempt_abort ($$$) log_debug ("$self (host_key=$host_key, node_key=$node_key, dev=$dev)"); my $cmd = "sg_persist -n -o -A -T 5 -K $host_key -S $node_key -d $dev"; - my $out = qx { $cmd }; + my $out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); + + if ($err != 0) { + log_error ("$self (err=$err)"); + } - die "[error]: $self\n" if ($?>>8); + # die "[error]: $self\n" if ($?>>8); return; } @@ -343,9 +375,14 @@ sub get_node_id ($) my $node_id; my $cmd = "cman_tool nodes -n $_[0] -F id"; - my $out = qx { $cmd }; + my $out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); - die "[error]: $self\n" if ($?>>8); + if ($err != 0) { + log_error ("$self (err=$err)"); + } + + # die "[error]: $self\n" if ($?>>8); chomp ($out); @@ -360,9 +397,14 @@ sub get_cluster_id () my $cluster_id; my $cmd = "cman_tool status"; - my @out = qx { $cmd }; + my @out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); - die "[error]: $self\n" if ($?>>8); + if ($err != 0) { + log_error ("$self (err=$err)"); + } + + # die "[error]: $self\n" if ($?>>8); foreach (@out) { chomp; @@ -388,8 +430,13 @@ sub get_devices_clvm () " devices { preferred_names = [ \"^/dev/dm\" ] }'"; my @out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); + + if ($err != 0) { + log_error ("$self (err=$err)"); + } - die "[error]: $self\n" if ($?>>8); + # die "[error]: $self\n" if ($?>>8); foreach (@out) { chomp; @@ -479,9 +526,14 @@ sub get_registration_keys ($) my @keys; my $cmd = "sg_persist -n -i -k -d $dev"; - my @out = qx { $cmd }; + my @out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); + + if ($err != 0) { + log_error ("$self (err=$err)"); + } - die "[error]: $self\n" if ($?>>8); + # die "[error]: $self\n" if ($?>>8); foreach (@out) { chomp; @@ -500,9 +552,14 @@ sub get_reservation_key ($) my $key; my $cmd = "sg_persist -n -i -r -d $dev"; - my @out = qx { $cmd }; + my @out = qx { $cmd 2> /dev/null }; + my $err = ($?>>8); + + if ($err != 0) { + log_error ("$self (err=$err)"); + } - die "[error]: $self\n" if ($?>>8); + # die "[error]: $self\n" if ($?>>8); foreach (@out) { chomp;

1 0

cluster: RHEL6 - cman: Minor fixes for checkquorum script
by Chris Feist 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f5… Commit: f5e2f9078450566f543eb03d22cf9078af9a9c07 Parent: bedaeebc12fac2e5568249357835f210174f4240 Author: Chris Feist <cfeist(a)redhat.com> AuthorDate: Tue Feb 1 15:06:36 2011 -0600 Committer: Chris Feist <cfeist(a)redhat.com> CommitterDate: Wed Feb 2 16:04:42 2011 -0600 cman: Minor fixes for checkquorum script Remove all references to self-fencing Removed absolute path the binaries in checkquorum Added missing uninstall information for SHAREDIRTEX --- cman/scripts/checkquorum | 14 +++++++------- make/uninstall.mk | 3 +++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/cman/scripts/checkquorum b/cman/scripts/checkquorum index 43cbc6d..61934cd 100755 --- a/cman/scripts/checkquorum +++ b/cman/scripts/checkquorum @@ -26,14 +26,14 @@ if (($#ARGV != -1) && ($ARGV[0] eq "repair")) { if (!quorum()) { if (has_quorum_already_been_formed()) { - debug("Quorum has already existed, node can be self fenced!\n"); + debug("Quorum has already existed, node can be rebooted!\n"); if (-e $timerfile) { $tf = open (FILE, "$timerfile"); $time = <FILE>; close (FILE); $timediff = time() - $time; if ($timediff >= $wait_time) { - self_fence() + reboot() } else { $remaining = $wait_time - $timediff; debug("Time has not exceeded wait time ($remaining seconds remaining).\n"); @@ -45,16 +45,16 @@ if (!quorum()) { close (FILE); } } else { - debug("This is a new startup no self-fencing will occur.\n"); + debug("This is a new startup no reboot will occur.\n"); `rm -f $timerfile`; } } else { - debug("Quorum exists, no self-fencing should occur.\n"); + debug("Quorum exists, no reboot should occur.\n"); `rm -f $timerfile`; } sub has_quorum_already_been_formed { - $oe = `/usr/sbin/corosync-objctl 2>&1 | grep -E "runtime.totem.pg.mrp.srp.operational_entered|Could not initialize objdb library|Cannot connect to quorum service" `; + $oe = `corosync-objctl 2>&1 | grep -E "runtime.totem.pg.mrp.srp.operational_entered|Could not initialize objdb library|Cannot connect to quorum service" `; if ($oe =~ /^Could not/ || $oe =~ /^Cannot/) { debug("corosync is not running\n"); exit 0; @@ -79,8 +79,8 @@ sub quorum { return 0; } -sub self_fence { - debug("Self fencing commencing...\n"); +sub reboot { + debug("Reboot commencing...\n"); `rm -f $timerfile`; if ($hardreboot == 1) { `echo 1 > /proc/sys/kernel/sysrq`; diff --git a/make/uninstall.mk b/make/uninstall.mk index 786faca..bbf7edc 100644 --- a/make/uninstall.mk +++ b/make/uninstall.mk @@ -47,6 +47,9 @@ endif ifdef PKGCONF ${UNINSTALL} ${PKGCONF} ${pkgconfigdir} endif +ifdef SHAREDIRTEX + ${UNINSTALL} ${SHAREDIRTEX} ${sharedir} +endif ifdef SHAREDIRT ${UNINSTALL} ${SHAREDIRT} ${sharedir} endif

1 0

cluster: RHEL6 - cman: Added checkquorum script for self fencing
by Chris Feist 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=be… Commit: bedaeebc12fac2e5568249357835f210174f4240 Parent: 8fde4dae1ee517ca1f2ce2c48d006797e59e923e Author: Chris Feist <cfeist(a)redhat.com> AuthorDate: Tue Feb 1 14:15:04 2011 -0600 Committer: Chris Feist <cfeist(a)redhat.com> CommitterDate: Wed Feb 2 16:04:36 2011 -0600 cman: Added checkquorum script for self fencing A checkquorum script has been added which when copied to the /etc/watchdog.d directory will cause the machine to node to reboot itself if it has lost quorum for ~60 seconds. Resolves: rhbz#560700 --- cman/Makefile | 2 +- cman/man/Makefile | 3 +- cman/man/checkquorum.8 | 29 ++++++++++++++ cman/scripts/Makefile | 10 +++++ cman/scripts/checkquorum | 97 ++++++++++++++++++++++++++++++++++++++++++++++ make/install.mk | 4 ++ 6 files changed, 143 insertions(+), 2 deletions(-) diff --git a/cman/Makefile b/cman/Makefile index ead0baa..1cf8bc9 100644 --- a/cman/Makefile +++ b/cman/Makefile @@ -1,4 +1,4 @@ include ../make/defines.mk include $(OBJDIR)/make/passthrough.mk -SUBDIRS=lib cman_tool daemon qdisk notifyd init.d man +SUBDIRS=lib cman_tool daemon qdisk notifyd init.d man scripts diff --git a/cman/man/Makefile b/cman/man/Makefile index df20abb..f7fbebf 100644 --- a/cman/man/Makefile +++ b/cman/man/Makefile @@ -5,7 +5,8 @@ MANTARGET= \ qdiskd.8 \ mkqdisk.8 \ cmannotifyd.8 \ - cman_notify.8 + cman_notify.8 \ + checkquorum.8 include ../../make/defines.mk include $(OBJDIR)/make/install.mk diff --git a/cman/man/checkquorum.8 b/cman/man/checkquorum.8 new file mode 100644 index 0000000..96f61f0 --- /dev/null +++ b/cman/man/checkquorum.8 @@ -0,0 +1,29 @@ +.TH "checkquorum" "8" "February 2011" "" "Check Quorum Watchdog Script" +.SH "NAME" +checkquorum \- Check Quorum Watchdog Script +.SH "SYNOPSIS" +\fBcheckquorum +.SH "DESCRIPTION" +.PP +The \fBcheckquorum\fP watchdog script, when copied to the +.IR /etc/watchdog.d +directory and after enabling/starting the watchdog daemon causes the node to reboot if quorum is +lost and not regained within a user configurable amount of time (default: 60 seconds). +.SH "OPTIONS" +The checkquorum script includes several options which can be set by editing +the script with a text editor. +.TP +.BR $wait_time +Amount of time in seconds to wait after quorum is lost before trigger a reboot +(Default: 60 seconds). +.TP +.BR $hardreboot +Instantly reboot the machine without cleanly shutting down the system. +Useful when the machine may hang on reboot. Set to 1 to hard reboot the +system, 0 to do a normal reboot. +.SH "NOTES" +\fBcheckquorum\fP should never be called outside of watchdog except for +debugging purposes. + +.SH "SEE ALSO" +watchdog(8) diff --git a/cman/scripts/Makefile b/cman/scripts/Makefile new file mode 100644 index 0000000..b4866c8 --- /dev/null +++ b/cman/scripts/Makefile @@ -0,0 +1,10 @@ +SHAREDIRTEX=checkquorum + +include ../../make/defines.mk +include $(OBJDIR)/make/clean.mk +include $(OBJDIR)/make/install.mk +include $(OBJDIR)/make/uninstall.mk + +all: + +clean: generalclean diff --git a/cman/scripts/checkquorum b/cman/scripts/checkquorum new file mode 100755 index 0000000..43cbc6d --- /dev/null +++ b/cman/scripts/checkquorum @@ -0,0 +1,97 @@ +#!/usr/bin/perl -w +# Quorum detection watchdog script +# +# This script will return -2 if the node had quorum at one point +# and then subsequently lost it +# +# Copyright 2011 Red Hat, Inc. + +# Amount of time in seconds to wait after quorum is lost to fail script +$wait_time = 60; + +# Hard Reboot the system (doesn't cleanly shut down the system) +$hardreboot = 0; + +# Location of temporary file to capture timeouts +$timerfile = "/var/run/cluster/checkquorum-timer"; + +# Enable debug messages (0 to disable, 1 to enable) +$debugval = 0; + +# If command is called attempting to 'repair' we automatically fail +if (($#ARGV != -1) && ($ARGV[0] eq "repair")) { + debug ("Failing on repair\n"); + exit 1; +} + +if (!quorum()) { + if (has_quorum_already_been_formed()) { + debug("Quorum has already existed, node can be self fenced!\n"); + if (-e $timerfile) { + $tf = open (FILE, "$timerfile"); + $time = <FILE>; + close (FILE); + $timediff = time() - $time; + if ($timediff >= $wait_time) { + self_fence() + } else { + $remaining = $wait_time - $timediff; + debug("Time has not exceeded wait time ($remaining seconds remaining).\n"); + } + } else { + debug("Creating timer file...\n"); + $tf = open (FILE, ">$timerfile"); + print FILE time(); + close (FILE); + } + } else { + debug("This is a new startup no self-fencing will occur.\n"); + `rm -f $timerfile`; + } +} else { + debug("Quorum exists, no self-fencing should occur.\n"); + `rm -f $timerfile`; +} + +sub has_quorum_already_been_formed { + $oe = `/usr/sbin/corosync-objctl 2>&1 | grep -E "runtime.totem.pg.mrp.srp.operational_entered|Could not initialize objdb library|Cannot connect to quorum service" `; + if ($oe =~ /^Could not/ || $oe =~ /^Cannot/) { + debug("corosync is not running\n"); + exit 0; + } + $oe =~ s/.*=//; + if ($oe > 1) { + return 1; + } else { + return 0; + } +} + +sub quorum { + $cq = `corosync-quorumtool -s 2>&1 | grep -E "Quorate:|Cannot connect to quorum service"`; + if ($cq =~ /Cannot connect to quorum service/) { + debug("corosync is not running\n"); + exit 0; + } + $cq =~ s/Quorate: *//; + chomp ($cq); + return 1 if ($cq eq "Yes"); + return 0; +} + +sub self_fence { + debug("Self fencing commencing...\n"); + `rm -f $timerfile`; + if ($hardreboot == 1) { + `echo 1 > /proc/sys/kernel/sysrq`; + `echo b > /proc/sysrq-trigger`; + } + exit -2; +} + +sub debug { + $out = pop(@_); + if ($debugval) { + print $out; + } +} diff --git a/make/install.mk b/make/install.mk index 8e1bcd6..823184b 100644 --- a/make/install.mk +++ b/make/install.mk @@ -78,6 +78,10 @@ ifdef PKGCONF install -d ${pkgconfigdir} install -m644 ${PKGCONF} ${pkgconfigdir} endif +ifdef SHAREDIRTEX + install -d ${sharedir} + install -m755 ${SHAREDIRTEX} ${sharedir} +endif ifdef SHAREDIRT install -d ${sharedir} install -m644 ${SHAREDIRT} ${sharedir}

1 0

cluster: RHEL57 - gfs2_edit: add -d option for printing journal details
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f0… Commit: f09ef2ba0c4f4e6fb7a28138c36e2c4c38816bf5 Parent: 524dca1221b851159bf45a702f111bd8952036d7 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Feb 2 14:39:10 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 14:39:10 2011 -0600 gfs2_edit: add -d option for printing journal details This patch adds a new parameter "-d" to gfs2_edit. If -d is specified, printing a journal will dump the details of the metadata blocks contained in the journal, as well as the usual log descriptors and log headers. This makes it easier to find dinode revisions in the journal. rhbz#656371 --- gfs2/edit/hexedit.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 5432fa2..c4249e1 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -52,6 +52,7 @@ struct gfs2_leaf *lleaf; struct gfs2_log_header *llh; struct gfs2_log_descriptor *lld; int pgnum; +int details = 0; const char *prog_name; @@ -3152,13 +3153,23 @@ static void check_journal_wrap(uint64_t seq, uint64_t *highest_seq) *highest_seq = seq; } +int is_meta(struct gfs2_buffer_head *bh) +{ + uint32_t check_magic = ((struct gfs2_meta_header *)(bh->b_data))->mh_magic; + + check_magic = be32_to_cpu(check_magic); + if (check_magic == GFS2_MAGIC) + return 1; + return 0; +} + /* ------------------------------------------------------------------------ */ /* dump_journal - dump a journal file's contents. */ /* ------------------------------------------------------------------------ */ static void dump_journal(const char *journal) { struct gfs2_buffer_head *j_bh = NULL, dummy_bh; - uint64_t jblock, j_size, jb, abs_block; + uint64_t jblock, j_size, jb, abs_block, saveblk; int error, start_line, journal_num; struct gfs2_inode *j_inode = NULL; int ld_blocks = 0; @@ -3274,6 +3285,11 @@ static void dump_journal(const char *journal) ld_blocks -= print_ld_blocks((uint64_t *)dummy_bh.b_data, (dummy_bh.b_data + sbd.bsize), start_line); + } else if (details && is_meta(&dummy_bh)) { + saveblk = block; + block = abs_block; + display(0); + block = saveblk; } } brelse(j_bh); @@ -3299,6 +3315,7 @@ static void usage(void) fprintf(stderr,"rgflags rgnum [new flags] - print or modify flags for rg #rgnum (0 - X)\n"); fprintf(stderr,"-V prints version number.\n"); fprintf(stderr,"-c 1 selects alternate color scheme 1\n"); + fprintf(stderr,"-d prints details (for printing journals)\n"); fprintf(stderr,"-p prints GFS2 structures or blocks to stdout.\n"); fprintf(stderr," sb - prints the superblock.\n"); fprintf(stderr," size - prints the filesystem size.\n"); @@ -3384,6 +3401,9 @@ static void parameterpass1(int argc, char *argv[], int i) it out later */ dmode = GFS2_MODE; } + else if (!strcasecmp(argv[i], "-d") || + !strcasecmp(argv[i], "-details")) + details = 1; else if (!strcasecmp(argv[i], "savemeta")) termlines = 0; else if (!strcasecmp(argv[i], "savemetaslow"))

1 0

cluster: RHEL57 - gfs2_edit: has problems printing gfs1 journals
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=52… Commit: 524dca1221b851159bf45a702f111bd8952036d7 Parent: 4b4addea8835006a57ab1f8bf6ee9746b2b96e19 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Feb 2 13:29:22 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 14:36:09 2011 -0600 gfs2_edit: has problems printing gfs1 journals The gfs2_edit tool was releasing the buffer too soon while printing out journals. It worked for gfs2 journals, but not for gfs1 journals. This patch moves the buffer release later in the function so that gfs1 journals will print correctly. rhbz#656371 --- gfs2/edit/hexedit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 6b92390..5432fa2 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -2038,7 +2038,6 @@ static uint64_t find_journal_block(const char *journal, uint64_t *j_size) if (!gfs1) do_dinode_extended(&di, jindex_bh); /* parse dir. */ - brelse(jindex_bh); if (gfs1) { struct gfs2_inode *jiinode; @@ -2063,6 +2062,7 @@ static uint64_t find_journal_block(const char *journal, uint64_t *j_size) *j_size = jdi.di_size; brelse(j_bh); } + brelse(jindex_bh); return jblock; }

1 0

cluster: RHEL57 - gfs2_edit: print large block numbers better
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4b… Commit: 4b4addea8835006a57ab1f8bf6ee9746b2b96e19 Parent: ac1d1033af634d97e266f35d419233266ea782d8 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Feb 2 13:25:27 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 14:36:09 2011 -0600 gfs2_edit: print large block numbers better The gfs2_edit tool was obscuring block number on the display when the block number got big enough. This patch makes it print the block number so that it looks better when it gets big. rhbz#656371 --- gfs2/edit/hexedit.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 6668f89..6b92390 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -1077,18 +1077,11 @@ int display_block_type(int from_restore) if (termlines) { if (edit_row[dmode] == -1) COLORS_NORMAL; - move(line,30); } - else - print_gfs2(" "); - if (!from_restore) { - print_gfs2("of %" PRIu64 " (0x%" PRIx64 ")", max_block, + print_gfs2(" "); + if (!from_restore) + print_gfs2("of %" PRIu64 " (0x%" PRIx64 ") ", max_block, max_block); - if (termlines) - move(line, 55); - else - printf(" "); - } if (block == RGLIST_DUMMY_BLOCK) { ret_type = GFS2_METATYPE_RG; struct_len = gfs1 ? sizeof(struct gfs_rgrp) : sizeof(struct gfs2_rgrp);

1 0

cluster: RHEL57 - gfs2_edit: handle corrupt file systems better
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ac… Commit: ac1d1033af634d97e266f35d419233266ea782d8 Parent: dff0fe59568e9b4b09191f05ab7c718fc1b19b7e Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Feb 2 13:19:54 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 14:36:09 2011 -0600 gfs2_edit: handle corrupt file systems better This patch adds some checks to gfs2_edit so that it will not segfault when it encounters certain types of file system corruption. This makes it a more useful tool for examining corrupt metadata sets. rhbz#656371 --- gfs2/edit/hexedit.c | 7 ++++++- gfs2/libgfs2/fs_bits.c | 2 ++ gfs2/libgfs2/rgrp.c | 7 +++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 5a05114..6668f89 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -1811,7 +1811,12 @@ static void read_superblock(int fd) if (!sbd.bsize) sbd.bsize = GFS2_DEFAULT_BSIZE; compute_constants(&sbd); - block = 0x10 * (GFS2_DEFAULT_BSIZE / sbd.bsize); + if (gfs1 || (sbd.sd_sb.sb_header.mh_magic == GFS2_MAGIC && + sbd.sd_sb.sb_header.mh_type == GFS2_METATYPE_SB)) + block = 0x10 * (GFS2_DEFAULT_BSIZE / sbd.bsize); + else { + block = starting_blk = 0; + } device_geometry(&sbd); fix_device_geometry(&sbd); if(gfs1) { diff --git a/gfs2/libgfs2/fs_bits.c b/gfs2/libgfs2/fs_bits.c index 69b16e9..5b55cec 100644 --- a/gfs2/libgfs2/fs_bits.c +++ b/gfs2/libgfs2/fs_bits.c @@ -243,6 +243,8 @@ int gfs2_get_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, if (i >= rgd->ri.ri_length) return -1; + if (!rgd->bh || !rgd->bh[i]) + return 0; byte = (unsigned char *)(rgd->bh[i]->b_data + bits->bi_offset) + (rgrp_block/GFS2_NBBY - bits->bi_start); bit = (rgrp_block % GFS2_NBBY) * GFS2_BIT_SIZE; diff --git a/gfs2/libgfs2/rgrp.c b/gfs2/libgfs2/rgrp.c index 3cb049b..438d320 100644 --- a/gfs2/libgfs2/rgrp.c +++ b/gfs2/libgfs2/rgrp.c @@ -169,8 +169,11 @@ void gfs2_rgrp_relse(struct rgrp_list *rgd) int x, length = rgd->ri.ri_length; for (x = 0; x < length; x++) { - brelse(rgd->bh[x]); - rgd->bh[x] = NULL; + if (rgd->bh) { + if (rgd->bh[x]) + brelse(rgd->bh[x]); + rgd->bh[x] = NULL; + } } }

1 0

cluster: RHEL57 - gfs2_edit: display block allocation on rgrps and bitmaps
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=df… Commit: dff0fe59568e9b4b09191f05ab7c718fc1b19b7e Parent: eb9fa6b1817be8295e48a7c8a91b0dbaf3c04312 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Dec 13 14:07:59 2010 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 14:36:09 2011 -0600 gfs2_edit: display block allocation on rgrps and bitmaps This patch displays the bit settings for bits as you walk your cursor through gfs2 bitmaps. rhbz#656371 --- gfs2/edit/hexedit.c | 74 ++++++++++++++++++++++++++++++++++++++++++++------ gfs2/libgfs2/rgrp.c | 6 ++++ 2 files changed, 71 insertions(+), 9 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 380845a..5a05114 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -70,7 +70,9 @@ extern void restoremeta(const char *in_fn, const char *out_device, /* for assigning string fields: */ #define checkassigns(strfield, struct, member, val) do { \ if (strcmp(#member, strfield) == 0) { \ - memcpy(struct->member, val, sizeof(struct->member)); \ + memset(struct->member, 0, sizeof(struct->member)); \ + strncpy((char *)struct->member, (char *)val, \ + sizeof(struct->member)); \ return 0; \ } \ } while(0) @@ -1106,7 +1108,7 @@ int display_block_type(int from_restore) break; case GFS2_METATYPE_RB: /* 3 */ print_gfs2("(rsrc grp bitblk)"); - struct_len = 512; + struct_len = sizeof(struct gfs2_meta_header); break; case GFS2_METATYPE_DI: /* 4 */ print_gfs2("(disk inode)"); @@ -1162,8 +1164,7 @@ int display_block_type(int from_restore) struct_len = sbd.bsize; break; } - } - else + } else struct_len = sbd.bsize; eol(0); if (from_restore) @@ -1175,8 +1176,11 @@ int display_block_type(int from_restore) rgd = gfs2_blk2rgrpd(&sbd, block); if (rgd) { gfs2_rgrp_read(&sbd, rgd); - type = gfs2_get_bitmap(&sbd, block, rgd); - gfs2_rgrp_relse(rgd); + if ((*(bh->b_data + 7) == GFS2_METATYPE_RG) || + (*(bh->b_data + 7) == GFS2_METATYPE_RB)) + type = 4; + else + type = gfs2_get_bitmap(&sbd, block, rgd); } else type = 4; screen_chunk_size = ((termlines - 4) * 16) >> 8 << 8; @@ -1188,7 +1192,60 @@ int display_block_type(int from_restore) sbd.bsize / screen_chunk_size + 1 : sbd.bsize / screen_chunk_size, allocdesc[gfs1][type]); /*eol(9);*/ - } + if ((*(bh->b_data + 7) == GFS2_METATYPE_RG)) { + int ptroffset = edit_row[dmode] * 16 + edit_col[dmode]; + + if (ptroffset >= struct_len || pgnum) { + int blknum, b, btype; + + blknum = pgnum * screen_chunk_size; + blknum += (ptroffset - struct_len); + blknum *= 4; + blknum += rgd->ri.ri_data0; + + print_gfs2(" blk "); + for (b = blknum; b < blknum + 4; b++) { + btype = gfs2_get_bitmap(&sbd, b, rgd); + print_gfs2("0x%x-%s ", b, + allocdesc[gfs1][btype]); + } + } + } else if ((*(bh->b_data + 7) == GFS2_METATYPE_RB)) { + int ptroffset = edit_row[dmode] * 16 + edit_col[dmode]; + + if (ptroffset >= struct_len || pgnum) { + int blknum, b, btype, rb_number; + + rb_number = block - rgd->ri.ri_addr; + blknum = 0; + /* count the number of bytes representing + blocks prior to the displayed screen. */ + for (b = 0; b < rb_number; b++) { + struct_len = (b ? + sizeof(struct gfs2_meta_header) : + sizeof(struct gfs2_rgrp)); + blknum += (sbd.bsize - struct_len); + } + struct_len = sizeof(struct gfs2_meta_header); + /* add the number of bytes on this screen */ + blknum += (ptroffset - struct_len); + /* factor in the page number */ + blknum += pgnum * screen_chunk_size; + /* convert bytes to blocks */ + blknum *= GFS2_NBBY; + /* add the starting offset for this rgrp */ + blknum += rgd->ri.ri_data0; + print_gfs2(" blk "); + for (b = blknum; b < blknum + 4; b++) { + btype = gfs2_get_bitmap(&sbd, b, rgd); + print_gfs2("0x%x-%s ", b, + allocdesc[gfs1][btype]); + } + } + } + if (rgd) + gfs2_rgrp_relse(rgd); + } if (block == sbd.sd_sb.sb_root_dir.no_addr) print_gfs2("--------------- Root directory ------------------"); else if (!gfs1 && block == sbd.sd_sb.sb_master_dir.no_addr) @@ -2572,7 +2629,6 @@ static void process_field(const char *field, const char *nstr) fblock = blockstack[blockhist % BLOCK_STACK_SIZE].block; rbh = bread(&sbd, fblock); type = get_block_type(rbh); - switch (type) { case GFS2_METATYPE_SB: gfs2_sb_in(&lsb, rbh); @@ -2581,7 +2637,7 @@ static void process_field(const char *field, const char *nstr) gfs2_sb_assigns(&lsb, field, nstr); else gfs2_sb_assignval(&lsb, field, newval); - gfs2_sb_out(&sb, rbh); + gfs2_sb_out(&lsb, rbh); if (!termlines) gfs2_sb_printval(&lsb, field); } else { diff --git a/gfs2/libgfs2/rgrp.c b/gfs2/libgfs2/rgrp.c index bd36038..3cb049b 100644 --- a/gfs2/libgfs2/rgrp.c +++ b/gfs2/libgfs2/rgrp.c @@ -115,12 +115,18 @@ struct rgrp_list *gfs2_blk2rgrpd(struct gfs2_sbd *sdp, uint64_t blk) ri = &prev_rgd->ri; if (ri->ri_data0 <= blk && blk < ri->ri_data0 + ri->ri_data) return prev_rgd; + if (blk >= ri->ri_addr && blk < ri->ri_addr + ri->ri_length) + return prev_rgd; } for (tmp = sdp->rglist.next; tmp != &sdp->rglist; tmp = tmp->next) { rgd = osi_list_entry(tmp, struct rgrp_list, list); ri = &rgd->ri; + if (blk >= ri->ri_addr && blk < ri->ri_addr + ri->ri_length) { + prev_rgd = rgd; + return rgd; + } if (ri->ri_data0 <= blk && blk < ri->ri_data0 + ri->ri_data) { prev_rgd = rgd; return rgd;

1 0

cluster: RHEL57 - gfs2_edit: print field names in right column
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=eb… Commit: eb9fa6b1817be8295e48a7c8a91b0dbaf3c04312 Parent: 0593e1bcf00b6548805495409016034c2c14391a Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Dec 13 13:48:54 2010 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 14:36:09 2011 -0600 gfs2_edit: print field names in right column This patch prints the field names in the righthand column as you scroll around the screen in hex mode. Also, I moved the location of the pointer number to print the same way. rhbz#656371 --- gfs2/edit/hexedit.c | 602 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 546 insertions(+), 56 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index e0ff070..380845a 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -45,6 +45,14 @@ const char *allocdesc[2][5] = { {"Free ", "Data ", "Unlnk", "Meta ", "Resrv"}, {"Free ", "Data ", "FreeM", "Meta ", "Resrv"},}; +struct gfs2_rgrp *lrgrp; +struct gfs2_meta_header *lmh; +struct gfs2_dinode *ldi; +struct gfs2_leaf *lleaf; +struct gfs2_log_header *llh; +struct gfs2_log_descriptor *lld; +int pgnum; + const char *prog_name; int display(int identify_only); @@ -88,53 +96,486 @@ extern void restoremeta(const char *in_fn, const char *out_device, } \ } while(0) -static int gfs2_sb_printval(struct gfs2_sb *sb, const char *strfield) -{ - checkprint(strfield, sb, sb_fs_format); - checkprint(strfield, sb, sb_multihost_format); - checkprint(strfield, sb, __pad0); - checkprint(strfield, sb, sb_bsize); - checkprint(strfield, sb, sb_bsize_shift); - checkprint(strfield, sb, __pad1); - checkprint(strfield, sb, sb_master_dir.no_addr); - checkprint(strfield, sb, __pad2.no_addr); - checkprint(strfield, sb, sb_root_dir.no_addr); - checkprints(strfield, sb, sb_lockproto); - checkprints(strfield, sb, sb_locktable); - checkprint(strfield, sb, __pad3.no_addr); - checkprint(strfield, sb, __pad4.no_addr); - if (strcmp(strfield, "sb_uuid") == 0) { - printf("%s\n", str_uuid(sb->sb_uuid)); - return 0; +/* ------------------------------------------------------------------------- + * superblock + * ------------------------------------------------------------------------- */ +const int fieldsize_sb[] = { + sizeof(sb.sb_header.mh_magic), + sizeof(sb.sb_header.mh_type), + sizeof(sb.sb_header.__pad0), + sizeof(sb.sb_header.mh_format), + sizeof(sb.sb_header.__pad1), + sizeof(sb.sb_fs_format), + sizeof(sb.sb_multihost_format), + sizeof(sb.__pad0), + sizeof(sb.sb_bsize), + sizeof(sb.sb_bsize_shift), + sizeof(sb.__pad1), + sizeof(sb.sb_master_dir.no_formal_ino), + sizeof(sb.sb_master_dir.no_addr), + sizeof(sb.__pad2.no_formal_ino), + sizeof(sb.__pad2.no_addr), + sizeof(sb.sb_root_dir.no_formal_ino), + sizeof(sb.sb_root_dir.no_addr), + sizeof(sb.sb_lockproto), + sizeof(sb.sb_locktable), + sizeof(sb.__pad3.no_formal_ino), + sizeof(sb.__pad3.no_addr), + sizeof(sb.__pad4.no_formal_ino), + sizeof(sb.__pad4.no_addr), + sizeof(sb.sb_uuid), + -1 +}; + +const char *fieldnames_sb[] = { + "mh_magic", + "mh_type", + "mh.__pad0", + "mh_format", + "mh.__pad1", + "sb_fs_format", + "sb_multihost_format", + "__pad0", + "sb_bsize", + "sb_bsize_shift", + "__pad1", + "master.no_formal_ino", + "master.no_addr", + "__pad2.no_formal_ino", + "__pad2.no_addr", + "root.no_formal_ino", + "root.no_addr", + "sb_lockproto", + "sb_locktable", + "__pad3.no_formal_ino", + "__pad3.no_addr", + "__pad4.no_formal_ino", + "__pad4.no_addr", + "sb_uuid", +}; + +/* This determines which field the cursor is located in */ +static int which_field_sb(int off) +{ + int i, tot; + + tot = 0; + for (i = 0; fieldsize_sb[i] != -1; i++) { + tot += fieldsize_sb[i]; + if (off < tot) + return i; + } + return -1; +} + +static const char *which_fieldname_sb(int off) +{ + int w = which_field_sb(off); + if (w < 0) + return NULL; + return fieldnames_sb[w]; +} + +/* ------------------------------------------------------------------------- + * rgrp + * ------------------------------------------------------------------------- */ +const int fieldsize_rgrp[] = { + sizeof(lrgrp->rg_header.mh_magic), + sizeof(lrgrp->rg_header.mh_type), + sizeof(lrgrp->rg_header.__pad0), + sizeof(lrgrp->rg_header.mh_format), + sizeof(lrgrp->rg_header.__pad1), + sizeof(lrgrp->rg_flags), + sizeof(lrgrp->rg_free), + sizeof(lrgrp->rg_dinodes), + sizeof(lrgrp->__pad), + sizeof(lrgrp->rg_igeneration), + sizeof(lrgrp->rg_reserved), + -1 +}; + +const char *fieldnames_rgrp[] = { + "mh_magic", + "mh_type", + "mh.__pad0", + "mh_format", + "mh.__pad1", + "rg_flags", + "rg_free", + "rg_dinodes", + "__pad", + "rg_igeneration", + "rg_reserved", +}; + +static int which_field_rgrp(int off) +{ + int i, tot; + + tot = 0; + for (i = 0; fieldsize_rgrp[i] != -1; i++) { + tot += fieldsize_rgrp[i]; + if (off < tot) + return i; + } + return -1; +} + +static const char *which_fieldname_rgrp(int off) +{ + int w = which_field_rgrp(off); + if (w < 0) + return NULL; + return fieldnames_rgrp[w]; +} + +/* ------------------------------------------------------------------------- + * metaheader + * ------------------------------------------------------------------------- */ +const int fieldsize_mh[] = { + sizeof(lmh->mh_magic), + sizeof(lmh->mh_type), + sizeof(lmh->__pad0), + sizeof(lmh->mh_format), + sizeof(lmh->__pad1), + -1 +}; + +const char *fieldnames_mh[] = { + "mh_magic", + "mh_type", + "mh.__pad0", + "mh_format", + "mh.__pad1", +}; + +static int which_field_mh(int off) +{ + int i, tot; + + tot = 0; + for (i = 0; fieldsize_mh[i] != -1; i++) { + tot += fieldsize_mh[i]; + if (off < tot) + return i; + } + return -1; +} + +static const char *which_fieldname_mh(int off) +{ + int w = which_field_mh(off); + if (w < 0) + return NULL; + return fieldnames_mh[w]; +} + +/* ------------------------------------------------------------------------- + * dinode + * ------------------------------------------------------------------------- */ +const int fieldsize_di[] = { + sizeof(ldi->di_header.mh_magic), + sizeof(ldi->di_header.mh_type), + sizeof(ldi->di_header.__pad0), + sizeof(ldi->di_header.mh_format), + sizeof(ldi->di_header.__pad1), + sizeof(ldi->di_num.no_formal_ino), + sizeof(ldi->di_num.no_addr), + sizeof(ldi->di_mode), + sizeof(ldi->di_uid), + sizeof(ldi->di_gid), + sizeof(ldi->di_nlink), + sizeof(ldi->di_size), + sizeof(ldi->di_blocks), + sizeof(ldi->di_atime), + sizeof(ldi->di_mtime), + sizeof(ldi->di_ctime), + sizeof(ldi->di_major), + sizeof(ldi->di_minor), + sizeof(ldi->di_goal_meta), + sizeof(ldi->di_goal_data), + sizeof(ldi->di_generation), + sizeof(ldi->di_flags), + sizeof(ldi->di_payload_format), + sizeof(ldi->__pad1), + sizeof(ldi->di_height), + sizeof(ldi->__pad2), + sizeof(ldi->__pad3), + sizeof(ldi->di_depth), + sizeof(ldi->di_entries), + sizeof(ldi->__pad4.no_formal_ino), + sizeof(ldi->__pad4.no_addr), + sizeof(ldi->di_eattr), + sizeof(ldi->di_atime_nsec), + sizeof(ldi->di_mtime_nsec), + sizeof(ldi->di_ctime_nsec), + sizeof(ldi->di_reserved), + -1 +}; + +const char *fieldnames_di[] = { + "mh_magic", + "mh_type", + "mh.__pad0", + "mh_format", + "mh.__pad1", + "no_formal_ino", + "no_addr", + "di_mode", + "di_uid", + "di_gid", + "di_nlink", + "di_size", + "di_blocks", + "di_atime", + "di_mtime", + "di_ctime", + "di_major", + "di_minor", + "di_goal_meta", + "di_goal_data", + "di_generation", + "di_flags", + "di_payload_format", + "__pad1", + "di_height", + "__pad2", + "__pad3", + "di_depth", + "di_entries", + "__pad4.no_formal_ino", + "__pad4.no_addr", + "di_eattr", + "di_atime_nsec", + "di_mtime_nsec", + "di_ctime_nsec", + "di_reserved", +}; + +static int which_field_di(int off) +{ + int i, tot; + + tot = 0; + for (i = 0; fieldsize_di[i] != -1; i++) { + tot += fieldsize_di[i]; + if (off < tot) + return i; } + return -1; +} + +static const char *which_fieldname_di(int off) +{ + int w = which_field_di(off); + if (w < 0) + return NULL; + return fieldnames_di[w]; +} + +/* ------------------------------------------------------------------------- + * directory leaf + * ------------------------------------------------------------------------- */ +const int fieldsize_lf[] = { + sizeof(lleaf->lf_header.mh_magic), + sizeof(lleaf->lf_header.mh_type), + sizeof(lleaf->lf_header.__pad0), + sizeof(lleaf->lf_header.mh_format), + sizeof(lleaf->lf_header.__pad1), + sizeof(lleaf->lf_depth), + sizeof(lleaf->lf_entries), + sizeof(lleaf->lf_dirent_format), + sizeof(lleaf->lf_next), + sizeof(lleaf->lf_reserved), + -1 +}; + +const char *fieldnames_lf[] = { + "mh_magic", + "mh_type", + "mh.__pad0", + "mh_format", + "mh.__pad1", + "lf_depth", + "lf_entries", + "lf_dirent_format", + "lf_next", + "lf_reserved", +}; + +static int which_field_lf(int off) +{ + int i, tot; + + tot = 0; + for (i = 0; fieldsize_lf[i] != -1; i++) { + tot += fieldsize_lf[i]; + if (off < tot) + return i; + } + return -1; +} + +static const char *which_fieldname_lf(int off) +{ + int w = which_field_lf(off); + if (w < 0) + return NULL; + return fieldnames_lf[w]; +} + +/* ------------------------------------------------------------------------- + * log header + * ------------------------------------------------------------------------- */ +const int fieldsize_lh[] = { + sizeof(llh->lh_header.mh_magic), + sizeof(llh->lh_header.mh_type), + sizeof(llh->lh_header.__pad0), + sizeof(llh->lh_header.mh_format), + sizeof(llh->lh_header.__pad1), + sizeof(llh->lh_sequence), + sizeof(llh->lh_flags), + sizeof(llh->lh_tail), + sizeof(llh->lh_blkno), + sizeof(llh->lh_hash), + -1 +}; + +const char *fieldnames_lh[] = { + "mh_magic", + "mh_type", + "mh.__pad0", + "mh_format", + "mh.__pad1", + "lh_sequence", + "lh_flags", + "lh_tail", + "lh_blkno", + "lh_hash", +}; + +static int which_field_lh(int off) +{ + int i, tot; + + tot = 0; + for (i = 0; fieldsize_lh[i] != -1; i++) { + tot += fieldsize_lh[i]; + if (off < tot) + return i; + } + return -1; +} +static const char *which_fieldname_lh(int off) +{ + int w = which_field_lh(off); + if (w < 0) + return NULL; + return fieldnames_lh[w]; +} + +/* ------------------------------------------------------------------------- + * log descriptor + * ------------------------------------------------------------------------- */ +const int fieldsize_ld[] = { + sizeof(lld->ld_header.mh_magic), + sizeof(lld->ld_header.mh_type), + sizeof(lld->ld_header.__pad0), + sizeof(lld->ld_header.mh_format), + sizeof(lld->ld_header.__pad1), + sizeof(lld->ld_type), + sizeof(lld->ld_length), + sizeof(lld->ld_data1), + sizeof(lld->ld_data2), + sizeof(lld->ld_reserved), + -1 +}; + +const char *fieldnames_ld[] = { + "mh_magic", + "mh_type", + "mh.__pad0", + "mh_format", + "mh.__pad1", + "ld_type", + "ld_length", + "ld_data1", + "ld_data2", + "ld_reserved", +}; + +static int which_field_ld(int off) +{ + int i, tot; + + tot = 0; + for (i = 0; fieldsize_ld[i] != -1; i++) { + tot += fieldsize_ld[i]; + if (off < tot) + return i; + } return -1; } -static int gfs2_sb_assignval(struct gfs2_sb *sb, const char *strfield, +static const char *which_fieldname_ld(int off) +{ + int w = which_field_ld(off); + if (w < 0) + return NULL; + return fieldnames_ld[w]; +} + +/* ------------------------------------------------------------------------- + * field-related functions: + * ------------------------------------------------------------------------- */ +static int gfs2_sb_printval(struct gfs2_sb *lsb, const char *strfield) +{ + checkprint(strfield, lsb, sb_fs_format); + checkprint(strfield, lsb, sb_multihost_format); + checkprint(strfield, lsb, __pad0); + checkprint(strfield, lsb, sb_bsize); + checkprint(strfield, lsb, sb_bsize_shift); + checkprint(strfield, lsb, __pad1); + checkprint(strfield, lsb, sb_master_dir.no_addr); + checkprint(strfield, lsb, __pad2.no_addr); + checkprint(strfield, lsb, sb_root_dir.no_addr); + checkprints(strfield, lsb, sb_lockproto); + checkprints(strfield, lsb, sb_locktable); + checkprint(strfield, lsb, __pad3.no_addr); + checkprint(strfield, lsb, __pad4.no_addr); + if (strcmp(strfield, "sb_uuid") == 0) { + printf("%s\n", str_uuid(lsb->sb_uuid)); + return 0; + } + + return -1; + } + +static int gfs2_sb_assignval(struct gfs2_sb *lsb, const char *strfield, uint64_t value) { - checkassign(strfield, sb, sb_fs_format, value); - checkassign(strfield, sb, sb_multihost_format, value); - checkassign(strfield, sb, __pad0, value); - checkassign(strfield, sb, sb_bsize, value); - checkassign(strfield, sb, sb_bsize_shift, value); - checkassign(strfield, sb, __pad1, value); - checkassign(strfield, sb, sb_master_dir.no_addr, value); - checkassign(strfield, sb, __pad2.no_addr, value); - checkassign(strfield, sb, sb_root_dir.no_addr, value); - checkassign(strfield, sb, __pad3.no_addr, value); - checkassign(strfield, sb, __pad4.no_addr, value); + checkassign(strfield, lsb, sb_fs_format, value); + checkassign(strfield, lsb, sb_multihost_format, value); + checkassign(strfield, lsb, __pad0, value); + checkassign(strfield, lsb, sb_bsize, value); + checkassign(strfield, lsb, sb_bsize_shift, value); + checkassign(strfield, lsb, __pad1, value); + checkassign(strfield, lsb, sb_master_dir.no_addr, value); + checkassign(strfield, lsb, __pad2.no_addr, value); + checkassign(strfield, lsb, sb_root_dir.no_addr, value); + checkassign(strfield, lsb, __pad3.no_addr, value); + checkassign(strfield, lsb, __pad4.no_addr, value); return -1; } -static int gfs2_sb_assigns(struct gfs2_sb *sb, const char *strfield, +static int gfs2_sb_assigns(struct gfs2_sb *lsb, const char *strfield, const char *val) { - checkassigns(strfield, sb, sb_lockproto, val); - checkassigns(strfield, sb, sb_locktable, val); - checkassigns(strfield, sb, sb_uuid, val); + checkassigns(strfield, lsb, sb_lockproto, val); + checkassigns(strfield, lsb, sb_locktable, val); + checkassigns(strfield, lsb, sb_uuid, val); return -1; } @@ -728,7 +1169,7 @@ int display_block_type(int from_restore) if (from_restore) return ret_type; if (termlines && dmode == HEX_MODE) { - int type, pgnum; + int type; struct rgrp_list *rgd; rgd = gfs2_blk2rgrpd(&sbd, block); @@ -747,21 +1188,6 @@ int display_block_type(int from_restore) sbd.bsize / screen_chunk_size + 1 : sbd.bsize / screen_chunk_size, allocdesc[gfs1][type]); /*eol(9);*/ - if ((*(bh->b_data + 7) == GFS2_METATYPE_IN) || - (*(bh->b_data + 7) == GFS2_METATYPE_DI && - (*(bh->b_data + 0x8b) || *(bh->b_data + 0x8a)))) { - int ptroffset = edit_row[dmode] * 16 + edit_col[dmode]; - - if (ptroffset >= struct_len || pgnum) { - int pnum; - - pnum = pgnum * screen_chunk_size; - pnum += (ptroffset - struct_len); - pnum /= sizeof(uint64_t); - - print_gfs2(" pointer 0x%x", pnum); - } - } } if (block == sbd.sd_sb.sb_root_dir.no_addr) print_gfs2("--------------- Root directory ------------------"); @@ -814,6 +1240,7 @@ static int hexdump(uint64_t startaddr, int len) int i; uint64_t l; const char *lpBuffer = bh->b_data; + int print_field, cursor_line; strcpy(edit_fmt,"%02x"); pointer = (unsigned char *)lpBuffer + offset; @@ -842,6 +1269,8 @@ static int hexdump(uint64_t startaddr, int len) else COLORS_SPECIAL; /* beyond end of the struct */ } + print_field = -1; + cursor_line = 0; for (i = 0; i < 16; i++) { /* first print it in hex */ /* Figure out if we have a null pointer--for colors */ if (((gfs2_struct_type == GFS2_METATYPE_IN) || @@ -886,6 +1315,8 @@ static int hexdump(uint64_t startaddr, int len) COLORS_HIGHLIGHT; /* in the structure */ memset(estring,0,3); sprintf(estring,"%02x",*pointer); + cursor_line = 1; + print_field = (char *)pointer - bh->b_data; } print_gfs2("%02x",*pointer); if (termlines && line == edit_row[dmode] + 3 && @@ -906,6 +1337,65 @@ static int hexdump(uint64_t startaddr, int len) ptr2++; } print_gfs2("] "); + if (print_field >= 0) { + switch (get_block_type(bh)) { + case GFS2_METATYPE_SB: /* 1 */ + print_gfs2(which_fieldname_sb(print_field)); + break; + case GFS2_METATYPE_RG: /* 2 */ + print_gfs2(which_fieldname_rgrp(print_field)); + break; + case GFS2_METATYPE_RB: /* 3 */ + print_gfs2(which_fieldname_mh(print_field)); + break; + case GFS2_METATYPE_DI: /* 4 */ + print_gfs2(which_fieldname_di(print_field)); + break; + case GFS2_METATYPE_IN: /* 5 */ + print_gfs2(which_fieldname_mh(print_field)); + break; + case GFS2_METATYPE_LF: /* 6 */ + print_gfs2(which_fieldname_lf(print_field)); + break; + case GFS2_METATYPE_JD: + print_gfs2(which_fieldname_mh(print_field)); + break; + case GFS2_METATYPE_LH: + print_gfs2(which_fieldname_lh(print_field)); + break; + case GFS2_METATYPE_LD: + print_gfs2(which_fieldname_ld(print_field)); + break; + case GFS2_METATYPE_EA: + break; + case GFS2_METATYPE_ED: + break; + case GFS2_METATYPE_LB: + break; + case GFS2_METATYPE_QC: + break; + default: + break; + } + } + if (cursor_line) { + if (((*(bh->b_data + 7) == GFS2_METATYPE_IN) || + (*(bh->b_data + 7) == GFS2_METATYPE_DI && + (*(bh->b_data + 0x8b) || *(bh->b_data + 0x8a))))) { + int ptroffset = edit_row[dmode] * 16 + + edit_col[dmode]; + + if (ptroffset >= struct_len || pgnum) { + int pnum; + + pnum = pgnum * screen_chunk_size; + pnum += (ptroffset - struct_len); + pnum /= sizeof(uint64_t); + + print_gfs2("pointer 0x%x", pnum); + } + } + } if (line - 3 > last_entry_onscreen[dmode]) last_entry_onscreen[dmode] = line - 3; eol(0); @@ -2061,7 +2551,7 @@ static void process_field(const char *field, const char *nstr) int type; struct gfs2_rgrp rg; struct gfs2_leaf leaf; - struct gfs2_sb sb; + struct gfs2_sb lsb; struct gfs2_log_header lh; struct gfs2_log_descriptor ld; struct gfs2_quota_change qc; @@ -2085,17 +2575,17 @@ static void process_field(const char *field, const char *nstr) switch (type) { case GFS2_METATYPE_SB: - gfs2_sb_in(&sb, rbh); + gfs2_sb_in(&lsb, rbh); if (setval) { if (setstring) - gfs2_sb_assigns(&sb, field, nstr); + gfs2_sb_assigns(&lsb, field, nstr); else - gfs2_sb_assignval(&sb, field, newval); + gfs2_sb_assignval(&lsb, field, newval); gfs2_sb_out(&sb, rbh); if (!termlines) - gfs2_sb_printval(&sb, field); + gfs2_sb_printval(&lsb, field); } else { - if (!termlines && gfs2_sb_printval(&sb, field)) + if (!termlines && gfs2_sb_printval(&lsb, field)) printf("Field '%s' not found.\n", field); } break;

1 0

cluster: RHEL57 - gfs2_edit: Extend individual field printing/editing
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=05… Commit: 0593e1bcf00b6548805495409016034c2c14391a Parent: 45ae3105ed65d7d5d08118ae1f1061b435edd258 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Dec 13 13:14:36 2010 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 14:36:09 2011 -0600 gfs2_edit: Extend individual field printing/editing This patch extends gfs2_edit's ability to print and edit individual fields within structures. Before, gfs2_edit was able to print and edit individual fields from the rgrps and dinodes only. This patch allows it to also edit fields from the following block types: superblock, directory leaf, log header, log descriptor, and quota change. rhbz#656371 --- gfs2/edit/hexedit.c | 310 +++++++++++++++++++++++++++++++++++++++++-------- gfs2/libgfs2/ondisk.c | 6 +- 2 files changed, 267 insertions(+), 49 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index f930ef3..e0ff070 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -88,6 +88,57 @@ extern void restoremeta(const char *in_fn, const char *out_device, } \ } while(0) +static int gfs2_sb_printval(struct gfs2_sb *sb, const char *strfield) +{ + checkprint(strfield, sb, sb_fs_format); + checkprint(strfield, sb, sb_multihost_format); + checkprint(strfield, sb, __pad0); + checkprint(strfield, sb, sb_bsize); + checkprint(strfield, sb, sb_bsize_shift); + checkprint(strfield, sb, __pad1); + checkprint(strfield, sb, sb_master_dir.no_addr); + checkprint(strfield, sb, __pad2.no_addr); + checkprint(strfield, sb, sb_root_dir.no_addr); + checkprints(strfield, sb, sb_lockproto); + checkprints(strfield, sb, sb_locktable); + checkprint(strfield, sb, __pad3.no_addr); + checkprint(strfield, sb, __pad4.no_addr); + if (strcmp(strfield, "sb_uuid") == 0) { + printf("%s\n", str_uuid(sb->sb_uuid)); + return 0; + } + + return -1; +} + +static int gfs2_sb_assignval(struct gfs2_sb *sb, const char *strfield, + uint64_t value) +{ + checkassign(strfield, sb, sb_fs_format, value); + checkassign(strfield, sb, sb_multihost_format, value); + checkassign(strfield, sb, __pad0, value); + checkassign(strfield, sb, sb_bsize, value); + checkassign(strfield, sb, sb_bsize_shift, value); + checkassign(strfield, sb, __pad1, value); + checkassign(strfield, sb, sb_master_dir.no_addr, value); + checkassign(strfield, sb, __pad2.no_addr, value); + checkassign(strfield, sb, sb_root_dir.no_addr, value); + checkassign(strfield, sb, __pad3.no_addr, value); + checkassign(strfield, sb, __pad4.no_addr, value); + + return -1; +} + +static int gfs2_sb_assigns(struct gfs2_sb *sb, const char *strfield, + const char *val) +{ + checkassigns(strfield, sb, sb_lockproto, val); + checkassigns(strfield, sb, sb_locktable, val); + checkassigns(strfield, sb, sb_uuid, val); + + return -1; +} + static int gfs2_dinode_printval(struct gfs2_dinode *dip, const char *strfield) { checkprint(strfield, dip, di_mode); @@ -114,7 +165,7 @@ static int gfs2_dinode_printval(struct gfs2_dinode *dip, const char *strfield) } static int gfs2_dinode_assignval(struct gfs2_dinode *dia, const char *strfield, - uint64_t value) + uint64_t value) { checkassign(strfield, dia, di_mode, value); checkassign(strfield, dia, di_uid, value); @@ -149,7 +200,7 @@ static int gfs2_rgrp_printval(struct gfs2_rgrp *rg, const char *strfield) } static int gfs2_rgrp_assignval(struct gfs2_rgrp *rg, const char *strfield, - uint64_t value) + uint64_t value) { checkassign(strfield, rg, rg_flags, value); checkassign(strfield, rg, rg_free, value); @@ -158,6 +209,110 @@ static int gfs2_rgrp_assignval(struct gfs2_rgrp *rg, const char *strfield, return -1; } +static int gfs2_leaf_printval(struct gfs2_leaf *lf, const char *strfield) +{ + checkprint(strfield, lf, lf_depth); + checkprint(strfield, lf, lf_entries); + checkprint(strfield, lf, lf_dirent_format); + checkprint(strfield, lf, lf_next); + checkprints(strfield, lf, lf_reserved); + + return -1; +} + +static int gfs2_leaf_assignval(struct gfs2_leaf *lf, const char *strfield, + uint64_t value) +{ + checkassign(strfield, lf, lf_depth, value); + checkassign(strfield, lf, lf_entries, value); + checkassign(strfield, lf, lf_dirent_format, value); + checkassign(strfield, lf, lf_next, value); + + return -1; +} + +static int gfs2_leaf_assigns(struct gfs2_leaf *lf, const char *strfield, + const char *val) +{ + checkassigns(strfield, lf, lf_reserved, val); + + return -1; +} + +static int gfs2_lh_printval(struct gfs2_log_header *lh, const char *strfield) +{ + checkprint(strfield, lh, lh_sequence); + checkprint(strfield, lh, lh_flags); + checkprint(strfield, lh, lh_tail); + checkprint(strfield, lh, lh_blkno); + checkprint(strfield, lh, lh_hash); + + return -1; +} + +static int gfs2_lh_assignval(struct gfs2_log_header *lh, const char *strfield, + uint64_t value) +{ + checkassign(strfield, lh, lh_sequence, value); + checkassign(strfield, lh, lh_flags, value); + checkassign(strfield, lh, lh_tail, value); + checkassign(strfield, lh, lh_blkno, value); + checkassign(strfield, lh, lh_hash, value); + + return -1; +} + +static int gfs2_ld_printval(struct gfs2_log_descriptor *ld, + const char *strfield) +{ + checkprint(strfield, ld, ld_type); + checkprint(strfield, ld, ld_length); + checkprint(strfield, ld, ld_data1); + checkprint(strfield, ld, ld_data2); + checkprints(strfield, ld, ld_reserved); + + return -1; +} + +static int gfs2_ld_assignval(struct gfs2_log_descriptor *ld, + const char *strfield, uint64_t value) +{ + checkassign(strfield, ld, ld_type, value); + checkassign(strfield, ld, ld_length, value); + checkassign(strfield, ld, ld_data1, value); + checkassign(strfield, ld, ld_data2, value); + + return -1; +} + +static int gfs2_ld_assigns(struct gfs2_log_descriptor *ld, + const char *strfield, const char *val) +{ + checkassigns(strfield, ld, ld_reserved, val); + + return -1; +} + +static int gfs2_qc_printval(struct gfs2_quota_change *qc, + const char *strfield) +{ + checkprint(strfield, qc, qc_change); + checkprint(strfield, qc, qc_flags); + checkprint(strfield, qc, qc_id); + + return -1; +} + +static int gfs2_qc_assignval(struct gfs2_quota_change *qc, + const char *strfield, uint64_t value) +{ + checkassign(strfield, qc, qc_change, value); + checkassign(strfield, qc, qc_flags, value); + checkassign(strfield, qc, qc_id, value); + + return -1; +} + /* ------------------------------------------------------------------------ */ /* UpdateSize - screen size changed, so update it */ /* ------------------------------------------------------------------------ */ @@ -1131,7 +1286,8 @@ static void read_superblock(int fd) sbd.sd_sb.sb_master_dir.no_addr); gfs2_lookupi(sbd.master_dir, "rindex", 6, &sbd.md.riinode); sbd.fssize = sbd.device.length; - rindex_read(&sbd, 0, &count, &sane); + if (sbd.md.riinode) /* If we found the rindex */ + rindex_read(&sbd, 0, &count, &sane); } } @@ -1898,69 +2054,152 @@ static void find_change_block_alloc(int *newval) /* ------------------------------------------------------------------------ */ /* process request to print a certain field from a previously pushed block */ /* ------------------------------------------------------------------------ */ -static void process_field(const char *field, uint64_t *newval, int print_field) +static void process_field(const char *field, const char *nstr) { uint64_t fblock; struct gfs2_buffer_head *rbh; int type; struct gfs2_rgrp rg; - + struct gfs2_leaf leaf; + struct gfs2_sb sb; + struct gfs2_log_header lh; + struct gfs2_log_descriptor ld; + struct gfs2_quota_change qc; + int setval = 0, setstring = 0; + uint64_t newval = 0; + + if (nstr[0] == '/') { + setval = 0; + } else if (nstr[0] == '0' && nstr[1] == 'x') { + sscanf(nstr, "%"SCNx64, &newval); + setval = 1; + } else { + newval = (uint64_t)atoll(nstr); + setval = 1; + } + if (setval && newval == 0 && nstr[0] != '0') + setstring = 1; fblock = blockstack[blockhist % BLOCK_STACK_SIZE].block; rbh = bread(&sbd, fblock); type = get_block_type(rbh); switch (type) { case GFS2_METATYPE_SB: - if (print_field) - print_block_type(fblock, type, - " which is not implemented"); + gfs2_sb_in(&sb, rbh); + if (setval) { + if (setstring) + gfs2_sb_assigns(&sb, field, nstr); + else + gfs2_sb_assignval(&sb, field, newval); + gfs2_sb_out(&sb, rbh); + if (!termlines) + gfs2_sb_printval(&sb, field); + } else { + if (!termlines && gfs2_sb_printval(&sb, field)) + printf("Field '%s' not found.\n", field); + } break; case GFS2_METATYPE_RG: gfs2_rgrp_in(&rg, rbh); - if (newval) { - gfs2_rgrp_assignval(&rg, field, *newval); + if (setval) { + gfs2_rgrp_assignval(&rg, field, newval); gfs2_rgrp_out(&rg, rbh); - if (print_field) + if (!termlines) gfs2_rgrp_printval(&rg, field); } else { - if (print_field && gfs2_rgrp_printval(&rg, field)) + if (!termlines && gfs2_rgrp_printval(&rg, field)) printf("Field '%s' not found.\n", field); } break; case GFS2_METATYPE_RB: - if (print_field) + if (!termlines) print_block_type(fblock, type, " which is not implemented"); break; case GFS2_METATYPE_DI: gfs2_dinode_in(&di, rbh); - if (newval) { - gfs2_dinode_assignval(&di, field, *newval); + if (setval) { + gfs2_dinode_assignval(&di, field, newval); gfs2_dinode_out(&di, rbh); - if (print_field) + if (!termlines) gfs2_dinode_printval(&di, field); } else { - if (print_field && gfs2_dinode_printval(&di, field)) + if (!termlines && gfs2_dinode_printval(&di, field)) printf("Field '%s' not found.\n", field); } break; case GFS2_METATYPE_IN: + if (!setval && !setstring) + print_block_type(fblock, type, + " which is not implemented"); + break; case GFS2_METATYPE_LF: - case GFS2_METATYPE_JD: + gfs2_leaf_in(&leaf, rbh); + if (setval) { + if (setstring) + gfs2_leaf_assigns(&leaf, field, nstr); + else + gfs2_leaf_assignval(&leaf, field, newval); + gfs2_leaf_out(&leaf, rbh); + if (!termlines) + gfs2_leaf_printval(&leaf, field); + } else { + if (!termlines && gfs2_leaf_printval(&leaf, field)) + printf("Field '%s' not found.\n", field); + } + break; case GFS2_METATYPE_LH: + gfs2_log_header_in(&lh, rbh); + if (setval) { + gfs2_lh_assignval(&lh, field, newval); + gfs2_log_header_out(&lh, rbh); + if (!termlines) + gfs2_lh_printval(&lh, field); + } else { + if (!termlines && gfs2_lh_printval(&lh, field)) + printf("Field '%s' not found.\n", field); + } + break; case GFS2_METATYPE_LD: - case GFS2_METATYPE_EA: - case GFS2_METATYPE_ED: - case GFS2_METATYPE_LB: + gfs2_log_descriptor_in(&ld, rbh); + if (setval) { + if (setstring) + gfs2_ld_assigns(&ld, field, nstr); + else + gfs2_ld_assignval(&ld, field, newval); + gfs2_log_descriptor_out(&ld, rbh); + if (!termlines) + gfs2_ld_printval(&ld, field); + } else { + if (!termlines && gfs2_ld_printval(&ld, field)) + printf("Field '%s' not found.\n", field); + } + break; case GFS2_METATYPE_QC: + gfs2_quota_change_in(&qc, rbh); + if (setval) { + gfs2_qc_assignval(&qc, field, newval); + gfs2_quota_change_out(&qc, rbh); + if (!termlines) + gfs2_qc_printval(&qc, field); + } else { + if (!termlines && gfs2_qc_printval(&qc, field)) + printf("Field '%s' not found.\n", field); + } + break; + case GFS2_METATYPE_JD: /* journaled data */ + case GFS2_METATYPE_EA: /* extended attribute */ + case GFS2_METATYPE_ED: /* extended attribute */ + case GFS2_METATYPE_LB: default: - if (print_field) + if (!termlines) print_block_type(fblock, type, " which is not implemented"); break; } brelse(rbh); fsync(sbd.device_fd); + exit(0); } /* ------------------------------------------------------------------------ */ @@ -1998,17 +2237,9 @@ static void interactive_mode(void) if (dmode == HEX_MODE) hex_edit(&ch); else if (dmode == GFS2_MODE) { - uint64_t val; - bobgets(estring, edit_row[dmode]+4, 24, 10, &ch); - if (estring[0] == '0' && - estring[1] == 'x') - sscanf(estring, "%"SCNx64, - &val); - else - val = (uint64_t)atoll(estring); - process_field(efield, &val, 0); + process_field(efield, estring); block_in_mem = -1; } else bobgets(estring, edit_row[dmode]+6, 14, @@ -2694,8 +2925,6 @@ static void process_parameters(int argc, char *argv[], int pass) } else if (!strcmp(argv[i], "rgcount")) rgcount(); else if (!strcmp(argv[i], "field")) { - uint64_t newval; - i++; if (i >= argc - 1) { printf("Error: field not specified.\n"); @@ -2704,20 +2933,7 @@ static void process_parameters(int argc, char *argv[], int pass) gfs2_rgrp_free(&sbd.rglist); exit(EXIT_FAILURE); } - if (isdigit(argv[i + 1][0])) { - if (argv[i + 1][0]=='0' && argv[i + 1][1]=='x') - sscanf(argv[i + 1], "%"SCNx64, - &newval); - else - newval = (uint64_t)atoll(argv[i + 1]); - process_field(argv[i], &newval, 1); - gfs2_rgrp_free(&sbd.rglist); - exit(0); - } else { - process_field(argv[i], NULL, 1); - gfs2_rgrp_free(&sbd.rglist); - exit(0); - } + process_field(argv[i], argv[i + 1]); } else if (!strcmp(argv[i], "blocktype")) { find_print_block_type(); } else if (!strcmp(argv[i], "blockrg")) { diff --git a/gfs2/libgfs2/ondisk.c b/gfs2/libgfs2/ondisk.c index d15cd21..8a2868b 100644 --- a/gfs2/libgfs2/ondisk.c +++ b/gfs2/libgfs2/ondisk.c @@ -616,7 +616,8 @@ void gfs2_statfs_change_print(struct gfs2_statfs_change *sc) void gfs2_quota_change_in(struct gfs2_quota_change *qc, struct gfs2_buffer_head *bh) { - struct gfs2_quota_change *str = (struct gfs2_quota_change *)bh->b_data; + struct gfs2_quota_change *str = (struct gfs2_quota_change *)bh->b_data + + sizeof(struct gfs2_meta_header); CPIN_64(qc, str, qc_change); CPIN_32(qc, str, qc_flags); @@ -626,7 +627,8 @@ void gfs2_quota_change_in(struct gfs2_quota_change *qc, void gfs2_quota_change_out(struct gfs2_quota_change *qc, struct gfs2_buffer_head *bh) { - struct gfs2_quota_change *str = (struct gfs2_quota_change *)bh->b_data; + struct gfs2_quota_change *str = (struct gfs2_quota_change *)bh->b_data + + sizeof(struct gfs2_meta_header); CPOUT_64(qc, str, qc_change); CPOUT_32(qc, str, qc_flags);

1 0

cluster: RHEL57 - gfs2_edit: Move more functions to extended.c
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=45… Commit: 45ae3105ed65d7d5d08118ae1f1061b435edd258 Parent: 4e825e58684ed45936cf885b4393c915933270a5 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Dec 13 12:43:58 2010 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 14:36:09 2011 -0600 gfs2_edit: Move more functions to extended.c This patch moves more code to the new extended.c source. rhbz#656371 --- gfs2/edit/hexedit.c | 134 +-------------------------------------------------- gfs2/edit/hexedit.h | 2 + 2 files changed, 4 insertions(+), 132 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 17a2962..f930ef3 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -966,134 +966,6 @@ int has_indirect_blocks(void) } /* ------------------------------------------------------------------------ */ -/* print_inode_type */ -/* ------------------------------------------------------------------------ */ -static void print_inode_type(__be16 de_type) -{ - if (gfs1) { - switch(de_type) { - case GFS_FILE_NON: - print_gfs2("Unknown"); - break; - case GFS_FILE_REG: - print_gfs2("File "); - break; - case GFS_FILE_DIR: - print_gfs2("Dir "); - break; - case GFS_FILE_LNK: - print_gfs2("Symlink"); - break; - case GFS_FILE_BLK: - print_gfs2("BlkDev "); - break; - case GFS_FILE_CHR: - print_gfs2("ChrDev "); - break; - case GFS_FILE_FIFO: - print_gfs2("Fifo "); - break; - case GFS_FILE_SOCK: - print_gfs2("Socket "); - break; - default: - print_gfs2("%04x ", de_type); - break; - } - return; - } - switch(de_type) { - case DT_UNKNOWN: - print_gfs2("Unknown"); - break; - case DT_REG: - print_gfs2("File "); - break; - case DT_DIR: - print_gfs2("Dir "); - break; - case DT_LNK: - print_gfs2("Symlink"); - break; - case DT_BLK: - print_gfs2("BlkDev "); - break; - case DT_CHR: - print_gfs2("ChrDev "); - break; - case DT_FIFO: - print_gfs2("Fifo "); - break; - case DT_SOCK: - print_gfs2("Socket "); - break; - default: - print_gfs2("%04x ", de_type); - break; - } -} - -/* ------------------------------------------------------------------------ */ -/* display_leaf - display directory leaf */ -/* ------------------------------------------------------------------------ */ -int display_leaf(struct iinfo *ind) -{ - int start_line, total_dirents = start_row[dmode]; - int d; - - eol(0); - if (gfs2_struct_type == GFS2_METATYPE_SB) - print_gfs2("The superblock has 2 directories"); - else - print_gfs2("Directory block: lf_depth:%d, lf_entries:%d," - "fmt:%d next=0x%llx (%d dirents).", - ind->ii[0].lf_depth, ind->ii[0].lf_entries, - ind->ii[0].lf_dirent_format, - ind->ii[0].lf_next, - ind->ii[0].dirents); - - start_line = line; - for (d = start_row[dmode]; d < ind->ii[0].dirents; d++) { - if (termlines && d >= termlines - start_line - 2 - + start_row[dmode]) - break; - total_dirents++; - if (ind->ii[0].dirents >= 1) { - eol(5); - if (termlines) { - if (edit_row[dmode] >=0 && - line - start_line - 1 == - edit_row[dmode] - start_row[dmode]) { - COLORS_HIGHLIGHT; - sprintf(estring, "%"PRIx64, - ind->ii[0].dirent[d].block); - strcpy(edit_fmt, "%"PRIx64); - } - } - print_gfs2("%d. (%d). %lld (0x%llx): ", - total_dirents, d + 1, - ind->ii[0].dirent[d].block, - ind->ii[0].dirent[d].block); - } - print_inode_type(ind->ii[0].dirent[d].dirent.de_type); - print_gfs2(" %s", ind->ii[0].dirent[d].filename); - if (termlines) { - if (edit_row[dmode] >= 0 && - line - start_line - 1 == edit_row[dmode] - - start_row[dmode]) - COLORS_NORMAL; - } - } - if (line >= 4) - last_entry_onscreen[dmode] = line - 4; - eol(0); - end_row[dmode] = ind->ii[0].dirents; - if (end_row[dmode] < last_entry_onscreen[dmode]) - end_row[dmode] = last_entry_onscreen[dmode]; - return 0; -} - -/* ------------------------------------------------------------------------ */ /* block_is_rindex */ /* ------------------------------------------------------------------------ */ int block_is_rindex(void) @@ -1835,8 +1707,7 @@ static void pageup(void) sbd.bsize - screen_chunk_size; else offset = 0; - } - else + } else offset -= screen_chunk_size; } } @@ -1864,8 +1735,7 @@ static void pagedn(void) offset + screen_chunk_size >= sbd.bsize) { block++; offset = 0; - } - else + } else offset += screen_chunk_size; } } diff --git a/gfs2/edit/hexedit.h b/gfs2/edit/hexedit.h index 8d2e9b8..81637bc 100644 --- a/gfs2/edit/hexedit.h +++ b/gfs2/edit/hexedit.h @@ -111,6 +111,8 @@ extern uint64_t temp_blk; extern uint64_t starting_blk; extern const char *block_type_str[15]; extern int dsplines; +extern int dsp_lines[DMODES]; +extern int combined_display; struct gfs_jindex { uint64_t ji_addr; /* starting block of the journal */

1 0

cluster: RHEL57 - gfs2_edit: Split extended display functions into extended.c
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4e… Commit: 4e825e58684ed45936cf885b4393c915933270a5 Parent: ff658f227fa956f1f8e68d37ae49579960358cbd Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Dec 13 12:34:46 2010 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 14:36:09 2011 -0600 gfs2_edit: Split extended display functions into extended.c The gfs2_edit code currently has three modes of interactive display: (1) hex mode, (2) structure display, (3) extended data. This patch breaks the functions related to display mode (3) into its own source file: extended.c. Today, mode (2), structure display, is contained in gfs2hex.c, and (1) hex mode is contained in hexedit.c, which also contains the bulk of the support code. rhbz#656371 --- gfs2/edit/Makefile | 3 +- gfs2/edit/extended.c | 700 ++++++++++++++++++++++++++++++++++++++++++++++++++ gfs2/edit/extended.h | 8 + gfs2/edit/gfs2hex.c | 66 +---- gfs2/edit/gfs2hex.h | 14 +- gfs2/edit/hexedit.c | 571 ++--------------------------------------- gfs2/edit/hexedit.h | 72 ++++-- 7 files changed, 793 insertions(+), 641 deletions(-) diff --git a/gfs2/edit/Makefile b/gfs2/edit/Makefile index 7c50c4f..6121791 100644 --- a/gfs2/edit/Makefile +++ b/gfs2/edit/Makefile @@ -14,6 +14,7 @@ TARGET= gfs2_edit SOURCE= \ + extended.c \ gfs2hex.c \ savemeta.c \ hexedit.c @@ -39,7 +40,7 @@ endif all: gfs2_edit -gfs2_edit: ${SOURCE} hexedit.h gfs2hex.h ${LIBS}/libgfs2.a +gfs2_edit: ${SOURCE} hexedit.h extended.h gfs2hex.h ${LIBS}/libgfs2.a ${CC} ${CFLAGS} ${INCLUDE} -L${LIBS} ${LDFLAGS} ${SOURCE} ${LOADLIBES} ${LDLIBS} -lncurses -o $@ -lgfs2 install: all diff --git a/gfs2/edit/extended.c b/gfs2/edit/extended.c new file mode 100644 index 0000000..3c45060 --- /dev/null +++ b/gfs2/edit/extended.c @@ -0,0 +1,700 @@ +#include <stdio.h> +#include <stdlib.h> +#include <ctype.h> +#include <string.h> +#include <inttypes.h> +#include <sys/types.h> +#include <linux/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <unistd.h> +#include <errno.h> +#include <curses.h> +#include <term.h> +#include <time.h> +#include <signal.h> +#include <sys/ioctl.h> +#include <sys/mount.h> +#include <dirent.h> + +#include <linux/gfs2_ondisk.h> +#include "copyright.cf" + +#include "hexedit.h" +#include "libgfs2.h" +#include "extended.h" +#include "gfs2hex.h" + +static void print_block_details(struct iinfo *ind, int level, int cur_height, + int pndx, uint64_t file_offset); + +/* ------------------------------------------------------------------------ */ +/* get_height */ +/* ------------------------------------------------------------------------ */ +static int get_height(void) +{ + int cur_height = 0, i; + + if (gfs2_struct_type != GFS2_METATYPE_DI) { + for (i = 0; i <= blockhist && i < 5; i++) { + if (blockstack[(blockhist - i) % + BLOCK_STACK_SIZE].gfs2_struct_type == + GFS2_METATYPE_DI) + break; + cur_height++; + } + } + return cur_height; +} + +/* ------------------------------------------------------------------------ */ +/* _do_indirect_extended */ +/* ------------------------------------------------------------------------ */ +static int _do_indirect_extended(char *diebuf, struct iinfo *iinf, int hgt) +{ + unsigned int x, y; + uint64_t p; + int i_blocks; + + i_blocks = 0; + for (x = 0; x < 512; x++) { + iinf->ii[x].is_dir = 0; + iinf->ii[x].height = 0; + iinf->ii[x].block = 0; + iinf->ii[x].dirents = 0; + memset(&iinf->ii[x].dirent, 0, sizeof(struct gfs2_dirents)); + } + for (x = (gfs1 ? sizeof(struct gfs_indirect): + sizeof(struct gfs2_meta_header)), y = 0; + x < sbd.bsize; + x += sizeof(uint64_t), y++) { + p = be64_to_cpu(*(uint64_t *)(diebuf + x)); + if (p) { + iinf->ii[i_blocks].block = p; + iinf->ii[i_blocks].mp.mp_list[hgt] = i_blocks; + iinf->ii[i_blocks].is_dir = FALSE; + i_blocks++; + } + } + return i_blocks; +} + +/* ------------------------------------------------------------------------ */ +/* do_indirect_extended */ +/* ------------------------------------------------------------------------ */ +int do_indirect_extended(char *diebuf, struct iinfo *iinf) +{ + return _do_indirect_extended(diebuf, iinf, get_height()); +} + +/* ------------------------------------------------------------------------ */ +/* dinode_valid - check if we have a dinode in recent history */ +/* ------------------------------------------------------------------------ */ +static int dinode_valid(void) +{ + int i; + + if (gfs2_struct_type == GFS2_METATYPE_DI) + return 1; + for (i = 0; i <= blockhist && i < 5; i++) { + if (blockstack[(blockhist - i) % + BLOCK_STACK_SIZE].gfs2_struct_type == + GFS2_METATYPE_DI) + return 1; + } + return 0; +} + +/* ------------------------------------------------------------------------ */ +/* metapath_to_lblock - convert from metapath, height to logical block */ +/* ------------------------------------------------------------------------ */ +static uint64_t metapath_to_lblock(struct metapath *mp, int hgt) +{ + int h; + uint64_t lblock = 0; + uint64_t factor[GFS2_MAX_META_HEIGHT]; + + if (di.di_height < 2) + return mp->mp_list[0]; + /* figure out multiplication factors for each height */ + memset(&factor, 0, sizeof(factor)); + factor[di.di_height - 1] = 1ull; + for (h = di.di_height - 2; h >= 0; h--) + factor[h] = factor[h + 1] * sbd.sd_inptrs; + for (h = 0; h <= hgt; h++) + lblock += (mp->mp_list[h] * factor[h]); + return lblock; +} + +/* ------------------------------------------------------------------------ */ +/* display_indirect */ +/* ------------------------------------------------------------------------ */ +static int display_indirect(struct iinfo *ind, int indblocks, int level, + uint64_t startoff) +{ + int start_line, total_dirents; + int cur_height = -1, pndx; + + last_entry_onscreen[dmode] = 0; + if (!has_indirect_blocks()) + return -1; + if (!level) { + if (gfs2_struct_type == GFS2_METATYPE_DI) { + if (S_ISDIR(di.di_mode)) + print_gfs2("This directory contains %d indirect blocks", + indblocks); + else + print_gfs2("This inode contains %d indirect blocks", + indblocks); + } else + print_gfs2("This indirect block contains %d indirect blocks", + indblocks); + } + total_dirents = 0; + if (dinode_valid() && !S_ISDIR(di.di_mode)) { + /* See if we are on an inode or have one in history. */ + if (level) + cur_height = level; + else { + cur_height = get_height(); + print_gfs2(" (at height %d of %d)", + cur_height, di.di_height); + } + } + eol(0); + if (!level && indblocks) { + print_gfs2("Indirect blocks:"); + eol(0); + } + start_line = line; + for (pndx = start_row[dmode]; + (!termlines || pndx < termlines - start_line - 1 + + start_row[dmode]) && pndx < indblocks; + pndx++) { + uint64_t file_offset; + + if (pndx && ind->ii[pndx].block == ind->ii[pndx - 1].block) + continue; + print_entry_ndx = pndx; + if (termlines) { + if (edit_row[dmode] >= 0 && + line - start_line == + edit_row[dmode] - start_row[dmode]) + COLORS_HIGHLIGHT; + move(line, 1); + } + if (!termlines) { + int h; + + for (h = 0; h < level; h++) + print_gfs2(" "); + } + print_gfs2("%d => ", pndx); + if (termlines) + move(line,9); + print_gfs2("0x%llx / %lld", ind->ii[pndx].block, + ind->ii[pndx].block); + if (termlines) { + if (edit_row[dmode] >= 0 && + line - start_line == + edit_row[dmode] - start_row[dmode]) { + sprintf(estring, "%"PRIx64, + ind->ii[print_entry_ndx].block); + strcpy(edit_fmt, "%"PRIx64); + edit_size[dmode] = strlen(estring); + COLORS_NORMAL; + } + } + if (dinode_valid() && !S_ISDIR(di.di_mode)) { + float human_off; + char h; + + file_offset = metapath_to_lblock(&ind->ii[pndx].mp, + cur_height) * + sbd.bsize; + print_gfs2(" "); + h = 'K'; + human_off = (file_offset / 1024.0); + if (human_off > 1024.0) { h = 'M'; human_off /= 1024.0; } + if (human_off > 1024.0) { h = 'G'; human_off /= 1024.0; } + if (human_off > 1024.0) { h = 'T'; human_off /= 1024.0; } + if (human_off > 1024.0) { h = 'P'; human_off /= 1024.0; } + if (human_off > 1024.0) { h = 'E'; human_off /= 1024.0; } + print_gfs2("(data offset 0x%llx / %lld / %6.2f%c)", + file_offset, file_offset, human_off, h); + print_gfs2(" "); + } + else + file_offset = 0; + if (dinode_valid() && !termlines && + ((level + 1 < di.di_height) || + (S_ISDIR(di.di_mode) && level <= di.di_height))) { + print_block_details(ind, level, cur_height, pndx, + file_offset); + } + print_entry_ndx = pndx; /* restore after recursion */ + eol(0); + } /* for each display row */ + if (line >= 7) /* 7 because it was bumped at the end */ + last_entry_onscreen[dmode] = line - 7; + eol(0); + end_row[dmode] = indblocks; + if (end_row[dmode] < last_entry_onscreen[dmode]) + end_row[dmode] = last_entry_onscreen[dmode]; + lines_per_row[dmode] = 1; + return 0; +} + +/* ------------------------------------------------------------------------ */ +/* print_inode_type */ +/* ------------------------------------------------------------------------ */ +static void print_inode_type(__be16 de_type) +{ + if (gfs1) { + switch(de_type) { + case GFS_FILE_NON: + print_gfs2("Unknown"); + break; + case GFS_FILE_REG: + print_gfs2("File "); + break; + case GFS_FILE_DIR: + print_gfs2("Dir "); + break; + case GFS_FILE_LNK: + print_gfs2("Symlink"); + break; + case GFS_FILE_BLK: + print_gfs2("BlkDev "); + break; + case GFS_FILE_CHR: + print_gfs2("ChrDev "); + break; + case GFS_FILE_FIFO: + print_gfs2("Fifo "); + break; + case GFS_FILE_SOCK: + print_gfs2("Socket "); + break; + default: + print_gfs2("%04x ", de_type); + break; + } + return; + } + switch(de_type) { + case DT_UNKNOWN: + print_gfs2("Unknown"); + break; + case DT_REG: + print_gfs2("File "); + break; + case DT_DIR: + print_gfs2("Dir "); + break; + case DT_LNK: + print_gfs2("Symlink"); + break; + case DT_BLK: + print_gfs2("BlkDev "); + break; + case DT_CHR: + print_gfs2("ChrDev "); + break; + case DT_FIFO: + print_gfs2("Fifo "); + break; + case DT_SOCK: + print_gfs2("Socket "); + break; + default: + print_gfs2("%04x ", de_type); + break; + } +} + +/* ------------------------------------------------------------------------ */ +/* display_leaf - display directory leaf */ +/* ------------------------------------------------------------------------ */ +static int display_leaf(struct iinfo *ind) +{ + int start_line, total_dirents = start_row[dmode]; + int d; + + eol(0); + if (gfs2_struct_type == GFS2_METATYPE_SB) + print_gfs2("The superblock has 2 directories"); + else + print_gfs2("Directory block: lf_depth:%d, lf_entries:%d," + "fmt:%d next=0x%llx (%d dirents).", + ind->ii[0].lf_depth, ind->ii[0].lf_entries, + ind->ii[0].lf_dirent_format, + ind->ii[0].lf_next, + ind->ii[0].dirents); + + start_line = line; + for (d = start_row[dmode]; d < ind->ii[0].dirents; d++) { + if (termlines && d >= termlines - start_line - 2 + + start_row[dmode]) + break; + total_dirents++; + if (ind->ii[0].dirents >= 1) { + eol(5); + if (termlines) { + if (edit_row[dmode] >=0 && + line - start_line - 1 == + edit_row[dmode] - start_row[dmode]) { + COLORS_HIGHLIGHT; + sprintf(estring, "%"PRIx64, + ind->ii[0].dirent[d].block); + strcpy(edit_fmt, "%"PRIx64); + } + } + print_gfs2("%d. (%d). %lld (0x%llx): ", + total_dirents, d + 1, + ind->ii[0].dirent[d].block, + ind->ii[0].dirent[d].block); + } + print_inode_type(ind->ii[0].dirent[d].dirent.de_type); + print_gfs2(" %s", ind->ii[0].dirent[d].filename); + if (termlines) { + if (edit_row[dmode] >= 0 && + line - start_line - 1 == edit_row[dmode] - + start_row[dmode]) + COLORS_NORMAL; + } + } + if (line >= 4) + last_entry_onscreen[dmode] = line - 4; + eol(0); + end_row[dmode] = ind->ii[0].dirents; + if (end_row[dmode] < last_entry_onscreen[dmode]) + end_row[dmode] = last_entry_onscreen[dmode]; + return 0; +} + +/* ------------------------------------------------------------------------ */ +/* print_block_details */ +/* ------------------------------------------------------------------------ */ +static void print_block_details(struct iinfo *ind, int level, int cur_height, + int pndx, uint64_t file_offset) +{ + struct iinfo *more_indir; + int more_ind; + char *tmpbuf; + uint64_t thisblk; + + thisblk = ind->ii[pndx].block; + more_indir = malloc(sizeof(struct iinfo)); + if (!more_indir) { + fprintf(stderr, "Out of memory in function " + "display_indirect\n"); + return; + } + tmpbuf = malloc(sbd.bsize); + if (!tmpbuf) { + fprintf(stderr, "Out of memory in function " + "display_indirect\n"); + return; + } + while (thisblk) { + lseek(sbd.device_fd, thisblk * sbd.bsize, SEEK_SET); + /* read in the desired block */ + if (read(sbd.device_fd, tmpbuf, sbd.bsize) != sbd.bsize) { + fprintf(stderr, "bad read: %s from %s:%d: block %lld " + "(0x%llx)\n", strerror(errno), __FUNCTION__, + __LINE__, + (unsigned long long)ind->ii[pndx].block, + (unsigned long long)ind->ii[pndx].block); + exit(-1); + } + thisblk = 0; + memset(more_indir, 0, sizeof(struct iinfo)); + if (S_ISDIR(di.di_mode) && level == di.di_height) { + thisblk = do_leaf_extended(tmpbuf, more_indir); + display_leaf(more_indir); + } else { + int x; + + for (x = 0; x < 512; x++) { + memcpy(&more_indir->ii[x].mp, + &ind->ii[pndx].mp, + sizeof(struct metapath)); + more_indir->ii[x].mp.mp_list[cur_height+1] = x; + } + more_ind = _do_indirect_extended(tmpbuf, more_indir, + cur_height + 1); + display_indirect(more_indir, more_ind, level + 1, + file_offset); + } + if (thisblk) { + eol(0); + if (termlines) + move(line,9); + print_gfs2("Continuation block 0x%llx / %lld", + thisblk, thisblk); + } + } + free(tmpbuf); + free(more_indir); +} + +/* ------------------------------------------------------------------------ */ +/* gfs_jindex_print - print an jindex entry. */ +/* ------------------------------------------------------------------------ */ +static void gfs_jindex_print(struct gfs_jindex *ji) +{ + pv((unsigned long long)ji, ji_addr, "%llu", "0x%llx"); + pv(ji, ji_nsegment, "%u", "0x%x"); + pv(ji, ji_pad, "%u", "0x%x"); +} + +/* ------------------------------------------------------------------------ */ +/* print_jindex - print the jindex file. */ +/* ------------------------------------------------------------------------ */ +static int print_jindex(struct gfs2_inode *dij) +{ + int error, start_line; + struct gfs_jindex ji; + char jbuf[sizeof(struct gfs_jindex)]; + + start_line = line; + error = 0; + print_gfs2("Journal index entries found: %d.", + dij->i_di.di_size / sizeof(struct gfs_jindex)); + eol(0); + lines_per_row[dmode] = 4; + for (print_entry_ndx=0; ; print_entry_ndx++) { + error = gfs2_readi(dij, (void *)&jbuf, + print_entry_ndx*sizeof(struct gfs_jindex), + sizeof(struct gfs_jindex)); + gfs_jindex_in(&ji, jbuf); + if (!error) /* end of file */ + break; + if (!termlines || + (print_entry_ndx >= start_row[dmode] && + ((print_entry_ndx - start_row[dmode])+1) * + lines_per_row[dmode] <= termlines - start_line - 2)) { + if (edit_row[dmode] == print_entry_ndx) { + COLORS_HIGHLIGHT; + strcpy(efield, "ji_addr"); + sprintf(estring, "%" PRIx64, ji.ji_addr); + } + print_gfs2("Journal #%d", print_entry_ndx); + eol(0); + if (edit_row[dmode] == print_entry_ndx) + COLORS_NORMAL; + gfs_jindex_print(&ji); + last_entry_onscreen[dmode] = print_entry_ndx; + } + } + end_row[dmode] = print_entry_ndx; + return error; +} + +/* ------------------------------------------------------------------------ */ +/* parse_rindex - print the rgindex file. */ +/* ------------------------------------------------------------------------ */ +static int parse_rindex(struct gfs2_inode *dip, int print_rindex) +{ + int error, start_line; + struct gfs2_rindex ri; + char rbuf[sizeof(struct gfs_rindex)]; + char highlighted_addr[32]; + + start_line = line; + error = 0; + print_gfs2("RG index entries found: %d.", dip->i_di.di_size / risize()); + eol(0); + lines_per_row[dmode] = 6; + memset(highlighted_addr, 0, sizeof(highlighted_addr)); + + for (print_entry_ndx=0; ; print_entry_ndx++) { + uint64_t roff; + + roff = print_entry_ndx * risize(); + + if (gfs1) + error = gfs1_readi(dip, (void *)&rbuf, roff, risize()); + else + error = gfs2_readi(dip, (void *)&rbuf, roff, risize()); + if (!error) /* end of file */ + break; + gfs2_rindex_in(&ri, rbuf); + if (!termlines || + (print_entry_ndx >= start_row[dmode] && + ((print_entry_ndx - start_row[dmode])+1) * lines_per_row[dmode] <= + termlines - start_line - 2)) { + if (edit_row[dmode] == print_entry_ndx) { + COLORS_HIGHLIGHT; + sprintf(highlighted_addr, "%llx", (unsigned long long)ri.ri_addr); + } + print_gfs2("RG #%d", print_entry_ndx); + if (!print_rindex) + print_gfs2(" located at: %llu (0x%llx)", + ri.ri_addr, ri.ri_addr); + eol(0); + if (edit_row[dmode] == print_entry_ndx) + COLORS_NORMAL; + if(print_rindex) + gfs2_rindex_print(&ri); + else { + struct gfs2_buffer_head *tmp_bh; + + tmp_bh = bread(&sbd, ri.ri_addr); + if (gfs1) { + struct gfs_rgrp rg1; + gfs_rgrp_in(&rg1, tmp_bh); + gfs_rgrp_print(&rg1); + } else { + struct gfs2_rgrp rg; + gfs2_rgrp_in(&rg, tmp_bh); + gfs2_rgrp_print(&rg); + } + brelse(tmp_bh); + } + last_entry_onscreen[dmode] = print_entry_ndx; + } + } + strcpy(estring, highlighted_addr); + end_row[dmode] = print_entry_ndx; + return error; +} + +/* ------------------------------------------------------------------------ */ +/* print_inum - print the inum file. */ +/* ------------------------------------------------------------------------ */ +static int print_inum(struct gfs2_inode *dii) +{ + uint64_t inum, inodenum; + int rc; + + rc = gfs2_readi(dii, (void *)&inum, 0, sizeof(inum)); + if (!rc) { + print_gfs2("The inum file is empty."); + eol(0); + return 0; + } + if (rc != sizeof(inum)) { + print_gfs2("Error reading inum file."); + eol(0); + return -1; + } + inodenum = be64_to_cpu(inum); + print_gfs2("Next inode num = %lld (0x%llx)", inodenum, inodenum); + eol(0); + return 0; +} + +/* ------------------------------------------------------------------------ */ +/* print_statfs - print the statfs file. */ +/* ------------------------------------------------------------------------ */ +static int print_statfs(struct gfs2_inode *dis) +{ + struct gfs2_statfs_change sfb, sfc; + int rc; + + rc = gfs2_readi(dis, (void *)&sfb, 0, sizeof(sfb)); + if (!rc) { + print_gfs2("The statfs file is empty."); + eol(0); + return 0; + } + if (rc != sizeof(sfb)) { + print_gfs2("Error reading statfs file."); + eol(0); + return -1; + } + gfs2_statfs_change_in(&sfc, (char *)&sfb); + print_gfs2("statfs file contents:"); + eol(0); + gfs2_statfs_change_print(&sfc); + return 0; +} + +/* ------------------------------------------------------------------------ */ +/* print_quota - print the quota file. */ +/* ------------------------------------------------------------------------ */ +static int print_quota(struct gfs2_inode *diq) +{ + struct gfs2_quota qbuf, q; + int i, error; + + print_gfs2("quota file contents:"); + eol(0); + print_gfs2("quota entries found: %d.", diq->i_di.di_size / sizeof(q)); + eol(0); + for (i=0; ; i++) { + error = gfs2_readi(diq, (void *)&qbuf, i * sizeof(q), sizeof(qbuf)); + if (!error) + break; + if (error != sizeof(qbuf)) { + print_gfs2("Error reading quota file."); + eol(0); + return -1; + } + gfs2_quota_in(&q, (char *)&qbuf); + print_gfs2("Entry #%d", i + 1); + eol(0); + gfs2_quota_print(&q); + } + return 0; +} + +/* ------------------------------------------------------------------------ */ +/* display_extended */ +/* ------------------------------------------------------------------------ */ +int display_extended(void) +{ + struct gfs2_inode *tmp_inode; + struct gfs2_buffer_head *tmp_bh; + + dsplines = termlines - line - 1; + /* Display any indirect pointers that we have. */ + if (block_is_rindex()) { + tmp_bh = bread(&sbd, block); + tmp_inode = inode_get(&sbd, tmp_bh); + parse_rindex(tmp_inode, TRUE); + brelse(tmp_bh); + } + else if (has_indirect_blocks() && !indirect_blocks && + !display_leaf(indirect)) + return -1; + else if (display_indirect(indirect, indirect_blocks, 0, 0) == 0) + return -1; + else if (block_is_rglist()) { + if (gfs1) + tmp_bh = bread(&sbd, sbd1->sb_rindex_di.no_addr); + else + tmp_bh = bread(&sbd, masterblock("rindex")); + tmp_inode = inode_get(&sbd, tmp_bh); + parse_rindex(tmp_inode, FALSE); + brelse(tmp_bh); + } + else if (block_is_jindex()) { + tmp_bh = bread(&sbd, block); + tmp_inode = inode_get(&sbd, tmp_bh); + print_jindex(tmp_inode); + brelse(tmp_bh); + } + else if (block_is_inum_file()) { + tmp_bh = bread(&sbd, block); + tmp_inode = inode_get(&sbd, tmp_bh); + print_inum(tmp_inode); + brelse(tmp_bh); + } + else if (block_is_statfs_file()) { + tmp_bh = bread(&sbd, block); + tmp_inode = inode_get(&sbd, tmp_bh); + print_statfs(tmp_inode); + brelse(tmp_bh); + } + else if (block_is_quota_file()) { + tmp_bh = bread(&sbd, block); + tmp_inode = inode_get(&sbd, tmp_bh); + print_quota(tmp_inode); + brelse(tmp_bh); + } + return 0; +} + diff --git a/gfs2/edit/extended.h b/gfs2/edit/extended.h new file mode 100644 index 0000000..cfb67be --- /dev/null +++ b/gfs2/edit/extended.h @@ -0,0 +1,8 @@ +#ifndef __EXTENDED_DOT_H__ +#define __EXTENDED_DOT_H__ + +extern int do_indirect_extended(char *diebuf, struct iinfo *iinf); +extern int display_extended(void); + +#endif + diff --git a/gfs2/edit/gfs2hex.c b/gfs2/edit/gfs2hex.c index 1505783..4b6025a 100644 --- a/gfs2/edit/gfs2hex.c +++ b/gfs2/edit/gfs2hex.c @@ -29,6 +29,7 @@ #define WANT_GFS_CONVERSION_FUNCTIONS #include <linux/gfs2_ondisk.h> +#include "extended.h" #include "gfs2hex.h" /* from libgfs2: */ #include "libgfs2.h" @@ -40,11 +41,10 @@ print_it(" ", fmt, fmt2, struct->member); \ } while (FALSE); - struct gfs2_sb sb; struct gfs2_buffer_head *bh; struct gfs2_dinode di; -int line, termlines; +int line, termlines, modelines[DMODES]; char edit_fmt[80]; char estring[1024]; char efield[64]; @@ -127,8 +127,7 @@ void eol(int col) /* end of line */ if (termlines) { line++; move(line, col); - } - else { + } else { printf("\n"); for (; col > 0; col--) printf(" "); @@ -159,12 +158,10 @@ static void check_highlight(int highlight) if (highlight) { COLORS_HIGHLIGHT; last_entry_onscreen[dmode] = print_entry_ndx; - } - else + } else COLORS_NORMAL; } - } - else { + } else { if ((line * lines_per_row[dmode]) - 4 == (edit_row[dmode] - start_row[dmode]) * lines_per_row[dmode]) { if (highlight) { @@ -191,8 +188,7 @@ void print_it(const char *label, const char *fmt, const char *fmt2, ...) move(line,0); printw("%s", label); move(line,24); - } - else { + } else { if (!strcmp(label, " ")) printf("%-11s", label); else @@ -215,16 +211,14 @@ void print_it(const char *label, const char *fmt, const char *fmt2, ...) if (termlines) { move(line, 50); printw("%s", tmp_string); - } - else { + } else { int i; for (i=20 - decimalsize; i > 0; i--) printf(" "); printf("%s", tmp_string); } check_highlight(FALSE); - } - else { + } else { if (strstr(fmt,"X") || strstr(fmt,"x")) fmtstring="(hex)"; else if (strstr(fmt,"s")) @@ -373,50 +367,6 @@ void do_dinode_extended(struct gfs2_dinode *dine, struct gfs2_buffer_head *lbh) /****************************************************************************** ******************************************************************************* ** -** do_indirect_extended() -** -** Description: -** -** Input(s): -** -** Output(s): -** -** Returns: -** -******************************************************************************* -******************************************************************************/ -int do_indirect_extended(char *buf, struct iinfo *iinf, int hgt) -{ - unsigned int x, y; - uint64_t p; - int i_blocks; - - i_blocks = 0; - for (x = 0; x < 512; x++) { - iinf->ii[x].is_dir = 0; - iinf->ii[x].height = 0; - iinf->ii[x].block = 0; - iinf->ii[x].dirents = 0; - memset(&iinf->ii[x].dirent, 0, sizeof(struct gfs2_dirents)); - } - for (x = (gfs1 ? sizeof(struct gfs_indirect): - sizeof(struct gfs2_meta_header)), y = 0; - x < sbd.bsize; - x += sizeof(uint64_t), y++) { - p = be64_to_cpu(*(uint64_t *)(buf + x)); - if (p) { - iinf->ii[i_blocks].block = p; - iinf->ii[i_blocks].mp.mp_list[hgt] = i_blocks; - iinf->ii[i_blocks].is_dir = FALSE; - i_blocks++; - } - } - return i_blocks; -} - -/****************************************************************************** -******************************************************************************* -** ** do_leaf_extended() ** ** Description: diff --git a/gfs2/edit/gfs2hex.h b/gfs2/edit/gfs2hex.h index 7b98d44..04db331 100644 --- a/gfs2/edit/gfs2hex.h +++ b/gfs2/edit/gfs2hex.h @@ -16,12 +16,12 @@ #include "hexedit.h" -int display_gfs2(void); -int edit_gfs2(void); -void do_dinode_extended(struct gfs2_dinode *di, struct gfs2_buffer_head *lbh); -void print_gfs2(const char *fmt, ...); -int do_indirect_extended(char *diebuf, struct iinfo *iinf, int hgt); -uint64_t do_leaf_extended(char *dlebuf, struct iinfo *indir); -void eol(int col); +extern int display_gfs2(void); +extern int edit_gfs2(void); +extern void do_dinode_extended(struct gfs2_dinode *di, + struct gfs2_buffer_head *lbh); +extern void print_gfs2(const char *fmt, ...); +extern uint64_t do_leaf_extended(char *dlebuf, struct iinfo *indir); +extern void eol(int col); #endif /* __GFS2HEX_DOT_H__ */ diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 1c3fafe..17a2962 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -37,14 +37,7 @@ #include "hexedit.h" #include "libgfs2.h" #include "gfs2hex.h" - -#include <syslog.h> - -#define RGLIST_DUMMY_BLOCK -2 - -#define pv(struct, member, fmt, fmt2) do { \ - print_it(" "#member, fmt, fmt2, struct->member); \ - } while (FALSE); +#include "extended.h" const char *mtypes[] = {"none", "sb", "rg", "rb", "di", "in", "lf", "jd", "lh", "ld", "ea", "ed", "lb", "13", "qc"}; @@ -95,9 +88,6 @@ extern void restoremeta(const char *in_fn, const char *out_device, } \ } while(0) -static int display_indirect(struct iinfo *ind, int indblocks, int level, - uint64_t startoff); - static int gfs2_dinode_printval(struct gfs2_dinode *dip, const char *strfield) { checkprint(strfield, dip, di_mode); @@ -675,11 +665,9 @@ static int hexdump(uint64_t startaddr, int len) ptr2 = (unsigned char *)lpBuffer + offset; l = offset; print_entry_ndx = 0; - while (((termlines && - line < termlines && - line <= ((screen_chunk_size / 16) + 2)) || - (!termlines && l < len)) && - l < sbd.bsize) { + while (((termlines && line < termlines && + line <= ((screen_chunk_size / 16) + 2)) || + (!termlines && l < len)) && l < sbd.bsize) { int ptr_not_null = 0; if (termlines) { @@ -792,17 +780,6 @@ uint64_t masterblock(const char *fn) } /* ------------------------------------------------------------------------ */ -/* risize - size of one rindex entry, whether gfs1 or gfs2 */ -/* ------------------------------------------------------------------------ */ -static int risize(void) -{ - if (gfs1) - return sizeof(struct gfs_rindex); - else - return sizeof(struct gfs2_rindex); -} - -/* ------------------------------------------------------------------------ */ /* rgcount - return how many rgrps there are. */ /* ------------------------------------------------------------------------ */ static void rgcount(void) @@ -842,7 +819,7 @@ static uint64_t find_rgrp_block(struct gfs2_inode *dif, int rg) /* ------------------------------------------------------------------------ */ /* gfs_rgrp_in - Read in a resource group header */ /* ------------------------------------------------------------------------ */ -static void gfs_rgrp_in(struct gfs_rgrp *rgrp, struct gfs2_buffer_head *rbh) +void gfs_rgrp_in(struct gfs_rgrp *rgrp, struct gfs2_buffer_head *rbh) { struct gfs_rgrp *str = (struct gfs_rgrp *)rbh->b_data; @@ -876,7 +853,7 @@ static void gfs_rgrp_out(struct gfs_rgrp *rgrp, struct gfs2_buffer_head *rbh) /* ------------------------------------------------------------------------ */ /* gfs_rgrp_print - print a gfs1 resource group */ /* ------------------------------------------------------------------------ */ -static void gfs_rgrp_print(struct gfs_rgrp *rg) +void gfs_rgrp_print(struct gfs_rgrp *rg) { gfs2_meta_header_print(&rg->rg_header); pv(rg, rg_flags, "%u", "0x%x"); @@ -963,75 +940,6 @@ static void set_rgrp_flags(int rgnum, uint32_t new_flags, int modify, int full) } /* ------------------------------------------------------------------------ */ -/* parse_rindex - print the rgindex file. */ -/* ------------------------------------------------------------------------ */ -static int parse_rindex(struct gfs2_inode *dip, int print_rindex) -{ - int error, start_line; - struct gfs2_rindex ri; - char rbuf[sizeof(struct gfs_rindex)]; - char highlighted_addr[32]; - - start_line = line; - error = 0; - print_gfs2("RG index entries found: %d.", dip->i_di.di_size / risize()); - eol(0); - lines_per_row[dmode] = 6; - memset(highlighted_addr, 0, sizeof(highlighted_addr)); - - for (print_entry_ndx=0; ; print_entry_ndx++) { - uint64_t roff; - - roff = print_entry_ndx * risize(); - - if (gfs1) - error = gfs1_readi(dip, (void *)&rbuf, roff, risize()); - else - error = gfs2_readi(dip, (void *)&rbuf, roff, risize()); - if (!error) /* end of file */ - break; - gfs2_rindex_in(&ri, rbuf); - if (!termlines || - (print_entry_ndx >= start_row[dmode] && - ((print_entry_ndx - start_row[dmode])+1) * lines_per_row[dmode] <= - termlines - start_line - 2)) { - if (edit_row[dmode] == print_entry_ndx) { - COLORS_HIGHLIGHT; - sprintf(highlighted_addr, "%llx", (unsigned long long)ri.ri_addr); - } - print_gfs2("RG #%d", print_entry_ndx); - if (!print_rindex) - print_gfs2(" located at: %llu (0x%llx)", - ri.ri_addr, ri.ri_addr); - eol(0); - if (edit_row[dmode] == print_entry_ndx) - COLORS_NORMAL; - if(print_rindex) - gfs2_rindex_print(&ri); - else { - struct gfs2_buffer_head *tmp_bh; - - tmp_bh = bread(&sbd, ri.ri_addr); - if (gfs1) { - struct gfs_rgrp rg1; - gfs_rgrp_in(&rg1, tmp_bh); - gfs_rgrp_print(&rg1); - } else { - struct gfs2_rgrp rg; - gfs2_rgrp_in(&rg, tmp_bh); - gfs2_rgrp_print(&rg); - } - brelse(tmp_bh); - } - last_entry_onscreen[dmode] = print_entry_ndx; - } - } - strcpy(estring, highlighted_addr); - end_row[dmode] = print_entry_ndx; - return error; -} - -/* ------------------------------------------------------------------------ */ /* gfs_jindex_in - read in a gfs1 jindex structure. */ /* ------------------------------------------------------------------------ */ void gfs_jindex_in(struct gfs_jindex *jindex, char *jbuf) @@ -1045,142 +953,9 @@ void gfs_jindex_in(struct gfs_jindex *jindex, char *jbuf) } /* ------------------------------------------------------------------------ */ -/* gfs_jindex_print - print an jindex entry. */ -/* ------------------------------------------------------------------------ */ -static void gfs_jindex_print(struct gfs_jindex *ji) -{ - pv((unsigned long long)ji, ji_addr, "%llu", "0x%llx"); - pv(ji, ji_nsegment, "%u", "0x%x"); - pv(ji, ji_pad, "%u", "0x%x"); -} - -/* ------------------------------------------------------------------------ */ -/* print_jindex - print the jindex file. */ -/* ------------------------------------------------------------------------ */ -static int print_jindex(struct gfs2_inode *dij) -{ - int error, start_line; - struct gfs_jindex ji; - char jbuf[sizeof(struct gfs_jindex)]; - - start_line = line; - error = 0; - print_gfs2("Journal index entries found: %d.", - dij->i_di.di_size / sizeof(struct gfs_jindex)); - eol(0); - lines_per_row[dmode] = 4; - for (print_entry_ndx=0; ; print_entry_ndx++) { - error = gfs2_readi(dij, (void *)&jbuf, - print_entry_ndx*sizeof(struct gfs_jindex), - sizeof(struct gfs_jindex)); - gfs_jindex_in(&ji, jbuf); - if (!error) /* end of file */ - break; - if (!termlines || - (print_entry_ndx >= start_row[dmode] && - ((print_entry_ndx - start_row[dmode])+1) * - lines_per_row[dmode] <= termlines - start_line - 2)) { - if (edit_row[dmode] == print_entry_ndx) { - COLORS_HIGHLIGHT; - strcpy(efield, "ji_addr"); - sprintf(estring, "%" PRIx64, ji.ji_addr); - } - print_gfs2("Journal #%d", print_entry_ndx); - eol(0); - if (edit_row[dmode] == print_entry_ndx) - COLORS_NORMAL; - gfs_jindex_print(&ji); - last_entry_onscreen[dmode] = print_entry_ndx; - } - } - end_row[dmode] = print_entry_ndx; - return error; -} - -/* ------------------------------------------------------------------------ */ -/* print_inum - print the inum file. */ -/* ------------------------------------------------------------------------ */ -static int print_inum(struct gfs2_inode *dii) -{ - uint64_t inum, inodenum; - int rc; - - rc = gfs2_readi(dii, (void *)&inum, 0, sizeof(inum)); - if (!rc) { - print_gfs2("The inum file is empty."); - eol(0); - return 0; - } - if (rc != sizeof(inum)) { - print_gfs2("Error reading inum file."); - eol(0); - return -1; - } - inodenum = be64_to_cpu(inum); - print_gfs2("Next inode num = %lld (0x%llx)", inodenum, inodenum); - eol(0); - return 0; -} - -/* ------------------------------------------------------------------------ */ -/* print_statfs - print the statfs file. */ -/* ------------------------------------------------------------------------ */ -static int print_statfs(struct gfs2_inode *dis) -{ - struct gfs2_statfs_change sfb, sfc; - int rc; - - rc = gfs2_readi(dis, (void *)&sfb, 0, sizeof(sfb)); - if (!rc) { - print_gfs2("The statfs file is empty."); - eol(0); - return 0; - } - if (rc != sizeof(sfb)) { - print_gfs2("Error reading statfs file."); - eol(0); - return -1; - } - gfs2_statfs_change_in(&sfc, (char *)&sfb); - print_gfs2("statfs file contents:"); - eol(0); - gfs2_statfs_change_print(&sfc); - return 0; -} - -/* ------------------------------------------------------------------------ */ -/* print_quota - print the quota file. */ -/* ------------------------------------------------------------------------ */ -static int print_quota(struct gfs2_inode *diq) -{ - struct gfs2_quota qbuf, q; - int i, error; - - print_gfs2("quota file contents:"); - eol(0); - print_gfs2("quota entries found: %d.", diq->i_di.di_size / sizeof(q)); - eol(0); - for (i=0; ; i++) { - error = gfs2_readi(diq, (void *)&qbuf, i * sizeof(q), sizeof(qbuf)); - if (!error) - break; - if (error != sizeof(qbuf)) { - print_gfs2("Error reading quota file."); - eol(0); - return -1; - } - gfs2_quota_in(&q, (char *)&qbuf); - print_gfs2("Entry #%d", i + 1); - eol(0); - gfs2_quota_print(&q); - } - return 0; -} - -/* ------------------------------------------------------------------------ */ /* has_indirect_blocks */ /* ------------------------------------------------------------------------ */ -static int has_indirect_blocks(void) +int has_indirect_blocks(void) { if (indirect_blocks || gfs2_struct_type == GFS2_METATYPE_SB || gfs2_struct_type == GFS2_METATYPE_LF || @@ -1261,7 +1036,7 @@ static void print_inode_type(__be16 de_type) /* ------------------------------------------------------------------------ */ /* display_leaf - display directory leaf */ /* ------------------------------------------------------------------------ */ -static int display_leaf(struct iinfo *ind) +int display_leaf(struct iinfo *ind) { int start_line, total_dirents = start_row[dmode]; int d; @@ -1319,250 +1094,6 @@ static int display_leaf(struct iinfo *ind) } /* ------------------------------------------------------------------------ */ -/* metapath_to_lblock - convert from metapath, height to logical block */ -/* ------------------------------------------------------------------------ */ -static uint64_t metapath_to_lblock(struct metapath *mp, int hgt) -{ - int h; - uint64_t lblock = 0; - uint64_t factor[GFS2_MAX_META_HEIGHT]; - - if (di.di_height < 2) - return mp->mp_list[0]; - /* figure out multiplication factors for each height */ - memset(&factor, 0, sizeof(factor)); - factor[di.di_height - 1] = 1ull; - for (h = di.di_height - 2; h >= 0; h--) - factor[h] = factor[h + 1] * sbd.sd_inptrs; - for (h = 0; h <= hgt; h++) - lblock += (mp->mp_list[h] * factor[h]); - return lblock; -} - -/* ------------------------------------------------------------------------ */ -/* dinode_valid - check if we have a dinode in recent history */ -/* ------------------------------------------------------------------------ */ -static int dinode_valid(void) -{ - int i; - - if (gfs2_struct_type == GFS2_METATYPE_DI) - return 1; - for (i = 0; i <= blockhist && i < 5; i++) { - if (blockstack[(blockhist - i) % - BLOCK_STACK_SIZE].gfs2_struct_type == - GFS2_METATYPE_DI) - return 1; - } - return 0; -} - -/* ------------------------------------------------------------------------ */ -/* get_height */ -/* ------------------------------------------------------------------------ */ -static int get_height(void) -{ - int cur_height = 0, i; - - if (gfs2_struct_type != GFS2_METATYPE_DI) { - for (i = 0; i <= blockhist && i < 5; i++) { - if (blockstack[(blockhist - i) % - BLOCK_STACK_SIZE].gfs2_struct_type == - GFS2_METATYPE_DI) - break; - cur_height++; - } - } - return cur_height; -} - -/* ------------------------------------------------------------------------ */ -/* print_block_details */ -/* ------------------------------------------------------------------------ */ -static void print_block_details(struct iinfo *ind, int level, int cur_height, - int pndx, uint64_t file_offset) -{ - struct iinfo *more_indir; - int more_ind; - char *tmpbuf; - uint64_t thisblk; - - thisblk = ind->ii[pndx].block; - more_indir = malloc(sizeof(struct iinfo)); - if (!more_indir) { - fprintf(stderr, "Out of memory in function " - "display_indirect\n"); - return; - } - tmpbuf = malloc(sbd.bsize); - if (!tmpbuf) { - fprintf(stderr, "Out of memory in function " - "display_indirect\n"); - return; - } - while (thisblk) { - lseek(sbd.device_fd, thisblk * sbd.bsize, SEEK_SET); - /* read in the desired block */ - if (read(sbd.device_fd, tmpbuf, sbd.bsize) != sbd.bsize) { - fprintf(stderr, "bad read: %s from %s:%d: block %lld " - "(0x%llx)\n", strerror(errno), __FUNCTION__, - __LINE__, - (unsigned long long)ind->ii[pndx].block, - (unsigned long long)ind->ii[pndx].block); - exit(-1); - } - thisblk = 0; - memset(more_indir, 0, sizeof(struct iinfo)); - if (S_ISDIR(di.di_mode) && level == di.di_height) { - thisblk = do_leaf_extended(tmpbuf, more_indir); - display_leaf(more_indir); - } else { - int x; - - for (x = 0; x < 512; x++) { - memcpy(&more_indir->ii[x].mp, - &ind->ii[pndx].mp, - sizeof(struct metapath)); - more_indir->ii[x].mp.mp_list[cur_height+1] = x; - } - more_ind = do_indirect_extended(tmpbuf, more_indir, - cur_height + 1); - display_indirect(more_indir, more_ind, level + 1, - file_offset); - } - if (thisblk) { - eol(0); - if (termlines) - move(line,9); - print_gfs2("Continuation block 0x%llx / %lld", - thisblk, thisblk); - } - } - free(tmpbuf); - free(more_indir); -} - -/* ------------------------------------------------------------------------ */ -/* display_indirect */ -/* ------------------------------------------------------------------------ */ -static int display_indirect(struct iinfo *ind, int indblocks, int level, - uint64_t startoff) -{ - int start_line, total_dirents; - int cur_height = -1, pndx; - - last_entry_onscreen[dmode] = 0; - if (!has_indirect_blocks()) - return -1; - if (!level) { - if (gfs2_struct_type == GFS2_METATYPE_DI) { - if (S_ISDIR(di.di_mode)) - print_gfs2("This directory contains %d indirect blocks", - indblocks); - else - print_gfs2("This inode contains %d indirect blocks", - indblocks); - } else - print_gfs2("This indirect block contains %d indirect blocks", - indblocks); - } - total_dirents = 0; - if (dinode_valid() && !S_ISDIR(di.di_mode)) { - /* See if we are on an inode or have one in history. */ - if (level) - cur_height = level; - else { - cur_height = get_height(); - print_gfs2(" (at height %d of %d)", - cur_height, di.di_height); - } - } - eol(0); - if (!level && indblocks) { - print_gfs2("Indirect blocks:"); - eol(0); - } - start_line = line; - dsplines = termlines - line - 1; - for (pndx = start_row[dmode]; - (!termlines || pndx < termlines - start_line - 1 - + start_row[dmode]) && pndx < indblocks; - pndx++) { - uint64_t file_offset; - - if (pndx && ind->ii[pndx].block == ind->ii[pndx - 1].block) - continue; - print_entry_ndx = pndx; - if (termlines) { - if (edit_row[dmode] >= 0 && - line - start_line == - edit_row[dmode] - start_row[dmode]) - COLORS_HIGHLIGHT; - move(line, 1); - } - if (!termlines) { - int h; - - for (h = 0; h < level; h++) - print_gfs2(" "); - } - print_gfs2("%d => ", pndx); - if (termlines) - move(line,9); - print_gfs2("0x%llx / %lld", ind->ii[pndx].block, - ind->ii[pndx].block); - if (termlines) { - if (edit_row[dmode] >= 0 && - line - start_line == - edit_row[dmode] - start_row[dmode]) { - sprintf(estring, "%"PRIx64, - ind->ii[print_entry_ndx].block); - strcpy(edit_fmt, "%"PRIx64); - edit_size[dmode] = strlen(estring); - COLORS_NORMAL; - } - } - if (dinode_valid() && !S_ISDIR(di.di_mode)) { - float human_off; - char h; - - file_offset = metapath_to_lblock(&ind->ii[pndx].mp, - cur_height) * - sbd.bsize; - print_gfs2(" "); - h = 'K'; - human_off = (file_offset / 1024.0); - if (human_off > 1024.0) { h = 'M'; human_off /= 1024.0; } - if (human_off > 1024.0) { h = 'G'; human_off /= 1024.0; } - if (human_off > 1024.0) { h = 'T'; human_off /= 1024.0; } - if (human_off > 1024.0) { h = 'P'; human_off /= 1024.0; } - if (human_off > 1024.0) { h = 'E'; human_off /= 1024.0; } - print_gfs2("(data offset 0x%llx / %lld / %6.2f%c)", - file_offset, file_offset, human_off, h); - print_gfs2(" "); - } - else - file_offset = 0; - if (dinode_valid() && !termlines && - ((level + 1 < di.di_height) || - (S_ISDIR(di.di_mode) && level <= di.di_height))) { - print_block_details(ind, level, cur_height, pndx, - file_offset); - } - print_entry_ndx = pndx; /* restore after recursion */ - eol(0); - } /* for each display row */ - if (line >= 7) /* 7 because it was bumped at the end */ - last_entry_onscreen[dmode] = line - 7; - eol(0); - end_row[dmode] = indblocks; - if (end_row[dmode] < last_entry_onscreen[dmode]) - end_row[dmode] = last_entry_onscreen[dmode]; - lines_per_row[dmode] = 1; - return 0; -} - -/* ------------------------------------------------------------------------ */ /* block_is_rindex */ /* ------------------------------------------------------------------------ */ int block_is_rindex(void) @@ -1574,18 +1105,6 @@ int block_is_rindex(void) } /* ------------------------------------------------------------------------ */ -/* block_is_rglist - there's no such block as the rglist. This is a */ -/* special case meant to parse the rindex and follow the */ -/* blocks to the real rgs. */ -/* ------------------------------------------------------------------------ */ -static int block_is_rglist(void) -{ - if (block == RGLIST_DUMMY_BLOCK) - return TRUE; - return FALSE; -} - -/* ------------------------------------------------------------------------ */ /* block_is_jindex */ /* ------------------------------------------------------------------------ */ int block_is_jindex(void) @@ -1679,63 +1198,6 @@ static int block_has_extended_info(void) } /* ------------------------------------------------------------------------ */ -/* display_extended */ -/* ------------------------------------------------------------------------ */ -static int display_extended(void) -{ - struct gfs2_inode *tmp_inode; - struct gfs2_buffer_head *tmp_bh; - - /* Display any indirect pointers that we have. */ - if (block_is_rindex()) { - tmp_bh = bread(&sbd, block); - tmp_inode = inode_get(&sbd, tmp_bh); - parse_rindex(tmp_inode, TRUE); - brelse(tmp_bh); - } - else if (has_indirect_blocks() && !indirect_blocks && - !display_leaf(indirect)) - return -1; - else if (display_indirect(indirect, indirect_blocks, 0, 0) == 0) - return -1; - else if (block_is_rglist()) { - if (gfs1) - tmp_bh = bread(&sbd, - sbd1->sb_rindex_di.no_addr); - else - tmp_bh = bread(&sbd, masterblock("rindex")); - tmp_inode = inode_get(&sbd, tmp_bh); - parse_rindex(tmp_inode, FALSE); - brelse(tmp_bh); - } - else if (block_is_jindex()) { - tmp_bh = bread(&sbd, block); - tmp_inode = inode_get(&sbd, tmp_bh); - print_jindex(tmp_inode); - brelse(tmp_bh); - } - else if (block_is_inum_file()) { - tmp_bh = bread(&sbd, block); - tmp_inode = inode_get(&sbd, tmp_bh); - print_inum(tmp_inode); - brelse(tmp_bh); - } - else if (block_is_statfs_file()) { - tmp_bh = bread(&sbd, block); - tmp_inode = inode_get(&sbd, tmp_bh); - print_statfs(tmp_inode); - brelse(tmp_bh); - } - else if (block_is_quota_file()) { - tmp_bh = bread(&sbd, block); - tmp_inode = inode_get(&sbd, tmp_bh); - print_quota(tmp_inode); - brelse(tmp_bh); - } - return 0; -} - -/* ------------------------------------------------------------------------ */ /* read_superblock - read the superblock */ /* ------------------------------------------------------------------------ */ static void read_superblock(int fd) @@ -1889,16 +1351,15 @@ int display(int identify_only) do_dinode_extended(&di, bh); /* get extended data, if any */ } else if (gfs2_struct_type == GFS2_METATYPE_IN) { /* indirect block list */ - int i, hgt = get_height(); - if (blockhist) { + int i; + for (i = 0; i < 512; i++) memcpy(&indirect->ii[i].mp, &blockstack[blockhist - 1].mp, sizeof(struct metapath)); } - indirect_blocks = do_indirect_extended(bh->b_data, indirect, - hgt); + indirect_blocks = do_indirect_extended(bh->b_data, indirect); } else if (gfs2_struct_type == GFS2_METATYPE_LF) { /* directory leaf */ do_leaf_extended(bh->b_data, indirect); @@ -2303,16 +1764,16 @@ static void hex_edit(int *exitch) left_off = ((block * sbd.bsize) < 0xffffffff) ? 9 : 17; /* 8 and 16 char addresses on screen */ - if (bobgets(estring, edit_row[dmode] + 3, - (edit_col[dmode] * 2) + (edit_col[dmode] / 4) + left_off, - 2, exitch)) { + if (bobgets(estring, edit_row[HEX_MODE] + 3, + (edit_col[HEX_MODE] * 2) + (edit_col[HEX_MODE] / 4) + + left_off, 2, exitch)) { if (strstr(edit_fmt,"X") || strstr(edit_fmt,"x")) { int hexoffset; int i, sl = strlen(estring); for (i = 0; i < sl; i+=2) { - hexoffset = (edit_row[dmode] * 16) + - edit_col[dmode] + (i / 2); + hexoffset = (edit_row[HEX_MODE] * 16) + + edit_col[HEX_MODE] + (i / 2); ch = 0x00; if (isdigit(estring[i])) ch = (estring[i] - '0') * 0x10; diff --git a/gfs2/edit/hexedit.h b/gfs2/edit/hexedit.h index 15aa112..8d2e9b8 100644 --- a/gfs2/edit/hexedit.h +++ b/gfs2/edit/hexedit.h @@ -66,6 +66,12 @@ enum dsp_mode { HEX_MODE = 0, GFS2_MODE = 1, EXTENDED_MODE = 2, INIT_MODE = 3 }; #define GFS_LOG_DESC_Q (402) /* quota */ #define GFS_LOG_DESC_LAST (500) /* final in a logged transaction */ +#define pv(struct, member, fmt, fmt2) do { \ + print_it(" "#member, fmt, fmt2, struct->member); \ + } while (FALSE); +#define RGLIST_DUMMY_BLOCK -2 + +extern struct gfs2_sb sb; extern uint64_t block; extern int blockhist; extern int edit_mode; @@ -171,26 +177,6 @@ struct gfs_rgrp { char rg_reserved[64]; }; -extern int block_is_jindex(void); -extern int block_is_rindex(void); -extern int block_is_inum_file(void); -extern int block_is_statfs_file(void); -extern int block_is_quota_file(void); -extern int block_is_per_node(void); -extern int block_is_in_per_node(void); -extern int display_block_type(int from_restore); -extern void gfs_jindex_in(struct gfs_jindex *jindex, char *buf); -extern void gfs_log_header_in(struct gfs_log_header *head, - struct gfs2_buffer_head *bh); -extern void gfs_log_header_print(struct gfs_log_header *lh); -extern void gfs_dinode_in(struct gfs_dinode *di, struct gfs2_buffer_head *bh); -extern void savemeta(char *out_fn, int saveoption); -extern void restoremeta(const char *in_fn, const char *out_device, - uint64_t printblocksonly); -extern int display(int identify_only); -extern uint64_t check_keywords(const char *kword); -extern uint64_t masterblock(const char *fn); - struct gfs2_dirents { uint64_t block; struct gfs2_dirent dirent; @@ -262,6 +248,29 @@ extern struct indirect_info masterdir; /* Master directory info */ extern int indirect_blocks; /* count of indirect blocks */ extern enum dsp_mode dmode; +/* ------------------------------------------------------------------------ */ +/* risize - size of one rindex entry, whether gfs1 or gfs2 */ +/* ------------------------------------------------------------------------ */ +static inline int risize(void) +{ + if (gfs1) + return sizeof(struct gfs_rindex); + else + return sizeof(struct gfs2_rindex); +} + +/* ------------------------------------------------------------------------ */ +/* block_is_rglist - there's no such block as the rglist. This is a */ +/* special case meant to parse the rindex and follow the */ +/* blocks to the real rgs. */ +/* ------------------------------------------------------------------------ */ +static inline int block_is_rglist(void) +{ + if (block == RGLIST_DUMMY_BLOCK) + return TRUE; + return FALSE; +} + #define SCREEN_HEIGHT (16) #define SCREEN_WIDTH (16) @@ -341,4 +350,27 @@ extern enum dsp_mode dmode; } \ } while (0) +extern int block_is_jindex(void); +extern int block_is_rindex(void); +extern int block_is_inum_file(void); +extern int block_is_statfs_file(void); +extern int block_is_quota_file(void); +extern int block_is_per_node(void); +extern int block_is_in_per_node(void); +extern int display_block_type(int from_restore); +extern void gfs_jindex_in(struct gfs_jindex *jindex, char *buf); +extern void gfs_log_header_in(struct gfs_log_header *head, + struct gfs2_buffer_head *bh); +extern void gfs_log_header_print(struct gfs_log_header *lh); +extern void gfs_dinode_in(struct gfs_dinode *di, struct gfs2_buffer_head *bh); +extern void savemeta(char *out_fn, int saveoption); +extern void restoremeta(const char *in_fn, const char *out_device, + uint64_t printblocksonly); +extern int display(int identify_only); +extern uint64_t check_keywords(const char *kword); +extern uint64_t masterblock(const char *fn); +extern void gfs_rgrp_print(struct gfs_rgrp *rg); +extern void gfs_rgrp_in(struct gfs_rgrp *rgrp, struct gfs2_buffer_head *rbh); +extern int has_indirect_blocks(void); + #endif /* __HEXVIEW_DOT_H__ */

1 0

cluster: RHEL57 - gfs2_edit: Fix memory leak in savemeta option
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ff… Commit: ff658f227fa956f1f8e68d37ae49579960358cbd Parent: 45b63600a8cc8836f48f580192ced51d0e2f3f7b Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Dec 13 10:58:28 2010 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 14:36:09 2011 -0600 gfs2_edit: Fix memory leak in savemeta option The savemeta option of gfs2_edit was not releasing its buffers after they were used, so they kept accumulating in memory. In large file systems, it was nearly impossible to save the metadata because it would run out of memory and start swapping to disk. rhbz#656371 --- gfs2/edit/savemeta.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index fbc1f4f..7c28ae9 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -46,7 +46,6 @@ struct saved_metablock { }; struct saved_metablock *savedata; -struct gfs2_buffer_head *savebh; uint64_t last_fs_block, last_reported_block, blks_saved, total_out, pct; uint64_t journal_blocks[MAX_JOURNALS_SAVED]; uint64_t gfs1_journal_size = 0; /* in blocks */ @@ -212,6 +211,7 @@ static int save_block(int fd, int out_fd, uint64_t blk) int blktype, blklen, outsz; uint16_t trailing0; char *p; + struct gfs2_buffer_head *savebh; if (blk > last_fs_block) { fprintf(stderr, "\nWarning: bad block pointer '0x%llx' " @@ -230,8 +230,10 @@ static int save_block(int fd, int out_fd, uint64_t blk) inode, not the block within the inode "blk". They may or may not be the same thing. */ if (get_gfs_struct_info(savebh, &blktype, &blklen) && - !block_is_systemfile()) + !block_is_systemfile()) { + brelse(savebh); return 0; /* Not metadata, and not system file, so skip it */ + } trailing0 = 0; p = &savedata->buf[blklen - 1]; while (*p=='\0' && trailing0 < sbd.bsize) { @@ -246,6 +248,7 @@ static int save_block(int fd, int out_fd, uint64_t blk) do_write(out_fd, savedata->buf, outsz); total_out += sizeof(savedata->blk) + sizeof(savedata->siglen) + outsz; blks_saved++; + brelse(savebh); return blktype; }

1 0

cluster: RHEL57 - gfs2_edit: give meaningful feedback for savemeta and restoremeta
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=45… Commit: 45b63600a8cc8836f48f580192ced51d0e2f3f7b Parent: 125c3caa0be6df210106eb451ba42801a9db5ceb Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Dec 13 10:54:00 2010 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 14:36:09 2011 -0600 gfs2_edit: give meaningful feedback for savemeta and restoremeta This patch gives the gfs2_edit "savemeta" and "restoremeta" options a better way of giving meaningful progress feedback and size information to the user. rhbz#656371 --- gfs2/edit/savemeta.c | 120 ++++++++++++++++++++++++++------------------------ 1 files changed, 63 insertions(+), 57 deletions(-) diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index fbda237..fbc1f4f 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -73,6 +73,25 @@ static int block_is_systemfile(void) block_is_per_node() || block_is_in_per_node(); } +/** + * anthropomorphize - make a uint64_t number more human + */ +static const char *anthropomorphize(unsigned long long inhuman_value) +{ + const char *symbols = " KMGTPE"; + int i; + unsigned long long val = inhuman_value, remainder; + static char out_val[32]; + + memset(out_val, 0, sizeof(out_val)); + for (i = 0; i < 6 && val > 1024; i++) { + remainder = val % 1024; + val /= 1024; + } + sprintf(out_val, "%llu.%llu%c", val, remainder, symbols[i]); + return out_val; +} + /* * get_gfs_struct_info - get block type and structure length * @@ -162,7 +181,7 @@ static int get_gfs_struct_info(struct gfs2_buffer_head *lbh, int *block_type, /* checking every block kills performance. We only report */ /* every second because we don't need 100 extra messages in */ /* logs made from verbose mode. */ -static void warm_fuzzy_stuff(uint64_t wfsblock, int force, int save) +static void warm_fuzzy_stuff(uint64_t wfsblock, int force) { static struct timeval tv; static uint32_t seconds = 0; @@ -177,22 +196,10 @@ static void warm_fuzzy_stuff(uint64_t wfsblock, int force, int save) seconds = tv.tv_sec; if (last_fs_block) { printf("\r"); - if (save) { - percent = (wfsblock * 100) / last_fs_block; - printf("%" PRIu64 " metadata blocks (%" - PRIu64 "%%) processed, ", wfsblock, - percent); - } - if (total_out < 1024 * 1024) - printf("%" PRIu64 " metadata blocks (%" - PRIu64 "KB) %s. ", - blks_saved, total_out / 1024, - save?"saved":"restored"); - else - printf("%" PRIu64 " metadata blocks (%" - PRIu64 "MB) %s. ", - blks_saved, total_out / (1024*1024), - save?"saved":"restored"); + percent = (wfsblock * 100) / last_fs_block; + printf("%" PRIu64 " metadata blocks (%" + PRIu64 "%%) processed, ", wfsblock, + percent); if (force) printf("\n"); fflush(stdout); @@ -504,6 +511,7 @@ void savemeta(char *out_fn, int saveoption) int rgcount; uint64_t jindex_block; struct gfs2_buffer_head *lbh; + struct rgrp_list *last_rgd, *prev_rgd; slow = (saveoption == 1); sbd.md.journals = 1; @@ -558,8 +566,8 @@ void savemeta(char *out_fn, int saveoption) } } last_fs_block = lseek(sbd.device_fd, 0, SEEK_END) / sbd.bsize; - printf("There are %" PRIu64 " blocks of %u bytes.\n", - last_fs_block, sbd.bsize); + printf("There are %" PRIu64 " blocks of %u bytes in the destination " + "device.\n", last_fs_block, sbd.bsize); if (!slow) { if (gfs1) { sbd.md.riinode = inode_read(&sbd, @@ -582,6 +590,7 @@ void savemeta(char *out_fn, int saveoption) } if (!slow) { int sane; + uint64_t fssize; printf("Reading resource groups..."); fflush(stdout); @@ -589,7 +598,16 @@ void savemeta(char *out_fn, int saveoption) slow = gfs1_ri_update(&sbd, 0, &rgcount, 0); else slow = ri_update(&sbd, 0, &rgcount, &sane); - printf("Done.\n\n"); + last_rgd = osi_list_entry(sbd.rglist.prev, + struct rgrp_list, list); + prev_rgd = osi_list_entry(last_rgd->list.prev, + struct rgrp_list, list); + fssize = last_rgd->ri.ri_addr + + (last_rgd->ri.ri_addr - prev_rgd->ri.ri_addr); + last_fs_block = fssize; + fssize *= sbd.bsize; + printf("Done. File system size: %s\n\n", + anthropomorphize(fssize)); fflush(stdout); } get_journal_inode_blocks(); @@ -632,7 +650,7 @@ void savemeta(char *out_fn, int saveoption) /* Save off the rg and bitmaps */ for (block = rgd->ri.ri_addr; block < rgd->ri.ri_data0; block++) { - warm_fuzzy_stuff(block, FALSE, TRUE); + warm_fuzzy_stuff(block, FALSE); save_block(sbd.device_fd, out_fd, block); } /* Save off the other metadata: inodes, etc. */ @@ -640,7 +658,7 @@ void savemeta(char *out_fn, int saveoption) int blktype; while (!gfs2_next_rg_meta(rgd, &block, first)){ - warm_fuzzy_stuff(block, FALSE, TRUE); + warm_fuzzy_stuff(block, FALSE); blktype = save_block(sbd.device_fd, out_fd, block); if (blktype == GFS2_METATYPE_DI) @@ -669,7 +687,7 @@ void savemeta(char *out_fn, int saveoption) /* There may be a gap between end of file system and end of device */ /* so we tell the user that we've processed everything. */ block = last_fs_block; - warm_fuzzy_stuff(block, TRUE, TRUE); + warm_fuzzy_stuff(block, TRUE); printf("\nMetadata saved to file %s.\n", out_fn); free(savedata); close(out_fd); @@ -677,24 +695,8 @@ void savemeta(char *out_fn, int saveoption) exit(0); } -/** - * anthropomorphize - make a uint64_t number more human - */ -static const char *anthropomorphize(unsigned long long inhuman_value) -{ - const char *symbols = " KMGTPE"; - int i; - unsigned long long val = inhuman_value; - static char out_val[32]; - - memset(out_val, 0, sizeof(out_val)); - for (i = 0; i < 6 && val > 1024; i++) - val /= 1024; - sprintf(out_val, "%llu%c", val, symbols[i]); - return out_val; -} - -static int restore_data(int fd, int in_fd, int printblocksonly) +static int restore_data(int fd, int in_fd, int printblocksonly, + int find_highblk) { size_t rs; uint64_t buf64, writes = 0, highest_valid_block = 0; @@ -773,24 +775,23 @@ static int restore_data(int fd, int in_fd, int printblocksonly) gfs2_sb_in(&sbd.sd_sb, &dummy_bh); sbd1 = (struct gfs_sb *)&sbd.sd_sb; if (sbd1->sb_fs_format == GFS_FORMAT_FS && - sbd1->sb_header.mh_type == - GFS_METATYPE_SB && - sbd1->sb_header.mh_format == - GFS_FORMAT_SB && - sbd1->sb_multihost_format == - GFS_FORMAT_MULTI) { + sbd1->sb_header.mh_type == GFS_METATYPE_SB && + sbd1->sb_header.mh_format == GFS_FORMAT_SB && + sbd1->sb_multihost_format == GFS_FORMAT_MULTI) { gfs1 = TRUE; } else if (check_sb(&sbd.sd_sb)) { fprintf(stderr,"Error: Invalid superblock data.\n"); return -1; } sbd.bsize = sbd.sd_sb.sb_bsize; - if (!printblocksonly) { + if (find_highblk) + ; + else if (!printblocksonly) { last_fs_block = lseek(fd, 0, SEEK_END) / sbd.bsize; printf("There are %" PRIu64 " blocks of " \ "%u bytes in the destination" \ - " file system.\n\n", + " device.\n\n", last_fs_block, sbd.bsize); } else { printf("This is %s metadata\n", gfs1 ? @@ -800,10 +801,12 @@ static int restore_data(int fd, int in_fd, int printblocksonly) } bh = &dummy_bh; bh->b_data = savedata->buf; - if (printblocksonly) { + if (savedata->blk > highest_valid_block) + highest_valid_block = savedata->blk; + if (find_highblk) + ; + else if (printblocksonly) { block = savedata->blk; - if (block > highest_valid_block) - highest_valid_block = block; if (printblocksonly > 1 && printblocksonly == block) { block_in_mem = block; display(0); @@ -814,7 +817,7 @@ static int restore_data(int fd, int in_fd, int printblocksonly) display_block_type(TRUE); } } else { - warm_fuzzy_stuff(savedata->blk, FALSE, FALSE); + warm_fuzzy_stuff(savedata->blk, FALSE); if (savedata->blk >= last_fs_block) { printf("\nOut of space on the destination " "device; quitting.\n"); @@ -843,13 +846,15 @@ static int restore_data(int fd, int in_fd, int printblocksonly) } blks_saved++; } - if (!printblocksonly) - warm_fuzzy_stuff(savedata->blk, TRUE, FALSE); - else + if (!printblocksonly && !find_highblk) + warm_fuzzy_stuff(last_fs_block, TRUE); + if (find_highblk) { printf("File system size: %lld (0x%llx) blocks, aka %sB\n", (unsigned long long)highest_valid_block, (unsigned long long)highest_valid_block, anthropomorphize(highest_valid_block * sbd.bsize)); + last_fs_block = highest_valid_block; + } return 0; } @@ -888,7 +893,8 @@ void restoremeta(const char *in_fn, const char *out_device, die("Can't allocate memory for the restore operation.\n"); blks_saved = 0; - error = restore_data(sbd.device_fd, in_fd, printblocksonly); + restore_data(sbd.device_fd, in_fd, printblocksonly, 1); + error = restore_data(sbd.device_fd, in_fd, printblocksonly, 0); printf("File %s %s %s.\n", in_fn, (printblocksonly ? "print" : "restore"), (error ? "error" : "successful"));

1 0

cluster: RHEL57 - gfs2_edit: tiny (stuffed) files had user data saved with savemeta
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=12… Commit: 125c3caa0be6df210106eb451ba42801a9db5ceb Parent: 958040b30a788f48c0451ca589db4018b4a325af Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Dec 13 10:52:25 2010 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 14:36:09 2011 -0600 gfs2_edit: tiny (stuffed) files had user data saved with savemeta The gfs2_edit savemeta option was saving the entire block for dinodes. That's okay for average files where you need to save indirect block pointers. It's okay for directories where you need to save the directory block pointers. It's okay for system files where you want to save statfs data or inum data and such. But it's not okay with stuffed user files because they contain user data. This patch checks for this special dinode condition and saves only the dinode structure. rhbz#656371 --- gfs2/edit/savemeta.c | 51 +++++++++++++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 19 deletions(-) diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index 273178f..fbda237 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -55,6 +55,24 @@ int journals_found = 0; extern void read_superblock(void); uint64_t masterblock(const char *fn); +static int block_is_a_journal(void) +{ + int j; + + for (j = 0; j < journals_found; j++) + if (block == journal_blocks[j]) + return TRUE; + return FALSE; +} + +static int block_is_systemfile(void) +{ + return block_is_jindex() || block_is_inum_file() || + block_is_statfs_file() || block_is_quota_file() || + block_is_rindex() || block_is_a_journal() || + block_is_per_node() || block_is_in_per_node(); +} + /* * get_gfs_struct_info - get block type and structure length * @@ -68,6 +86,7 @@ static int get_gfs_struct_info(struct gfs2_buffer_head *lbh, int *block_type, int *gstruct_len) { struct gfs2_meta_header mh; + struct gfs2_inode *inode; *block_type = 0; *gstruct_len = sbd.bsize; @@ -89,7 +108,19 @@ static int get_gfs_struct_info(struct gfs2_buffer_head *lbh, int *block_type, *gstruct_len = sbd.bsize; break; case GFS2_METATYPE_DI: /* 4 (disk inode) */ - *gstruct_len = sbd.bsize; /*sizeof(struct gfs_dinode);*/ + if (gfs1) + inode = inode_get(&sbd, lbh); + else + inode = gfs_inode_get(&sbd, lbh); + if (inode->i_di.di_flags & GFS2_DIF_EXHASH && + (S_ISDIR(inode->i_di.di_mode) || + (gfs1 && inode->i_di.__pad1 == GFS_FILE_DIR))) + *gstruct_len = sbd.bsize; + else if (!inode->i_di.di_height && !block_is_systemfile() && + !S_ISDIR(inode->i_di.di_mode)) + *gstruct_len = sizeof(struct gfs2_dinode); + else + *gstruct_len = sbd.bsize; break; case GFS2_METATYPE_IN: /* 5 (indir inode blklst) */ *gstruct_len = sbd.bsize; /*sizeof(struct gfs_indirect);*/ @@ -169,24 +200,6 @@ static void warm_fuzzy_stuff(uint64_t wfsblock, int force, int save) } } -static int block_is_a_journal(void) -{ - int j; - - for (j = 0; j < journals_found; j++) - if (block == journal_blocks[j]) - return TRUE; - return FALSE; -} - -static int block_is_systemfile(void) -{ - return block_is_jindex() || block_is_inum_file() || - block_is_statfs_file() || block_is_quota_file() || - block_is_rindex() || block_is_a_journal() || - block_is_per_node() || block_is_in_per_node(); -} - static int save_block(int fd, int out_fd, uint64_t blk) { int blktype, blklen, outsz;

1 0

cluster: RHEL57 - gfs2_edit: negative block numbers don't jump a negative amount
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=95… Commit: 958040b30a788f48c0451ca589db4018b4a325af Parent: 7c8b325db69186d61a44a0f38c46278ea000b2a6 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Dec 13 10:46:17 2010 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 14:36:09 2011 -0600 gfs2_edit: negative block numbers don't jump a negative amount This patch fixes a bug whereby entering a negative block number in the block address was not jumping the appropriate amount. rhbz#656371 --- gfs2/edit/hexedit.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 196b324..1c3fafe 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -2242,26 +2242,19 @@ uint64_t check_keywords(const char *kword) static uint64_t goto_block(void) { char string[256]; - int ch; + int ch, delta; memset(string, 0, sizeof(string)); sprintf(string,"%"PRId64, block); if (bobgets(string, 1, 7, 16, &ch)) { if (isalnum(string[0]) || string[0] == '/') temp_blk = check_keywords(string); - else if (string[0] == '+') { - if (string[1] == '0' && string[2] == 'x') - sscanf(string, "%"SCNx64, &temp_blk); - else - sscanf(string, "%" PRIu64, &temp_blk); - temp_blk += block; - } - else if (string[0] == '-') { + else if (string[0] == '+' || string[0] == '-') { if (string[1] == '0' && string[2] == 'x') - sscanf(string, "%"SCNx64, &temp_blk); + sscanf(string, "%x", &delta); else - sscanf(string, "%" PRIu64, &temp_blk); - temp_blk -= block; + sscanf(string, "%d", &delta); + temp_blk = block + delta; } if (temp_blk == RGLIST_DUMMY_BLOCK || temp_blk < max_block) {

1 0

cluster: RHEL57 - gfs2_edit: print hex numbers in lower-case
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7c… Commit: 7c8b325db69186d61a44a0f38c46278ea000b2a6 Parent: c9c57f5f0409743435e171c57cc7e59bd0b09cac Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Dec 13 10:45:03 2010 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 14:36:08 2011 -0600 gfs2_edit: print hex numbers in lower-case This patch changes the gfs2_edit output so it always prints hex numbers in lower-case so they match debug output from the debugfs and dmesg. rhbz#656371 --- gfs2/edit/hexedit.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index c7d1849..196b324 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -358,7 +358,7 @@ static int bobgets(char string[],int x,int y,int sz,int *ch) break; default: move(0,70); - printw("%08X",*ch); + printw("%08x",*ch); // ignore all other characters break; } // end switch on non-printable character @@ -494,7 +494,7 @@ int display_block_type(int from_restore) else print_gfs2(" "); if (!from_restore) { - print_gfs2("of %" PRIu64 " (0x%" PRIX64 ")", max_block, + print_gfs2("of %" PRIu64 " (0x%" PRIx64 ")", max_block, max_block); if (termlines) move(line, 55); @@ -670,7 +670,7 @@ static int hexdump(uint64_t startaddr, int len) uint64_t l; const char *lpBuffer = bh->b_data; - strcpy(edit_fmt,"%02X"); + strcpy(edit_fmt,"%02x"); pointer = (unsigned char *)lpBuffer + offset; ptr2 = (unsigned char *)lpBuffer + offset; l = offset; @@ -687,9 +687,9 @@ static int hexdump(uint64_t startaddr, int len) COLORS_OFFSETS; /* cyan for offsets */ } if (startaddr < 0xffffffff) - print_gfs2("%.8"PRIX64, startaddr + l); + print_gfs2("%.8"PRIx64, startaddr + l); else - print_gfs2("%.16"PRIX64, startaddr + l); + print_gfs2("%.16"PRIx64, startaddr + l); if (termlines) { if (l < struct_len) COLORS_NORMAL; /* normal part of structure */ @@ -742,9 +742,9 @@ static int hexdump(uint64_t startaddr, int len) i == edit_col[dmode]) { COLORS_HIGHLIGHT; /* in the structure */ memset(estring,0,3); - sprintf(estring,"%02X",*pointer); + sprintf(estring,"%02x",*pointer); } - print_gfs2("%02X",*pointer); + print_gfs2("%02x",*pointer); if (termlines && line == edit_row[dmode] + 3 && i == edit_col[dmode]) { if (l < struct_len + offset) @@ -2892,7 +2892,7 @@ static void interactive_mode(void) break; default: move(termlines - 1, 0); - printw("Keystroke not understood: 0x%03X",ch); + printw("Keystroke not understood: 0x%03x",ch); refresh(); usleep(50000); break; @@ -2933,7 +2933,7 @@ void gfs_log_header_in(struct gfs_log_header *head, void gfs_log_header_print(struct gfs_log_header *lh) { gfs2_meta_header_print(&lh->lh_header); - pv(lh, lh_flags, "%u", "0x%.8X"); + pv(lh, lh_flags, "%u", "0x%.8x"); pv(lh, lh_pad, "%u", "%x"); pv((unsigned long long)lh, lh_first, "%llu", "%llx"); pv((unsigned long long)lh, lh_sequence, "%llu", "%llx");

1 0

cluster: RHEL57 - gfs2_edit: better printing of directory leaf information
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c9… Commit: c9c57f5f0409743435e171c57cc7e59bd0b09cac Parent: 3575517393317423b10a9717fc5157261993625d Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Dec 13 10:42:38 2010 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 14:36:08 2011 -0600 gfs2_edit: better printing of directory leaf information This patch gives gfs2_edit the ability to better parse out and print directory information for exhash directories several levels deep. rhbz#656371 --- gfs2/edit/gfs2hex.c | 13 ++++- gfs2/edit/gfs2hex.h | 2 +- gfs2/edit/hexedit.c | 135 +++++++++++++++++++++++++++++++-------------------- gfs2/edit/hexedit.h | 4 ++ 4 files changed, 99 insertions(+), 55 deletions(-) diff --git a/gfs2/edit/gfs2hex.c b/gfs2/edit/gfs2hex.c index 2934877..1505783 100644 --- a/gfs2/edit/gfs2hex.c +++ b/gfs2/edit/gfs2hex.c @@ -425,17 +425,25 @@ int do_indirect_extended(char *buf, struct iinfo *iinf, int hgt) ** ** Output(s): ** -** Returns: +** Returns: next leaf block, if any, in a chain of leaf blocks ** ******************************************************************************* ******************************************************************************/ -void do_leaf_extended(char *dlebuf, struct iinfo *indir) +uint64_t do_leaf_extended(char *dlebuf, struct iinfo *indir) { int x, i; struct gfs2_dirent de; + struct gfs2_leaf leaf; + struct gfs2_buffer_head tbh; /* kludge */ x = 0; memset(indir, 0, sizeof(*indir)); + tbh.b_data = dlebuf; + gfs2_leaf_in(&leaf, &tbh); + indir->ii[0].lf_depth = leaf.lf_depth; + indir->ii[0].lf_entries = leaf.lf_entries; + indir->ii[0].lf_dirent_format = leaf.lf_dirent_format; + indir->ii[0].lf_next = leaf.lf_next; /* Directory Entries: */ for (i = sizeof(struct gfs2_leaf); i < sbd.bsize; i += de.de_rec_len) { @@ -456,6 +464,7 @@ void do_leaf_extended(char *dlebuf, struct iinfo *indir) if (de.de_rec_len <= sizeof(struct gfs2_dirent)) break; } + return leaf.lf_next; } diff --git a/gfs2/edit/gfs2hex.h b/gfs2/edit/gfs2hex.h index ebe6b0e..7b98d44 100644 --- a/gfs2/edit/gfs2hex.h +++ b/gfs2/edit/gfs2hex.h @@ -21,7 +21,7 @@ int edit_gfs2(void); void do_dinode_extended(struct gfs2_dinode *di, struct gfs2_buffer_head *lbh); void print_gfs2(const char *fmt, ...); int do_indirect_extended(char *diebuf, struct iinfo *iinf, int hgt); -void do_leaf_extended(char *dlebuf, struct iinfo *indir); +uint64_t do_leaf_extended(char *dlebuf, struct iinfo *indir); void eol(int col); #endif /* __GFS2HEX_DOT_H__ */ diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 8919cef..c7d1849 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -95,6 +95,9 @@ extern void restoremeta(const char *in_fn, const char *out_device, } \ } while(0) +static int display_indirect(struct iinfo *ind, int indblocks, int level, + uint64_t startoff); + static int gfs2_dinode_printval(struct gfs2_dinode *dip, const char *strfield) { checkprint(strfield, dip, di_mode); @@ -1267,7 +1270,11 @@ static int display_leaf(struct iinfo *ind) if (gfs2_struct_type == GFS2_METATYPE_SB) print_gfs2("The superblock has 2 directories"); else - print_gfs2("This directory block contains %d directory entries.", + print_gfs2("Directory block: lf_depth:%d, lf_entries:%d," + "fmt:%d next=0x%llx (%d dirents).", + ind->ii[0].lf_depth, ind->ii[0].lf_entries, + ind->ii[0].lf_dirent_format, + ind->ii[0].lf_next, ind->ii[0].dirents); start_line = line; @@ -1276,7 +1283,7 @@ static int display_leaf(struct iinfo *ind) + start_row[dmode]) break; total_dirents++; - if (ind->ii[0].dirents > 1) { + if (ind->ii[0].dirents >= 1) { eol(5); if (termlines) { if (edit_row[dmode] >=0 && @@ -1370,9 +1377,76 @@ static int get_height(void) } /* ------------------------------------------------------------------------ */ +/* print_block_details */ +/* ------------------------------------------------------------------------ */ +static void print_block_details(struct iinfo *ind, int level, int cur_height, + int pndx, uint64_t file_offset) +{ + struct iinfo *more_indir; + int more_ind; + char *tmpbuf; + uint64_t thisblk; + + thisblk = ind->ii[pndx].block; + more_indir = malloc(sizeof(struct iinfo)); + if (!more_indir) { + fprintf(stderr, "Out of memory in function " + "display_indirect\n"); + return; + } + tmpbuf = malloc(sbd.bsize); + if (!tmpbuf) { + fprintf(stderr, "Out of memory in function " + "display_indirect\n"); + return; + } + while (thisblk) { + lseek(sbd.device_fd, thisblk * sbd.bsize, SEEK_SET); + /* read in the desired block */ + if (read(sbd.device_fd, tmpbuf, sbd.bsize) != sbd.bsize) { + fprintf(stderr, "bad read: %s from %s:%d: block %lld " + "(0x%llx)\n", strerror(errno), __FUNCTION__, + __LINE__, + (unsigned long long)ind->ii[pndx].block, + (unsigned long long)ind->ii[pndx].block); + exit(-1); + } + thisblk = 0; + memset(more_indir, 0, sizeof(struct iinfo)); + if (S_ISDIR(di.di_mode) && level == di.di_height) { + thisblk = do_leaf_extended(tmpbuf, more_indir); + display_leaf(more_indir); + } else { + int x; + + for (x = 0; x < 512; x++) { + memcpy(&more_indir->ii[x].mp, + &ind->ii[pndx].mp, + sizeof(struct metapath)); + more_indir->ii[x].mp.mp_list[cur_height+1] = x; + } + more_ind = do_indirect_extended(tmpbuf, more_indir, + cur_height + 1); + display_indirect(more_indir, more_ind, level + 1, + file_offset); + } + if (thisblk) { + eol(0); + if (termlines) + move(line,9); + print_gfs2("Continuation block 0x%llx / %lld", + thisblk, thisblk); + } + } + free(tmpbuf); + free(more_indir); +} + +/* ------------------------------------------------------------------------ */ /* display_indirect */ /* ------------------------------------------------------------------------ */ -static int display_indirect(struct iinfo *ind, int indblocks, int level, uint64_t startoff) +static int display_indirect(struct iinfo *ind, int indblocks, int level, + uint64_t startoff) { int start_line, total_dirents; int cur_height = -1, pndx; @@ -1388,8 +1462,7 @@ static int display_indirect(struct iinfo *ind, int indblocks, int level, uint64_ else print_gfs2("This inode contains %d indirect blocks", indblocks); - } - else + } else print_gfs2("This indirect block contains %d indirect blocks", indblocks); } @@ -1417,6 +1490,8 @@ static int display_indirect(struct iinfo *ind, int indblocks, int level, uint64_ pndx++) { uint64_t file_offset; + if (pndx && ind->ii[pndx].block == ind->ii[pndx - 1].block) + continue; print_entry_ndx = pndx; if (termlines) { if (edit_row[dmode] >= 0 && @@ -1470,53 +1545,9 @@ static int display_indirect(struct iinfo *ind, int indblocks, int level, uint64_ file_offset = 0; if (dinode_valid() && !termlines && ((level + 1 < di.di_height) || - (S_ISDIR(di.di_mode) && !level))) { - struct iinfo *more_indir; - int more_ind; - char *tmpbuf; - - more_indir = malloc(sizeof(struct iinfo)); - tmpbuf = malloc(sbd.bsize); - if (tmpbuf) { - lseek(sbd.device_fd, - ind->ii[pndx].block * sbd.bsize, - SEEK_SET); - /* read in the desired block */ - if (read(sbd.device_fd, tmpbuf, sbd.bsize) != - sbd.bsize) { - fprintf(stderr, "bad read: %s from %s:" - "%d: block %lld (0x%llx)\n", - strerror(errno), - __FUNCTION__, __LINE__, - (unsigned long long)ind->ii[pndx].block, - (unsigned long long)ind->ii[pndx].block); - exit(-1); - } - memset(more_indir, 0, sizeof(struct iinfo)); - if (S_ISDIR(di.di_mode)) { - do_leaf_extended(tmpbuf, more_indir); - display_leaf(more_indir); - } else { - int x; - - for (x = 0; x < 512; x++) { - memcpy(&more_indir->ii[x].mp, - &ind->ii[pndx].mp, - sizeof(struct metapath)); - more_indir->ii[x]. - mp.mp_list[cur_height+1] = - x; - } - more_ind = do_indirect_extended(tmpbuf, - more_indir, - cur_height + 1); - display_indirect(more_indir, - more_ind, level + 1, - file_offset); - } - free(tmpbuf); - } - free(more_indir); + (S_ISDIR(di.di_mode) && level <= di.di_height))) { + print_block_details(ind, level, cur_height, pndx, + file_offset); } print_entry_ndx = pndx; /* restore after recursion */ eol(0); diff --git a/gfs2/edit/hexedit.h b/gfs2/edit/hexedit.h index d78779d..15aa112 100644 --- a/gfs2/edit/hexedit.h +++ b/gfs2/edit/hexedit.h @@ -202,6 +202,10 @@ struct indirect_info { int height; uint64_t block; uint32_t dirents; + uint16_t lf_depth; + uint16_t lf_entries; + uint32_t lf_dirent_format; + uint64_t lf_next; struct metapath mp; struct gfs2_dirents dirent[64]; };

1 0

cluster: STABLE31 - build: allow dbus notification code to be disabled
by Lon Hohberger 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5d… Commit: 5d044c3b62d51c688257faecd69bbf3112d7728f Parent: e7aa9a1ed52b7225a11e4865ed00594c15149bcf Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Wed Feb 2 10:34:58 2011 +0100 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Wed Feb 2 15:36:34 2011 -0500 build: allow dbus notification code to be disabled default is to build with dbus support Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- configure | 7 +++++++ make/defines.mk.input | 1 + rgmanager/src/daemons/Makefile | 6 +++++- 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 7e1aca7..9c7a773 100755 --- a/configure +++ b/configure @@ -73,6 +73,7 @@ my %options = ( confdir => \$confdir, conffile => \$conffile, enable_contrib => \$enable_contrib, + disable_dbus => \$disable_dbus, somajor => \$somajor, sominor => \$sominor, release_version => \$release_version, @@ -144,6 +145,7 @@ my $err = &GetOptions (\%options, 'sominor=s', 'release_version=s', 'enable_contrib', + 'disable_dbus', 'without_common', 'without_config', 'without_cman', @@ -219,6 +221,7 @@ if ($help || !$err) { print "--ldapincdir=\tthe base directory for ldap include files. (Default: {incdir})\n"; print "--ldaplibdir=\tthe base directory for ldap libraries. (Default: {libdir})\n"; print "--enable_contrib\tEnable build of community contributed code/tools. (Default: no)\n"; + print "--disable_dbus\tDisable built-in support for dbus notifications. (Default: no)\n"; print "--without_common\tDisable common building (Default: enabled)\n"; print "--without_config\tDisable config building (Default: enabled)\n"; print "--without_cman\tDisable cman building (Default: enabled)\n"; @@ -504,6 +507,9 @@ if (!$conffile) { if (!$enable_contrib) { $enable_contrib=""; } +if (!$disable_dbus) { + $disable_dbus=""; +} if (!$without_common) { $without_common=""; } @@ -598,6 +604,7 @@ while (<IFILE>) { $_ =~ s/\@CONFDIR\@/$confdir/; $_ =~ s/\@CONFFILE\@/$conffile/; $_ =~ s/\@ENABLE_CONTRIB\@/$enable_contrib/; + $_ =~ s/\@DISABLE_DBUS\@/$disable_dbus/; $_ =~ s/\@DISABLE_COMMON\@/$without_common/; $_ =~ s/\@DISABLE_CONFIG\@/$without_config/; $_ =~ s/\@DISABLE_CMAN\@/$without_cman/; diff --git a/make/defines.mk.input b/make/defines.mk.input index 3751cf5..ee5f852 100644 --- a/make/defines.mk.input +++ b/make/defines.mk.input @@ -58,6 +58,7 @@ ldaplibdir ?= @LDAPLIBDIR@ zlibincdir ?= @ZLIBINCDIR@ zliblibdir ?= @ZLIBLIBDIR@ contrib_code ?= @ENABLE_CONTRIB@ +disable_dbus ?= @DISABLE_DBUS@ without_common ?= @DISABLE_COMMON@ without_config ?= @DISABLE_CONFIG@ without_cman ?= @DISABLE_CMAN@ diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile index 9619990..7218c53 100644 --- a/rgmanager/src/daemons/Makefile +++ b/rgmanager/src/daemons/Makefile @@ -47,7 +47,6 @@ CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${logtincdir} CFLAGS += `xml2-config --cflags` -I${slangincdir} CFLAGS += -I$(S)/../../include CFLAGS += -I${incdir} -CFLAGS += `pkg-config --cflags dbus-1` NOCCS_CFLAGS += -DNO_CCS @@ -61,7 +60,12 @@ DLM_LDFLAGS += -L${dlmlibdir} -ldlm XML2_LDFLAGS += `xml2-config --libs` SLANG_LDFLAGS += -L${slanglibdir} -lslang EXTRA_LDFLAGS += -lpthread + +# dbus support for notifications +ifndef disable_dbus +CFLAGS += -DDBUS `pkg-config --cflags dbus-1` DBUS_LDFLAGS += `pkg-config --libs dbus-1` +endif LDDEPS += ../clulib/libclulib.a

1 0

cluster: STABLE31 - rgmanager: Match fenced's option to disable DBus
by Lon Hohberger 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e7… Commit: e7aa9a1ed52b7225a11e4865ed00594c15149bcf Parent: 7e86355c80c5a44755e8989bbbd855b03d0d613e Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Feb 2 14:21:29 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Wed Feb 2 15:36:34 2011 -0500 rgmanager: Match fenced's option to disable DBus Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/man/rgmanager.8 | 2 +- rgmanager/src/daemons/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rgmanager/man/rgmanager.8 b/rgmanager/man/rgmanager.8 index a4e2c73..2b018d2 100644 --- a/rgmanager/man/rgmanager.8 +++ b/rgmanager/man/rgmanager.8 @@ -371,7 +371,7 @@ will leave the virtual machine running. Run in the foreground (do not fork). .IP \-d Enable debug-level logging. -.IP \-D +.IP \-q Disable DBus signals which are normally sent when services change state. .IP \-w Disable internal process monitoring (for debugging). diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index dad379a..02cd2dc 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -951,7 +951,7 @@ main(int argc, char **argv) pthread_t th; cman_handle_t clu = NULL; - while ((rv = getopt(argc, argv, "wfdND")) != EOF) { + while ((rv = getopt(argc, argv, "wfdNq")) != EOF) { switch (rv) { case 'w': wd = 0; @@ -965,7 +965,7 @@ main(int argc, char **argv) case 'f': foreground = 1; break; - case 'D': + case 'q': rgm_dbus_notify = 0; break; default:

1 0

cluster: STABLE31 - rgmanager: minor dbus cleanups
by Lon Hohberger 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7e… Commit: 7e86355c80c5a44755e8989bbbd855b03d0d613e Parent: 2bb7321cbf54fe39f561a2ba172d0b6e17da926f Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Feb 2 14:15:32 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Wed Feb 2 15:36:34 2011 -0500 rgmanager: minor dbus cleanups Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/update-dbus.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c index c9bbf40..f465d1d 100644 --- a/rgmanager/src/daemons/update-dbus.c +++ b/rgmanager/src/daemons/update-dbus.c @@ -47,7 +47,7 @@ rgm_dbus_init(void) dbc = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err); if (!dbc) { - logt_print(LOG_ERR, + logt_print(LOG_DEBUG, "DBus Failed to initialize: dbus_bus_get: %s\n", err.message); dbus_error_free(&err); @@ -72,7 +72,7 @@ rgm_dbus_init(void) #ifdef DBUS static int -_rgm_dbus_release(int err) +_rgm_dbus_release(void) { pthread_t t; @@ -83,7 +83,7 @@ _rgm_dbus_release(int err) * to wake up, so just have it poll XXX */ /* if the thread left because the dbus connection died, - this block is avoided since the thread exits */ + this block is avoided */ if (th) { t = th; th = 0; @@ -94,15 +94,13 @@ _rgm_dbus_release(int err) dbus_connection_unref(db); db = NULL; - if (err) - logt_print(LOG_ERR, "DBus Connection Lost\n"); - else - logt_print(LOG_DEBUG, "DBus Released\n"); + logt_print(LOG_DEBUG, "DBus Released\n"); return 0; } #endif +/* Clean shutdown (e.g. when exiting */ int rgm_dbus_release(void) #ifdef DBUS @@ -110,7 +108,7 @@ rgm_dbus_release(void) int ret; pthread_mutex_lock(&mu); - ret = _rgm_dbus_release(0); + ret = _rgm_dbus_release(); pthread_mutex_unlock(&mu); return ret; } @@ -122,6 +120,9 @@ rgm_dbus_release(void) #ifdef DBUS +/* Auto-flush thread. Since sending only guarantees queueing, + * we need this thread to push things out over dbus in the + * background */ static void * _dbus_auto_flush(void *arg) { @@ -154,8 +155,15 @@ _rgm_dbus_notify(const char *svcname, pthread_mutex_lock(&mu); + /* Check to ensure the connection is still valid. If it + * isn't, clean up and shut down the dbus connection. + * + * The main rgmanager thread will periodically try to + * reinitialize the dbus notification subsystem unless + * the administrator ran rgmanager with the -D command + * line option. + */ if (dbus_connection_get_is_connected(db) != TRUE) { - _rgm_dbus_release(1); goto out_unlock; } @@ -192,6 +200,9 @@ out_free: } +/* + * view-formation callback function + */ int32_t rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) { @@ -242,7 +253,7 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) if (ret < 0) { logt_print(LOG_ERR, "Error sending update for %s; " - "notifications disabled\n", key); + "DBus notifications disabled\n", key); rgm_dbus_release(); }

1 0

cluster: STABLE31 - rgmanager: Retry dbus if we get disconnected
by Lon Hohberger 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=2b… Commit: 2bb7321cbf54fe39f561a2ba172d0b6e17da926f Parent: 09aa67a2d768fc0f1e4185ca198398ec809c13b5 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Feb 2 13:48:10 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Wed Feb 2 15:36:34 2011 -0500 rgmanager: Retry dbus if we get disconnected Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/main.c | 9 ++++- rgmanager/src/daemons/update-dbus.c | 60 ++++++++++++++++++++++++----------- 2 files changed, 48 insertions(+), 21 deletions(-) diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 1929072..dad379a 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -684,6 +684,8 @@ event_loop(msgctx_t *localctx, msgctx_t *clusterctx) dump_internal_state("/var/lib/cluster/rgmanager-dump"); } + rgm_dbus_init(); + while (running && (tv.tv_sec || tv.tv_usec)) { FD_ZERO(&rfds); max = -1; @@ -1035,8 +1037,11 @@ main(int argc, char **argv) configure_rgmanager(-1, debug, &cluster_timeout); logt_print(LOG_NOTICE, "Resource Group Manager Starting\n"); - if (rgm_dbus_notify && rgm_dbus_init() != 0) - logt_print(LOG_NOTICE, "Failed to initialize DBus\n"); + if (rgm_dbus_notify && rgm_dbus_init() != 0) { + rgm_dbus_notify = 0; + logt_print(LOG_NOTICE, "Failed to initialize DBus; " + "notifications disabled\n"); + } if (init_resource_groups(0, do_init) != 0) { logt_print(LOG_CRIT, "#8: Couldn't initialize services\n"); diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c index a3fb5e7..c9bbf40 100644 --- a/rgmanager/src/daemons/update-dbus.c +++ b/rgmanager/src/daemons/update-dbus.c @@ -21,8 +21,6 @@ static DBusConnection *db = NULL; static pthread_mutex_t mu = PTHREAD_MUTEX_INITIALIZER; static pthread_t th = 0; -static char _err[512]; -static int err_set = 0; #endif /* Set this to the desired value prior to calling rgm_dbus_init() */ @@ -39,20 +37,29 @@ rgm_dbus_init(void) if (!rgm_dbus_notify) return 0; + pthread_mutex_lock(&mu); + if (db) { + pthread_mutex_unlock(&mu); + return 0; + } + dbus_error_init(&err); - dbc = dbus_bus_get(DBUS_BUS_SYSTEM, &err); + dbc = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err); if (!dbc) { - snprintf(_err, sizeof(_err), - "dbus_bus_get: %s", err.message); - err_set = 1; + logt_print(LOG_ERR, + "DBus Failed to initialize: dbus_bus_get: %s\n", + err.message); dbus_error_free(&err); + pthread_mutex_unlock(&mu); return -1; } dbus_connection_set_exit_on_disconnect(dbc, FALSE); db = dbc; + pthread_mutex_unlock(&mu); + logt_print(LOG_DEBUG, "DBus Notifications Initialized\n"); return 0; } #else @@ -63,9 +70,9 @@ rgm_dbus_init(void) #endif -int -rgm_dbus_release(void) #ifdef DBUS +static int +_rgm_dbus_release(int err) { pthread_t t; @@ -74,17 +81,39 @@ rgm_dbus_release(void) /* tell thread to exit - not sure how to tell dbus * to wake up, so just have it poll XXX */ + + /* if the thread left because the dbus connection died, + this block is avoided since the thread exits */ if (th) { t = th; th = 0; pthread_join(t, NULL); } + dbus_connection_close(db); dbus_connection_unref(db); db = NULL; + if (err) + logt_print(LOG_ERR, "DBus Connection Lost\n"); + else + logt_print(LOG_DEBUG, "DBus Released\n"); return 0; } +#endif + + +int +rgm_dbus_release(void) +#ifdef DBUS +{ + int ret; + + pthread_mutex_lock(&mu); + ret = _rgm_dbus_release(0); + pthread_mutex_unlock(&mu); + return ret; +} #else { return 0; @@ -98,14 +127,12 @@ _dbus_auto_flush(void *arg) { /* DBus connection functions are thread safe */ dbus_connection_ref(db); - while (dbus_connection_read_write(db, 500)) { if (!th) break; } dbus_connection_unref(db); - th = 0; return NULL; } @@ -121,11 +148,6 @@ _rgm_dbus_notify(const char *svcname, DBusMessage *msg = NULL; int ret = -1; - if (err_set) { - fprintf(stderr, "%s\n", _err); - err_set = 0; - } - if (!db) { goto out_free; } @@ -133,9 +155,7 @@ _rgm_dbus_notify(const char *svcname, pthread_mutex_lock(&mu); if (dbus_connection_get_is_connected(db) != TRUE) { - err_set = 1; - snprintf(_err, sizeof(_err), "DBus connection lost"); - rgm_dbus_release(); + _rgm_dbus_release(1); goto out_unlock; } @@ -184,6 +204,8 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) if (!rgm_dbus_notify) goto out_free; + if (!db) + goto out_free; if (view == 1) goto out_free; if (size != (sizeof(*st))) @@ -209,6 +231,7 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) if (!last) last = "(none)"; + flags[0] = 0; rg_flags_str(flags, sizeof(flags), st->rs_flags, (char *)" "); if (flags[0] == 0) snprintf(flags, sizeof(flags), "(none)"); @@ -221,7 +244,6 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) logt_print(LOG_ERR, "Error sending update for %s; " "notifications disabled\n", key); rgm_dbus_release(); - rgm_dbus_notify = 0; } out_free:

1 0

cluster: STABLE31 - rgmanager: Clean up dbus notifications
by Lon Hohberger 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=09… Commit: 09aa67a2d768fc0f1e4185ca198398ec809c13b5 Parent: aee1f6136bb06f7893da320c230f8d0a91f1d953 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Feb 2 09:28:22 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Wed Feb 2 15:36:34 2011 -0500 rgmanager: Clean up dbus notifications Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/include/rg_dbus.h | 20 ++++-- rgmanager/src/daemons/Makefile | 2 +- rgmanager/src/daemons/main.c | 82 +-------------------------- rgmanager/src/daemons/update-dbus.c | 105 ++++++++++++++++++++++++++++++++--- 4 files changed, 115 insertions(+), 94 deletions(-) diff --git a/rgmanager/include/rg_dbus.h b/rgmanager/include/rg_dbus.h index 6454f29..3ef5ae1 100644 --- a/rgmanager/include/rg_dbus.h +++ b/rgmanager/include/rg_dbus.h @@ -1,14 +1,20 @@ -#ifdef DBUS #ifndef _RGM_DBUS_H #define _RGM_DBUS_H int rgm_dbus_init(void); int rgm_dbus_release(void); -int rgm_dbus_notify(const char *svcname, - const char *svcstatus, - const char *svcflags, - const char *svcowner, - const char *svclast); +extern int rgm_dbus_notify; -#endif +#ifdef DBUS + +#define RGM_DBUS_DEFAULT 1 +#define RGM_DBUS_UPDATE (rgm_dbus_notify?rgm_dbus_update:0) +int32_t rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size); + +#else + +#define RGM_DBUS_DEFAULT 0 +#define RGM_DBUS_UPDATE NULL + +#endif /* DBUS */ #endif diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile index 4dbbe5a..9619990 100644 --- a/rgmanager/src/daemons/Makefile +++ b/rgmanager/src/daemons/Makefile @@ -41,7 +41,7 @@ OBJS2= test-noccs.o \ rg_locks-noccs.o \ event_config-noccs.o -CFLAGS += -DDBUS -DSHAREDIR=\"${sharedir}\" -D_GNU_SOURCE +CFLAGS += -DSHAREDIR=\"${sharedir}\" -D_GNU_SOURCE CFLAGS += -fPIC CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${logtincdir} CFLAGS += `xml2-config --cflags` -I${slangincdir} diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 303e0c0..1929072 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -43,9 +43,6 @@ static int signalled = 0; static uint8_t ALIGNED port = RG_PORT; static char *rgmanager_lsname = (char *)"rgmanager"; /* XXX default */ static int status_poll_interval = DEFAULT_CHECK_INTERVAL; -#ifdef DBUS -static int state_notify = 1; -#endif static void segfault(int __attribute__ ((unused)) sig) @@ -938,68 +935,6 @@ shutdown_thread(void __attribute__ ((unused)) *arg) } -#ifdef DBUS -static int32_t -svc_update(char *key, uint64_t view, void *data, uint32_t size) -{ - char flags[64]; - rg_state_t *st; - cluster_member_list_t *m; - const char *owner; - const char *last; - int ret = 0; - - if (!state_notify) - goto out_free; - if (view == 1) - goto out_free; - if (size != (sizeof(*st))) - goto out_free; - - st = (rg_state_t *)data; - swab_rg_state_t(st); - - /* Don't send transitional states */ - if (st->rs_state == RG_STATE_STARTING || - st->rs_state == RG_STATE_STOPPING) - goto out_free; - - m = member_list(); - if (!m) - goto out_free; - - owner = memb_id_to_name(m, st->rs_owner); - last = memb_id_to_name(m, st->rs_last_owner); - - if (!owner) - owner = "(none)"; - if (!last) - last = "(none)"; - - rg_flags_str(flags, sizeof(flags), st->rs_flags, (char *)" "); - if (flags[0] == 0) - snprintf(flags, sizeof(flags), "(none)"); - - ret = rgm_dbus_notify(st->rs_name, - rg_state_str(st->rs_state), - (char *)flags, owner, last); - - if (ret < 0) { - logt_print(LOG_ERR, "Error sending update for %s; " - "notifications disabled\n", key); - rgm_dbus_release(); - state_notify = 0; - } - -out_free: - if (m) - free_member_list(m); - free(data); - return 0; -} -#endif - - #ifdef WRAP_THREADS void dump_thread_states(FILE *); #endif @@ -1029,9 +964,7 @@ main(int argc, char **argv) foreground = 1; break; case 'D': -#ifdef DBUS - state_notify = 0; -#endif + rgm_dbus_notify = 0; break; default: return 1; @@ -1102,10 +1035,8 @@ main(int argc, char **argv) configure_rgmanager(-1, debug, &cluster_timeout); logt_print(LOG_NOTICE, "Resource Group Manager Starting\n"); -#ifdef DBUS - if (state_notify && rgm_dbus_init() != 0) + if (rgm_dbus_notify && rgm_dbus_init() != 0) logt_print(LOG_NOTICE, "Failed to initialize DBus\n"); -#endif if (init_resource_groups(0, do_init) != 0) { logt_print(LOG_CRIT, "#8: Couldn't initialize services\n"); @@ -1149,11 +1080,8 @@ main(int argc, char **argv) ds_key_init("rg_lockdown", 32, 10); #else - if (vf_init(me.cn_nodeid, port, NULL, -#ifdef DBUS /* Ugly */ - state_notify ? svc_update : -#endif - NULL, cluster_timeout) != 0) { + if (vf_init(me.cn_nodeid, port, NULL, RGM_DBUS_UPDATE, + cluster_timeout) != 0) { logt_print(LOG_CRIT, "#11: Couldn't set up VF listen socket\n"); goto out_ls; } @@ -1185,9 +1113,7 @@ out_ls: clu_lock_finished(rgmanager_lsname); out: -#ifdef DBUS rgm_dbus_release(); -#endif logt_print(LOG_NOTICE, "Shutdown complete, exiting\n"); cman_finish(clu); diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c index 9e3078d..a3fb5e7 100644 --- a/rgmanager/src/daemons/update-dbus.c +++ b/rgmanager/src/daemons/update-dbus.c @@ -1,11 +1,18 @@ /* DBus notifications */ +#include <stdint.h> +#include <rg_dbus.h> +#include <errno.h> + +#ifdef DBUS + #include <stdio.h> #include <stdint.h> #include <resgroup.h> #include <poll.h> #include <dbus/dbus.h> -#include <rg_dbus.h> -#ifdef DBUS +#include <liblogthread.h> +#include <members.h> + #define DBUS_RGM_NAME "com.redhat.cluster.rgmanager" #define DBUS_RGM_IFACE "com.redhat.cluster.rgmanager" @@ -16,13 +23,22 @@ static pthread_mutex_t mu = PTHREAD_MUTEX_INITIALIZER; static pthread_t th = 0; static char _err[512]; static int err_set = 0; +#endif + +/* Set this to the desired value prior to calling rgm_dbus_init() */ +int rgm_dbus_notify = RGM_DBUS_DEFAULT; + int rgm_dbus_init(void) +#ifdef DBUS { DBusConnection *dbc = NULL; DBusError err; + if (!rgm_dbus_notify) + return 0; + dbus_error_init(&err); dbc = dbus_bus_get(DBUS_BUS_SYSTEM, &err); @@ -39,10 +55,17 @@ rgm_dbus_init(void) db = dbc; return 0; } +#else +{ + errno = ENOSYS; + return -1; +} +#endif int rgm_dbus_release(void) +#ifdef DBUS { pthread_t t; @@ -62,8 +85,14 @@ rgm_dbus_release(void) return 0; } +#else +{ + return 0; +} +#endif +#ifdef DBUS static void * _dbus_auto_flush(void *arg) { @@ -82,12 +111,12 @@ _dbus_auto_flush(void *arg) } -int -rgm_dbus_notify(const char *svcname, - const char *svcstatus, - const char *svcflags, - const char *svcowner, - const char *svclast) +static int +_rgm_dbus_notify(const char *svcname, + const char *svcstatus, + const char *svcflags, + const char *svcowner, + const char *svclast) { DBusMessage *msg = NULL; int ret = -1; @@ -141,4 +170,64 @@ out_unlock: out_free: return ret; } + + +int32_t +rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) +{ + char flags[64]; + rg_state_t *st; + cluster_member_list_t *m = NULL; + const char *owner; + const char *last; + int ret = 0; + + if (!rgm_dbus_notify) + goto out_free; + if (view == 1) + goto out_free; + if (size != (sizeof(*st))) + goto out_free; + + st = (rg_state_t *)data; + swab_rg_state_t(st); + + /* Don't send transitional states */ + if (st->rs_state == RG_STATE_STARTING || + st->rs_state == RG_STATE_STOPPING) + goto out_free; + + m = member_list(); + if (!m) + goto out_free; + + owner = memb_id_to_name(m, st->rs_owner); + last = memb_id_to_name(m, st->rs_last_owner); + + if (!owner) + owner = "(none)"; + if (!last) + last = "(none)"; + + rg_flags_str(flags, sizeof(flags), st->rs_flags, (char *)" "); + if (flags[0] == 0) + snprintf(flags, sizeof(flags), "(none)"); + + ret = _rgm_dbus_notify(st->rs_name, + rg_state_str(st->rs_state), + (char *)flags, owner, last); + + if (ret < 0) { + logt_print(LOG_ERR, "Error sending update for %s; " + "notifications disabled\n", key); + rgm_dbus_release(); + rgm_dbus_notify = 0; + } + +out_free: + if (m) + free_member_list(m); + free(data); + return 0; +} #endif

1 0

cluster: STABLE31 - rgmanager: DBus notifications for service state changes
by Lon Hohberger 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ae… Commit: aee1f6136bb06f7893da320c230f8d0a91f1d953 Parent: 27e711a03024fc685df7502032947a482341821c Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Tue Feb 1 14:20:34 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Wed Feb 2 15:36:34 2011 -0500 rgmanager: DBus notifications for service state changes Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/include/rg_dbus.h | 14 ++++ rgmanager/man/rgmanager.8 | 2 + rgmanager/src/daemons/Makefile | 7 +- rgmanager/src/daemons/main.c | 88 ++++++++++++++++++++- rgmanager/src/daemons/update-dbus.c | 144 +++++++++++++++++++++++++++++++++++ 5 files changed, 250 insertions(+), 5 deletions(-) diff --git a/rgmanager/include/rg_dbus.h b/rgmanager/include/rg_dbus.h new file mode 100644 index 0000000..6454f29 --- /dev/null +++ b/rgmanager/include/rg_dbus.h @@ -0,0 +1,14 @@ +#ifdef DBUS +#ifndef _RGM_DBUS_H +#define _RGM_DBUS_H + +int rgm_dbus_init(void); +int rgm_dbus_release(void); +int rgm_dbus_notify(const char *svcname, + const char *svcstatus, + const char *svcflags, + const char *svcowner, + const char *svclast); + +#endif +#endif diff --git a/rgmanager/man/rgmanager.8 b/rgmanager/man/rgmanager.8 index 39b2195..a4e2c73 100644 --- a/rgmanager/man/rgmanager.8 +++ b/rgmanager/man/rgmanager.8 @@ -371,6 +371,8 @@ will leave the virtual machine running. Run in the foreground (do not fork). .IP \-d Enable debug-level logging. +.IP \-D +Disable DBus signals which are normally sent when services change state. .IP \-w Disable internal process monitoring (for debugging). .IP \-N diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile index 94e0dbb..4dbbe5a 100644 --- a/rgmanager/src/daemons/Makefile +++ b/rgmanager/src/daemons/Makefile @@ -29,6 +29,7 @@ OBJS1= fo_domain.o \ service_op.o \ slang_event.o \ event_config.o \ + update-dbus.o \ watchdog.o OBJS2= test-noccs.o \ @@ -40,12 +41,13 @@ OBJS2= test-noccs.o \ rg_locks-noccs.o \ event_config-noccs.o -CFLAGS += -DSHAREDIR=\"${sharedir}\" -D_GNU_SOURCE +CFLAGS += -DDBUS -DSHAREDIR=\"${sharedir}\" -D_GNU_SOURCE CFLAGS += -fPIC CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${logtincdir} CFLAGS += `xml2-config --cflags` -I${slangincdir} CFLAGS += -I$(S)/../../include CFLAGS += -I${incdir} +CFLAGS += `pkg-config --cflags dbus-1` NOCCS_CFLAGS += -DNO_CCS @@ -59,6 +61,7 @@ DLM_LDFLAGS += -L${dlmlibdir} -ldlm XML2_LDFLAGS += `xml2-config --libs` SLANG_LDFLAGS += -L${slanglibdir} -lslang EXTRA_LDFLAGS += -lpthread +DBUS_LDFLAGS += `pkg-config --libs dbus-1` LDDEPS += ../clulib/libclulib.a @@ -66,7 +69,7 @@ ${TARGET1}: ${OBJS1} ${LDDEPS} $(CC) -o $@ $^ $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \ $(DLM_LDFLAGS) $(XML2_LDFLAGS) \ $(SLANG_LDFLAGS) $(EXTRA_LDFLAGS) \ - $(LOGSYS_LDFLAGS) $(LD_FLAGS) + $(LOGSYS_LDFLAGS) $(LD_FLAGS) $(DBUS_LDFLAGS) # # Our test program links against the local allocator so that diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 4e34246..303e0c0 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -23,6 +23,7 @@ #include <members.h> #include <daemon_init.h> #include <groups.h> +#include <rg_dbus.h> #ifdef WRAP_THREADS void dump_thread_states(FILE *); @@ -42,7 +43,9 @@ static int signalled = 0; static uint8_t ALIGNED port = RG_PORT; static char *rgmanager_lsname = (char *)"rgmanager"; /* XXX default */ static int status_poll_interval = DEFAULT_CHECK_INTERVAL; - +#ifdef DBUS +static int state_notify = 1; +#endif static void segfault(int __attribute__ ((unused)) sig) @@ -935,6 +938,68 @@ shutdown_thread(void __attribute__ ((unused)) *arg) } +#ifdef DBUS +static int32_t +svc_update(char *key, uint64_t view, void *data, uint32_t size) +{ + char flags[64]; + rg_state_t *st; + cluster_member_list_t *m; + const char *owner; + const char *last; + int ret = 0; + + if (!state_notify) + goto out_free; + if (view == 1) + goto out_free; + if (size != (sizeof(*st))) + goto out_free; + + st = (rg_state_t *)data; + swab_rg_state_t(st); + + /* Don't send transitional states */ + if (st->rs_state == RG_STATE_STARTING || + st->rs_state == RG_STATE_STOPPING) + goto out_free; + + m = member_list(); + if (!m) + goto out_free; + + owner = memb_id_to_name(m, st->rs_owner); + last = memb_id_to_name(m, st->rs_last_owner); + + if (!owner) + owner = "(none)"; + if (!last) + last = "(none)"; + + rg_flags_str(flags, sizeof(flags), st->rs_flags, (char *)" "); + if (flags[0] == 0) + snprintf(flags, sizeof(flags), "(none)"); + + ret = rgm_dbus_notify(st->rs_name, + rg_state_str(st->rs_state), + (char *)flags, owner, last); + + if (ret < 0) { + logt_print(LOG_ERR, "Error sending update for %s; " + "notifications disabled\n", key); + rgm_dbus_release(); + state_notify = 0; + } + +out_free: + if (m) + free_member_list(m); + free(data); + return 0; +} +#endif + + #ifdef WRAP_THREADS void dump_thread_states(FILE *); #endif @@ -949,7 +1014,7 @@ main(int argc, char **argv) pthread_t th; cman_handle_t clu = NULL; - while ((rv = getopt(argc, argv, "wfdN")) != EOF) { + while ((rv = getopt(argc, argv, "wfdND")) != EOF) { switch (rv) { case 'w': wd = 0; @@ -963,6 +1028,11 @@ main(int argc, char **argv) case 'f': foreground = 1; break; + case 'D': +#ifdef DBUS + state_notify = 0; +#endif + break; default: return 1; break; @@ -1032,6 +1102,11 @@ main(int argc, char **argv) configure_rgmanager(-1, debug, &cluster_timeout); logt_print(LOG_NOTICE, "Resource Group Manager Starting\n"); +#ifdef DBUS + if (state_notify && rgm_dbus_init() != 0) + logt_print(LOG_NOTICE, "Failed to initialize DBus\n"); +#endif + if (init_resource_groups(0, do_init) != 0) { logt_print(LOG_CRIT, "#8: Couldn't initialize services\n"); goto out_ls; @@ -1074,7 +1149,11 @@ main(int argc, char **argv) ds_key_init("rg_lockdown", 32, 10); #else - if (vf_init(me.cn_nodeid, port, NULL, NULL, cluster_timeout) != 0) { + if (vf_init(me.cn_nodeid, port, NULL, +#ifdef DBUS /* Ugly */ + state_notify ? svc_update : +#endif + NULL, cluster_timeout) != 0) { logt_print(LOG_CRIT, "#11: Couldn't set up VF listen socket\n"); goto out_ls; } @@ -1106,6 +1185,9 @@ out_ls: clu_lock_finished(rgmanager_lsname); out: +#ifdef DBUS + rgm_dbus_release(); +#endif logt_print(LOG_NOTICE, "Shutdown complete, exiting\n"); cman_finish(clu); diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c new file mode 100644 index 0000000..9e3078d --- /dev/null +++ b/rgmanager/src/daemons/update-dbus.c @@ -0,0 +1,144 @@ +/* DBus notifications */ +#include <stdio.h> +#include <stdint.h> +#include <resgroup.h> +#include <poll.h> +#include <dbus/dbus.h> +#include <rg_dbus.h> +#ifdef DBUS + +#define DBUS_RGM_NAME "com.redhat.cluster.rgmanager" +#define DBUS_RGM_IFACE "com.redhat.cluster.rgmanager" +#define DBUS_RGM_PATH "/com/redhat/cluster/rgmanager" + +static DBusConnection *db = NULL; +static pthread_mutex_t mu = PTHREAD_MUTEX_INITIALIZER; +static pthread_t th = 0; +static char _err[512]; +static int err_set = 0; + +int +rgm_dbus_init(void) +{ + DBusConnection *dbc = NULL; + DBusError err; + + dbus_error_init(&err); + + dbc = dbus_bus_get(DBUS_BUS_SYSTEM, &err); + if (!dbc) { + snprintf(_err, sizeof(_err), + "dbus_bus_get: %s", err.message); + err_set = 1; + dbus_error_free(&err); + return -1; + } + + dbus_connection_set_exit_on_disconnect(dbc, FALSE); + + db = dbc; + return 0; +} + + +int +rgm_dbus_release(void) +{ + pthread_t t; + + if (!db) + return 0; + + /* tell thread to exit - not sure how to tell dbus + * to wake up, so just have it poll XXX */ + if (th) { + t = th; + th = 0; + pthread_join(t, NULL); + } + + dbus_connection_unref(db); + db = NULL; + + return 0; +} + + +static void * +_dbus_auto_flush(void *arg) +{ + /* DBus connection functions are thread safe */ + dbus_connection_ref(db); + + while (dbus_connection_read_write(db, 500)) { + if (!th) + break; + } + + dbus_connection_unref(db); + + th = 0; + return NULL; +} + + +int +rgm_dbus_notify(const char *svcname, + const char *svcstatus, + const char *svcflags, + const char *svcowner, + const char *svclast) +{ + DBusMessage *msg = NULL; + int ret = -1; + + if (err_set) { + fprintf(stderr, "%s\n", _err); + err_set = 0; + } + + if (!db) { + goto out_free; + } + + pthread_mutex_lock(&mu); + + if (dbus_connection_get_is_connected(db) != TRUE) { + err_set = 1; + snprintf(_err, sizeof(_err), "DBus connection lost"); + rgm_dbus_release(); + goto out_unlock; + } + + if (!th) { + /* start auto-flush thread if needed */ + pthread_create(&th, NULL, _dbus_auto_flush, NULL); + } + + if (!(msg = dbus_message_new_signal(DBUS_RGM_PATH, + DBUS_RGM_IFACE, + "ServiceStateChange"))) { + goto out_unlock; + } + + if (!dbus_message_append_args(msg, + DBUS_TYPE_STRING, &svcname, + DBUS_TYPE_STRING, &svcstatus, + DBUS_TYPE_STRING, &svcflags, + DBUS_TYPE_STRING, &svcowner, + DBUS_TYPE_STRING, &svclast, + DBUS_TYPE_INVALID)) { + goto out_unlock; + } + + dbus_connection_send(db, msg, NULL); + ret = 0; + +out_unlock: + pthread_mutex_unlock(&mu); + if (msg) + dbus_message_unref(msg); +out_free: + return ret; +} +#endif

1 0

cluster: RHEL6 - fsck.gfs2: can't repair rgrps resulting from gfs_grow->gfs2_convert
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8f… Commit: 8fde4dae1ee517ca1f2ce2c48d006797e59e923e Parent: d100504de6eff5f83dba79319ad0bd560f7a57df Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Feb 2 08:08:53 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 09:35:37 2011 -0600 fsck.gfs2: can't repair rgrps resulting from gfs_grow->gfs2_convert This patch expands the algorithm that repairs destroyed resource groups. It adds more levels of checking and is able to determine the locations of resource groups that are not evenly spaced. rhbz#576640 --- gfs2/edit/savemeta.c | 10 +- gfs2/fsck/fsck.h | 5 +- gfs2/fsck/initialize.c | 32 ++- gfs2/fsck/main.c | 3 +- gfs2/fsck/metawalk.c | 6 +- gfs2/fsck/pass2.c | 12 + gfs2/fsck/rgrepair.c | 645 +++++++++++++++++++++++++++++++++++--------- gfs2/libgfs2/fs_geometry.c | 5 +- gfs2/libgfs2/libgfs2.h | 2 + gfs2/libgfs2/rgrp.c | 17 +- gfs2/libgfs2/super.c | 4 +- gfs2/mkfs/main_grow.c | 2 +- 12 files changed, 598 insertions(+), 145 deletions(-) diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index 10658a2..655a3bc 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -201,7 +201,7 @@ static int save_block(int fd, int out_fd, uint64_t blk) if (blk > last_fs_block) { fprintf(stderr, "\nWarning: bad block pointer '0x%llx' " - "ignored in block (block %llu (%llx))", + "ignored in block (block %llu (0x%llx))", (unsigned long long)blk, (unsigned long long)block, (unsigned long long)block); return 0; @@ -322,7 +322,9 @@ static void save_indirect_blocks(int out_fd, osi_list_t *cur_list, if (height != hgt) { /* If not at max height */ nbh = bread(&sbd, indir_block); osi_list_add_prev(&nbh->b_altlist, cur_list); - brelse(nbh); + /* The buffer_head needs to be queued ahead, so + don't release it! + brelse(nbh);*/ } } /* for all data on the indirect block */ } @@ -368,8 +370,8 @@ static void save_inode_data(int out_fd) (S_ISDIR(inode->i_di.di_mode) || (gfs1 && inode->i_di.__pad1 == GFS_FILE_DIR))) height++; - else if (height && !block_is_systemfile() && - !S_ISDIR(inode->i_di.di_mode)) + else if (height && !(inode->i_di.di_flags & GFS2_DIF_SYSTEM) && + !block_is_systemfile() && !S_ISDIR(inode->i_di.di_mode)) height--; osi_list_add(&metabh->b_altlist, &metalist[0]); for (i = 1; i <= height; i++){ diff --git a/gfs2/fsck/fsck.h b/gfs2/fsck/fsck.h index b0e1efc..bc14b88 100644 --- a/gfs2/fsck/fsck.h +++ b/gfs2/fsck/fsck.h @@ -84,9 +84,12 @@ enum rgindex_trust_level { /* how far can we trust our RG index? */ open_minded = 2, /* At least 1 RG is corrupt. Try to calculate what it should be, in a perfect world where our RGs are all on even boundaries. Blue sky. Chirping birds. */ - distrust = 3 /* The world isn't perfect, our RGs are not on nice neat + distrust = 3, /* The world isn't perfect, our RGs are not on nice neat boundaries. The fs must have been messed with by gfs2_grow or something. Count the RGs by hand. */ + indignation = 4 /* Not only do we have corruption, but the rgrps + aren't on even boundaries, so this file system + must have been converted from gfs2_convert. */ }; extern struct gfs2_inode *fsck_load_inode(struct gfs2_sbd *sbp, uint64_t block); diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c index 14cc9f6..469f022 100644 --- a/gfs2/fsck/initialize.c +++ b/gfs2/fsck/initialize.c @@ -143,7 +143,8 @@ static int set_block_ranges(struct gfs2_sbd *sdp) { rgd = osi_list_entry(tmp, struct rgrp_list, list); ri = &rgd->ri; - if (ri->ri_data0 + ri->ri_data - 1 > rmax) + if (ri->ri_data0 + ri->ri_data && + ri->ri_data0 + ri->ri_data - 1 > rmax) rmax = ri->ri_data0 + ri->ri_data - 1; if (!rmin || ri->ri_data0 < rmin) rmin = ri->ri_data0; @@ -402,6 +403,20 @@ static int init_system_inodes(struct gfs2_sbd *sdp) int rgcount, sane = 1; enum rgindex_trust_level trust_lvl; uint64_t addl_mem_needed; + const char *level_desc[] = { + _("Checking if all rgrp and rindex values are good"), + _("Checking if rindex values are ascending and evenly spaced"), + _("Calculating where the rgrps should be if evenly spaced"), + _("Trying to rebuild rindex assuming evenly spaced rgrps"), + _("Trying to rebuild rindex assuming unevenly spaced rgrps"), + }; + const char *fail_desc[] = { + _("Some damage was found; we need to take remedial measures"), + _("rindex is unevenly spaced: converted from gfs1 or corrupt"), + _("rindex calculations don't match: uneven rgrp boundaries"), + _("Too many rgrp misses: rgrps must be unevenly spaced"), + _("Too much damage found: we cannot rebuild this rindex"), + }; /******************************************************************* ****************** Initialize important inodes ****************** @@ -442,18 +457,23 @@ static int init_system_inodes(struct gfs2_sbd *sdp) ******** Validate and read in resource group information ******** *******************************************************************/ log_warn( _("Validating Resource Group index.\n")); - for (trust_lvl = blind_faith; trust_lvl <= distrust; trust_lvl++) { - log_warn( _("Level %d RG check.\n"), trust_lvl + 1); + for (trust_lvl = blind_faith; trust_lvl <= indignation; trust_lvl++) { + log_warn( _("Level %d rgrp check: %s.\n"), trust_lvl + 1, + level_desc[trust_lvl]); if ((rg_repair(sdp, trust_lvl, &rgcount, &sane) == 0) && (ri_update(sdp, 0, &rgcount, &sane) == 0)) { log_warn( _("(level %d passed)\n"), trust_lvl + 1); break; } else - log_err( _("(level %d failed)\n"), trust_lvl + 1); + log_err( _("(level %d failed: %s)\n"), trust_lvl + 1, + fail_desc[trust_lvl]); + if (fsck_abort) + break; } - if (trust_lvl > distrust) { - log_err( _("RG recovery impossible; I can't fix this file system.\n")); + if (trust_lvl > indignation) { + log_err( _("Resource Group recovery impossible; I can't fix " + "this file system.\n")); return -1; } log_info( _("%u resource groups found.\n"), rgcount); diff --git a/gfs2/fsck/main.c b/gfs2/fsck/main.c index 222219f..c68e3da 100644 --- a/gfs2/fsck/main.c +++ b/gfs2/fsck/main.c @@ -334,7 +334,8 @@ int main(int argc, char **argv) error = FSCK_CANCELED; } - check_statfs(sbp); + if (!fsck_abort) + check_statfs(sbp); /* Free up our system inodes */ inode_put(&sbp->md.inum); diff --git a/gfs2/fsck/metawalk.c b/gfs2/fsck/metawalk.c index ff348e4..cffff8a 100644 --- a/gfs2/fsck/metawalk.c +++ b/gfs2/fsck/metawalk.c @@ -35,7 +35,7 @@ int check_n_fix_bitmap(struct gfs2_sbd *sdp, uint64_t blk, old_bitmap_state = gfs2_get_bitmap(sdp, blk, rgd); if (old_bitmap_state < 0) { - log_err( _("Block %lld (0x%llx) is not represented in the" + log_err( _("Block %lld (0x%llx) is not represented in the " "system bitmap; part of an rgrp or superblock.\n"), (unsigned long long)blk, (unsigned long long)blk); return -1; @@ -726,6 +726,10 @@ static int check_leaf_blks(struct gfs2_inode *ip, struct metawalk_fxns *pass) if (pass->check_dentry && S_ISDIR(ip->i_di.di_mode)) { error = check_entries(ip, lbh, DIR_EXHASH, &count, pass); + + if (skip_this_pass || fsck_abort) + return 0; + if(error < 0) { stack; brelse(lbh); diff --git a/gfs2/fsck/pass2.c b/gfs2/fsck/pass2.c index 35acba4..90c6940 100644 --- a/gfs2/fsck/pass2.c +++ b/gfs2/fsck/pass2.c @@ -544,6 +544,8 @@ static int check_system_dir(struct gfs2_inode *sysinode, const char *dirname, } } error = check_dir(sysinode->i_sbd, iblock, &pass2_fxns); + if (skip_this_pass || fsck_abort) /* if asked to skip the rest */ + return FSCK_OK; if(error < 0) { stack; return -1; @@ -654,18 +656,26 @@ int pass2(struct gfs2_sbd *sbp) stack; return FSCK_ERROR; } + if (skip_this_pass || fsck_abort) /* if asked to skip the rest */ + return FSCK_OK; if (check_system_dir(sbp->md.pinode, "per_node", build_per_node)) { stack; return FSCK_ERROR; } + if (skip_this_pass || fsck_abort) /* if asked to skip the rest */ + return FSCK_OK; if (check_system_dir(sbp->master_dir, "master", build_master)) { stack; return FSCK_ERROR; } + if (skip_this_pass || fsck_abort) /* if asked to skip the rest */ + return FSCK_OK; if (check_system_dir(sbp->md.rooti, "root", build_root)) { stack; return FSCK_ERROR; } + if (skip_this_pass || fsck_abort) /* if asked to skip the rest */ + return FSCK_OK; log_info( _("Checking directory inodes.\n")); /* Grab each directory inode, and run checks on it */ for(dirblk = 0; dirblk < last_fs_block; dirblk++) { @@ -699,6 +709,8 @@ int pass2(struct gfs2_sbd *sbp) } } error = check_dir(sbp, dirblk, &pass2_fxns); + if (skip_this_pass || fsck_abort) /* if asked to skip the rest */ + return FSCK_OK; if(error < 0) { stack; return FSCK_ERROR; diff --git a/gfs2/fsck/rgrepair.c b/gfs2/fsck/rgrepair.c index 705ba86..af5a02d 100644 --- a/gfs2/fsck/rgrepair.c +++ b/gfs2/fsck/rgrepair.c @@ -15,6 +15,9 @@ int rindex_modified = FALSE; struct special_blocks false_rgrps; +#define BAD_RG_PERCENT_TOLERANCE 11 +#define AWAY_FROM_BITMAPS 0x1000 + #define ri_equal(ondisk, expected, field) (ondisk.field == expected.field) #define ri_compare(rg, ondisk, expected, field, fmt) \ @@ -47,7 +50,7 @@ static void find_journaled_rgs(struct gfs2_sbd *sdp) osi_list_init(&false_rgrps.list); for (j = 0; j < sdp->md.journals; j++) { - log_debug( _("Checking for RGs in journal%d.\n"), j); + log_debug( _("Checking for rgrps in journal%d.\n"), j); ip = sdp->md.journal[j]; jblocks = ip->i_di.di_size / sdp->sd_sb.sb_bsize; for (b = 0; b < jblocks; b++) { @@ -56,7 +59,7 @@ static void find_journaled_rgs(struct gfs2_sbd *sdp) break; bh = bread(sdp, dblock); if (!gfs2_check_meta(bh, GFS2_METATYPE_RG)) { - log_debug( _("False RG found at block " + log_debug( _("False rgrp found at block " "0x%" PRIx64 "\n"), dblock); gfs2_special_set(&false_rgrps, dblock); } @@ -73,66 +76,37 @@ static int is_false_rg(uint64_t block) } /* - * gfs2_rindex_rebuild - rebuild a corrupt Resource Group (RG) index manually - * where trust_lvl == distrust - * - * If this routine is called, it means we have RGs in odd/unexpected places, - * and there is a corrupt RG or RG index entry. It also means we can't trust - * the RG index to be sane, and the RGs don't agree with how mkfs would have - * built them by default. So we have no choice but to go through and count - * them by hand. We've tried twice to recover the RGs and RG index, and - * failed, so this is our last chance to remedy the situation. - * - * This routine tries to minimize performance impact by: - * 1. Skipping through the filesystem at known increments when possible. - * 2. Shuffle through every block when RGs are not found at the predicted - * locations. - * - * Note: A GFS2 filesystem differs from a GFS1 file system in that there will - * only be ONE chunk (i.e. no artificial subdevices on either size of the - * journals). The journals and even the rindex are kept as part of the file - * system, so we need to rebuild that information by hand. Also, with GFS1, - * the different chunks ("subdevices") could have different RG sizes, which - * made for quite a mess when trying to recover RGs. GFS2 always uses the - * same RG size determined by the original mkfs, so recovery is easier. + * find_shortest_rgdist - hunt and peck for the shortest distance between RGs. * + * Sample several of them because an RG that's been blasted may + * look like twice the distance. If we can find 6 of them, that + * should be enough to figure out the correct layout. + * This also figures out first_rg_dist since that's always different. */ -static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, - int *num_rgs) +static uint64_t find_shortest_rgdist(struct gfs2_sbd *sdp, + uint64_t *initial_first_rg_dist, + uint64_t *first_rg_dist) { + uint64_t blk, block_of_last_rg, shortest_dist_btwn_rgs; struct gfs2_buffer_head *bh; - uint64_t shortest_dist_btwn_rgs; - uint64_t blk, block_of_last_rg; - uint64_t fwd_block, block_bump; - uint64_t first_rg_dist, initial_first_rg_dist; - struct rgrp_list *calc_rgd, *prev_rgd; - int number_of_rgs, rgi; + int number_of_rgs = 0; struct gfs2_rindex buf, tmpndx; - int rg_was_fnd = FALSE, corrupt_rgs = 0, bitmap_was_fnd; - osi_list_t *tmp; /* Figure out if there are any RG-looking blocks in the journal we need to ignore. */ find_journaled_rgs(sdp); - osi_list_init(ret_list); - number_of_rgs = 0; - initial_first_rg_dist = first_rg_dist = sdp->sb_addr + 1; + + *initial_first_rg_dist = *first_rg_dist = sdp->sb_addr + 1; block_of_last_rg = sdp->sb_addr + 1; - /* ------------------------------------------------------------- */ - /* First, hunt and peck for the shortest distance between RGs. */ - /* Sample several of them because an RG that's been blasted may */ - /* look like twice the distance. If we can find 6 of them, that */ - /* should be enough to figure out the correct layout. */ - /* ------------------------------------------------------------- */ shortest_dist_btwn_rgs = sdp->device.length; + for (blk = sdp->sb_addr + 1; - blk < sdp->device.length && number_of_rgs < 6; - blk++) { + blk < sdp->device.length && number_of_rgs < 6; blk++) { bh = bread(sdp, blk); if (((blk == sdp->sb_addr + 1) || (!gfs2_check_meta(bh, GFS2_METATYPE_RG))) && !is_false_rg(blk)) { - log_debug( _("RG found at block 0x%" PRIx64 "\n"), blk); + log_debug( _("rgrp found at block 0x%" PRIx64 "\n"), blk); if (blk > sdp->sb_addr + 1) { uint64_t rgdist; @@ -149,8 +123,8 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, /* from the rest because of the superblock */ /* and 64K dead space. */ /* ----------------------------------------- */ - if (first_rg_dist == initial_first_rg_dist) - first_rg_dist = rgdist; + if (*first_rg_dist == *initial_first_rg_dist) + *first_rg_dist = rgdist; if (rgdist < shortest_dist_btwn_rgs) { shortest_dist_btwn_rgs = rgdist; log_debug( _("(shortest so far)\n")); @@ -164,18 +138,15 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, } brelse(bh); } - number_of_rgs = 0; - gfs2_special_free(&false_rgrps); - /* -------------------------------------------------------------- */ /* Sanity-check our first_rg_dist. If RG #2 got nuked, the */ /* first_rg_dist would measure from #1 to #3, which would be bad. */ /* We need to take remedial measures to fix it (from the index). */ /* -------------------------------------------------------------- */ - log_debug( _("First RG distance: 0x%" PRIx64 "\n"), first_rg_dist); - log_debug( _("Distance between RGs: 0x%" PRIx64 "\n"), + log_debug( _("First rgrp distance: 0x%" PRIx64 "\n"), *first_rg_dist); + log_debug( _("Distance between rgrps: 0x%" PRIx64 "\n"), shortest_dist_btwn_rgs); - if (first_rg_dist >= shortest_dist_btwn_rgs + + if (*first_rg_dist >= shortest_dist_btwn_rgs + (shortest_dist_btwn_rgs / 4)) { /* read in the second RG index entry for this subd. */ gfs2_readi(sdp->md.riinode, (char *)&buf, @@ -183,28 +154,302 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, sizeof(struct gfs2_rindex)); gfs2_rindex_in(&tmpndx, (char *)&buf); if (tmpndx.ri_addr > sdp->sb_addr + 1) { /* sanity check */ - log_warn( _("RG 2 is damaged: getting dist from index: ")); - first_rg_dist = tmpndx.ri_addr - (sdp->sb_addr + 1); - log_warn("0x%" PRIx64 "\n", first_rg_dist); + log_warn( _("rgrp 2 is damaged: getting dist from index: ")); + *first_rg_dist = tmpndx.ri_addr - (sdp->sb_addr + 1); + log_warn("0x%" PRIx64 "\n", *first_rg_dist); } else { - log_warn( _("RG index 2 is damaged: extrapolating dist: ")); - first_rg_dist = sdp->device.length - + log_warn( _("rgrp index 2 is damaged: extrapolating dist: ")); + *first_rg_dist = sdp->device.length - (sdp->rgrps - 1) * (sdp->device.length / sdp->rgrps); - log_warn("0x%" PRIx64 "\n", first_rg_dist); + log_warn("0x%" PRIx64 "\n", *first_rg_dist); } - log_debug( _("Adjusted first RG distance: 0x%" PRIx64 "\n"), - first_rg_dist); + log_debug( _("Adjusted first rgrp distance: 0x%" PRIx64 "\n"), + *first_rg_dist); } /* if first RG distance is within tolerance */ + + gfs2_special_free(&false_rgrps); + return shortest_dist_btwn_rgs; +} + +/* + * count_usedspace - count the used bits in a rgrp bitmap buffer + */ +static uint64_t count_usedspace(struct gfs2_sbd *sdp, int first, + struct gfs2_buffer_head *bh) +{ + int off, x, y, bytes_to_check; + uint32_t rg_used = 0; + unsigned int state; + + /* Count up the free blocks in the bitmap */ + off = (first) ? sizeof(struct gfs2_rgrp) : + sizeof(struct gfs2_meta_header); + bytes_to_check = sdp->bsize - off; + for (x = 0; x < bytes_to_check; x++) { + unsigned char *byte; + + byte = (unsigned char *)&bh->b_data[off + x]; + if (*byte == 0x55) { + rg_used += GFS2_NBBY; + continue; + } + if (*byte == 0x00) + continue; + for (y = 0; y < GFS2_NBBY; y++) { + state = (*byte >> (GFS2_BIT_SIZE * y)) & GFS2_BIT_MASK; + if (state == GFS2_BLKST_FREE || + state == GFS2_BLKST_UNLINKED) + continue; + rg_used++; + } + } + return rg_used; +} + +/* + * find_next_rgrp_dist - find the distance to the next rgrp + * + * This function is only called if the rgrps are determined to be on uneven + * boundaries. In a normal gfs2 file system, after mkfs.gfs2, all the + * rgrps but the first and second one will be the same distance from the + * previous rgrp. (The first rgrp will predictably be after the superblock + * and the second one will be adjusted based on the number 64KB skipped + * at the start of the file system.) The only way we can deviate from that + * pattern is if the user did gfs_grow on a gfs1 file system, then converted + * it to gfs2 using gfs2_convert. + * + * This function finds the distance to the next rgrp for these cases. + */ +static uint64_t find_next_rgrp_dist(struct gfs2_sbd *sdp, uint64_t blk, + struct rgrp_list *prevrgd) +{ + uint64_t rgrp_dist = 0, used_blocks, block, next_block, twogigs; + osi_list_t *tmp; + struct rgrp_list *rgd = NULL, *next_rgd; + struct gfs2_buffer_head *bh; + struct gfs2_meta_header mh; + int first, length, b, found, mega_in_blocks; + uint32_t free_blocks; + + for (tmp = sdp->rglist.next; tmp != &sdp->rglist; tmp = tmp->next) { + rgd = osi_list_entry(tmp, struct rgrp_list, list); + if (rgd->ri.ri_addr == blk) + break; + } + if (rgd && tmp && tmp != &sdp->rglist && tmp->next && + rgd->ri.ri_addr == blk) { + tmp = tmp->next; + next_rgd = osi_list_entry(tmp, struct rgrp_list, list); + rgrp_dist = next_rgd->ri.ri_addr - rgd->ri.ri_addr; + return rgrp_dist; + } + mega_in_blocks = (1024 * 1024) / sdp->bsize; + twogigs = 2048 * mega_in_blocks; + /* Unfortunately, if we fall through to here we can't trust the + rindex. So we have to analyze the current rgrp to figure out + the bare minimum block number where it ends. If we don't have + rindex, all we know about this rgrp is what's on disk: its + rg_free. If we analyze the rgrp's bitmap and the bitmaps that + follow, we can figure out how many bits are used. If we add + rg_free, we get the total number of blocks this rgrp + represents. After that should be the next rgrp, but it may + skip a few blocks (hopefully no more than 4). */ + used_blocks = 0; + length = 0; + block = prevrgd->ri.ri_addr; + first = 1; + found = 0; + while (1) { + if (block >= sdp->device.length) + break; + if (block >= prevrgd->ri.ri_addr + twogigs) + break; + bh = bread(sdp, block); + gfs2_meta_header_in(&mh, bh); + if ((mh.mh_magic != GFS2_MAGIC) || + (first && mh.mh_type != GFS2_METATYPE_RG) || + (!first && mh.mh_type != GFS2_METATYPE_RB)) { + brelse(bh); + break; + } + if (first) { + struct gfs2_rgrp *rg; + + rg = (struct gfs2_rgrp *)bh->b_data; + free_blocks = be32_to_cpu(rg->rg_free); + } + used_blocks += count_usedspace(sdp, first, bh); + first = 0; + block++; + length++; + brelse(bh); + /* Check if this distance points to an rgrp: + We have to look for blocks that resemble rgrps and bitmaps. + If they do, we need to count blocks used and free and see + if adding that number of free blocks accounts for the + next rgrp we find. Otherwise, you could have a length of + 6 with additional user blocks that just happen to look like + bitmap blocks. Count them all as bitmaps and you'll be + hopelessly lost. */ + rgrp_dist = used_blocks + free_blocks + length; + next_block = prevrgd->ri.ri_addr + rgrp_dist; + /* Now we account for block rounding done by mkfs.gfs2 */ + for (b = 0; b <= length + GFS2_NBBY; b++) { + if (next_block >= sdp->device.length) + break; + bh = bread(sdp, next_block + b); + gfs2_meta_header_in(&mh, bh); + brelse(bh); + if (mh.mh_magic == GFS2_MAGIC) { + if (mh.mh_type == GFS2_METATYPE_RG) { + found = 1; + break; + } + /* if the first thing we find is a bitmap, + there must be a damaged rgrp on the + previous block. */ + if (mh.mh_type == GFS2_METATYPE_RB) { + found = 1; + rgrp_dist--; + break; + } + } + rgrp_dist++; + } + if (found) { + block = next_block; + log_info( _("rgrp found at 0x%llx, length=%d, " + "used=%llu, free=%d\n"), + prevrgd->ri.ri_addr, length, + (unsigned long long)used_blocks, + free_blocks); + break; + } + } + return rgrp_dist; +} + +/* + * hunt_and_peck - find the distance to the next rgrp + * + * This function is only called if the rgrps are determined to be on uneven + * boundaries, and also corrupt. So we have to go out searching for one. + */ +static uint64_t hunt_and_peck(struct gfs2_sbd *sdp, uint64_t blk, + struct rgrp_list *prevrgd, uint64_t last_bump) +{ + uint64_t rgrp_dist = 0, block, twogigs, last_block, last_meg; + struct gfs2_buffer_head *bh; + struct gfs2_meta_header mh; + int b, mega_in_blocks; + + /* Skip ahead the previous amount: we might get lucky. + If we're close to the end of the device, take the rest. */ + if (gfs2_check_range(sdp, blk + last_bump)) + return sdp->fssize - blk; + + bh = bread(sdp, blk + last_bump); + gfs2_meta_header_in(&mh, bh); + brelse(bh); + if (mh.mh_magic == GFS2_MAGIC && mh.mh_type == GFS2_METATYPE_RG) { + log_info( _("rgrp found at 0x%llx, length=%lld\n"), + (unsigned long long)blk + last_bump, + (unsigned long long)last_bump); + return last_bump; + } + + rgrp_dist = AWAY_FROM_BITMAPS; /* Get away from any bitmaps + associated with the previous rgrp */ + block = prevrgd->ri.ri_addr + rgrp_dist; + /* Now we account for block rounding done by mkfs.gfs2. A rgrp can + be at most 2GB in size, so that's where we call it. We do somewhat + obscure math here to avoid integer overflows. */ + mega_in_blocks = (1024 * 1024) / sdp->bsize; + twogigs = 2048 * mega_in_blocks; + if (block + twogigs <= sdp->fssize) { + last_block = twogigs; + last_meg = 0; + } else { + /* There won't be a rgrp in the last megabyte. */ + last_block = sdp->fssize - block - mega_in_blocks; + last_meg = mega_in_blocks; + } + for (b = AWAY_FROM_BITMAPS; b < last_block; b++) { + bh = bread(sdp, block + b); + gfs2_meta_header_in(&mh, bh); + brelse(bh); + if (mh.mh_magic == GFS2_MAGIC) { + if (mh.mh_type == GFS2_METATYPE_RG) + break; + /* if the first thing we find is a bitmap, there must + be a damaged rgrp on the previous block. */ + if (mh.mh_type == GFS2_METATYPE_RB) { + rgrp_dist--; + break; + } + } + rgrp_dist++; + } + return rgrp_dist + last_meg; +} + +/* + * gfs2_rindex_rebuild - rebuild a corrupt Resource Group (RG) index manually + * where trust_lvl == distrust + * + * If this routine is called, it means we have RGs in odd/unexpected places, + * and there is a corrupt RG or RG index entry. It also means we can't trust + * the RG index to be sane, and the RGs don't agree with how mkfs would have + * built them by default. So we have no choice but to go through and count + * them by hand. We've tried twice to recover the RGs and RG index, and + * failed, so this is our last chance to remedy the situation. + * + * This routine tries to minimize performance impact by: + * 1. Skipping through the filesystem at known increments when possible. + * 2. Shuffle through every block when RGs are not found at the predicted + * locations. + * + * Note: A GFS2 filesystem differs from a GFS1 file system in that there will + * only be ONE chunk (i.e. no artificial subdevices on either size of the + * journals). The journals and even the rindex are kept as part of the file + * system, so we need to rebuild that information by hand. Also, with GFS1, + * the different chunks ("subdevices") could have different RG sizes, which + * made for quite a mess when trying to recover RGs. GFS2 always uses the + * same RG size determined by the original mkfs, so recovery is easier. + * + * If "gfs_grow" is specified the file system was most likely converted + * from gfs1 to gfs2 after a gfs_grow operation. In that case, the rgrps + * will not be on predictable boundaries. + */ +static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, + int *num_rgs, int gfs_grow) +{ + struct gfs2_buffer_head *bh; + uint64_t shortest_dist_btwn_rgs; + uint64_t blk; + uint64_t fwd_block, block_bump; + uint64_t first_rg_dist, initial_first_rg_dist; + struct rgrp_list *calc_rgd, *prev_rgd; + int number_of_rgs, rgi; + int rg_was_fnd = FALSE, corrupt_rgs = 0, bitmap_was_fnd; + osi_list_t *tmp; + + osi_list_init(ret_list); + initial_first_rg_dist = first_rg_dist = sdp->sb_addr + 1; + shortest_dist_btwn_rgs = find_shortest_rgdist(sdp, + &initial_first_rg_dist, + &first_rg_dist); + number_of_rgs = 0; /* -------------------------------------------------------------- */ /* Now go through the RGs and verify their integrity, fixing as */ /* needed when corruption is encountered. */ /* -------------------------------------------------------------- */ prev_rgd = NULL; block_bump = first_rg_dist; - for (blk = sdp->sb_addr + 1; blk <= sdp->device.length; - blk += block_bump) { + blk = sdp->sb_addr + 1; + while (blk <= sdp->device.length) { log_debug( _("Block 0x%" PRIx64 "\n"), blk); bh = bread(sdp, blk); rg_was_fnd = (!gfs2_check_meta(bh, GFS2_METATYPE_RG)); @@ -212,7 +457,7 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, /* Allocate a new RG and index. */ calc_rgd = malloc(sizeof(struct rgrp_list)); if (!calc_rgd) { - log_crit( _("Can't allocate memory for rg repair.\n")); + log_crit( _("Can't allocate memory for rgrp repair.\n")); return -1; } memset(calc_rgd, 0, sizeof(struct rgrp_list)); @@ -225,11 +470,13 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, /* ------------------------------------------------- */ corrupt_rgs++; if (corrupt_rgs < 5) - log_debug( _("Missing or damaged RG at block %" + log_debug( _("Missing or damaged rgrp at block %" PRIu64 " (0x%" PRIx64 ")\n"), blk, blk); else { - log_crit( _("Error: too many bad RGs.\n")); + log_crit( _("Error: too many missing or " + "damaged rgrps using this method. " + "Time to try another method.\n")); return -1; } } @@ -261,6 +508,8 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, prev_rgd->ri.ri_length = bitblocks; prev_rgd->ri.ri_data = rgblocks; + prev_rgd->ri.ri_data0 = prev_rgd->ri.ri_addr + + prev_rgd->ri.ri_length; prev_rgd->ri.ri_data -= prev_rgd->ri.ri_data % GFS2_NBBY; prev_rgd->ri.ri_bitbytes = prev_rgd->ri.ri_data / @@ -269,18 +518,42 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, prev_rgd->ri.ri_data); } number_of_rgs++; - log_warn( _("%c RG %d at block 0x%" PRIX64 " %s"), - (rg_was_fnd ? ' ' : '*'), number_of_rgs, blk, - (rg_was_fnd ? "intact" : "*** DAMAGED ***")); + if (rg_was_fnd) + log_info( _(" rgrp %d at block 0x%llx intact"), + number_of_rgs, (unsigned long long)blk); + else + log_warn( _("* rgrp %d at block 0x%llx *** DAMAGED ***"), + number_of_rgs, (unsigned long long)blk); prev_rgd = calc_rgd; - block_of_last_rg = blk; - + /* + * Figure out where our next rgrp should be. + */ if (blk == sdp->sb_addr + 1) block_bump = first_rg_dist; - else + else if (!gfs_grow) { block_bump = shortest_dist_btwn_rgs; - if (block_bump != 1) - log_warn( _(" [length 0x%" PRIx64 "]\n"), block_bump); + /* if we have uniformly-spaced rgrps, there may be + some wasted space at the end of the device. + Since we don't want to create a short rgrp and + break our uniformity, just quit here. */ + if (blk + (2 * block_bump) > sdp->device.length) + break; + } else if (rg_was_fnd) + block_bump = find_next_rgrp_dist(sdp, blk, prev_rgd); + else + block_bump = hunt_and_peck(sdp, blk, prev_rgd, + block_bump); + if (block_bump != 1) { + if (rg_was_fnd) + log_info( _(" [length 0x%" PRIx64 "]\n"), + block_bump); + else + log_warn( _(" [length 0x%" PRIx64 "]\n"), + block_bump); + } else { + log_warn("\n"); + } + blk += block_bump; } /* for each rg block */ /* ----------------------------------------------------------------- */ /* If we got to the end of the fs, we still need to fix the */ @@ -293,6 +566,8 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, rgblocks2bitblocks(sdp->bsize, &rgblocks, &bitblocks); prev_rgd->ri.ri_length = bitblocks; + prev_rgd->ri.ri_data0 = prev_rgd->ri.ri_addr + + prev_rgd->ri.ri_length; prev_rgd->ri.ri_data = rgblocks; prev_rgd->ri.ri_data -= prev_rgd->ri.ri_data % GFS2_NBBY; prev_rgd->ri.ri_bitbytes = prev_rgd->ri.ri_data / GFS2_NBBY; @@ -303,8 +578,8 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, /* ---------------------------------------------- */ /* Now dump out the information (if verbose mode) */ /* ---------------------------------------------- */ - log_debug( _("RG index rebuilt as follows:\n")); - for (tmp = ret_list, rgi = 0; tmp != ret_list; + log_debug( _("rindex rebuilt as follows:\n")); + for (tmp = ret_list->next, rgi = 0; tmp != ret_list; tmp = tmp->next, rgi++) { calc_rgd = osi_list_entry(tmp, struct rgrp_list, list); log_debug("%d: 0x%llx / %x / 0x%llx" @@ -334,8 +609,18 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, static int gfs2_rindex_calculate(struct gfs2_sbd *sdp, osi_list_t *ret_list, int *num_rgs) { + uint64_t num_rgrps = 0; + + /* ----------------------------------------------------------------- */ + /* Calculate how many RGs there are supposed to be based on the */ + /* rindex filesize. Remember that our trust level is open-minded */ + /* here. If the filesize of the rindex file is not a multiple of */ + /* our rindex structures, then something's wrong and we can't trust */ + /* the index. */ + /* ----------------------------------------------------------------- */ + *num_rgs = sdp->md.riinode->i_di.di_size / sizeof(struct gfs2_rindex); + osi_list_init(ret_list); - sdp->rgsize = GFS2_DEFAULT_RGSIZE; /* compute_rgrp_layout adjusts */ if (device_geometry(sdp)) { fprintf(stderr, _("Geometry error\n")); exit(-1); @@ -346,21 +631,23 @@ static int gfs2_rindex_calculate(struct gfs2_sbd *sdp, osi_list_t *ret_list, exit(-1); } + /* Try all possible rgrp sizes: 2048, 1024, 512, 256, 128, 64, 32 */ + for (sdp->rgsize = GFS2_DEFAULT_RGSIZE; sdp->rgsize >= 32; + sdp->rgsize /= 2) { + num_rgrps = how_many_rgrps(sdp, &sdp->device, TRUE); + if (num_rgrps == *num_rgs) { + log_info(_("rgsize must be: %lld (0x%llx)\n"), + (unsigned long long)sdp->rgsize, + (unsigned long long)sdp->rgsize); + break; + } + } /* Compute the default resource group layout as mkfs would have done */ - compute_rgrp_layout(sdp, FALSE); + compute_rgrp_layout(sdp, TRUE); build_rgrps(sdp, FALSE); /* FALSE = calc but don't write to disk. */ - *num_rgs = 0; log_debug( _("fs_total_size = 0x%" PRIX64 " blocks.\n"), sdp->device.length); - /* ----------------------------------------------------------------- */ - /* Calculate how many RGs there are supposed to be based on the */ - /* rindex filesize. Remember that our trust level is open-minded */ - /* here. If the filesize of the rindex file is not a multiple of */ - /* our rindex structures, then something's wrong and we can't trust */ - /* the index. */ - /* ----------------------------------------------------------------- */ - *num_rgs = sdp->md.riinode->i_di.di_size / sizeof(struct gfs2_rindex); - log_warn( _("L2: number of rgs in the index = %d.\n"), *num_rgs); + log_warn( _("L3: number of rgs in the index = %d.\n"), *num_rgs); /* Move the rg list to the return list */ ret_list->next = sdp->rglist.next; ret_list->prev = sdp->rglist.prev; @@ -377,14 +664,14 @@ static int rewrite_rg_block(struct gfs2_sbd *sdp, struct rgrp_list *rg, uint64_t errblock) { int x = errblock - rg->ri.ri_addr; + const char *typedesc = x ? "GFS2_METATYPE_RB" : "GFS2_METATYPE_RG"; - log_err( _("Block #%lld (0x%llx) (%d of %d) is neither" - " GFS2_METATYPE_RB nor GFS2_METATYPE_RG.\n"), + log_err( _("Block #%lld (0x%llx) (%d of %d) is not %s.\n"), (unsigned long long)rg->ri.ri_addr + x, (unsigned long long)rg->ri.ri_addr + x, - (int)x+1, (int)rg->ri.ri_length); + (int)x+1, (int)rg->ri.ri_length, typedesc); if (query( _("Fix the Resource Group? (y/n)"))) { - log_err( _("Attempting to repair the RG.\n")); + log_err( _("Attempting to repair the rgrp.\n")); rg->bh[x] = bread(sdp, rg->ri.ri_addr + x); if (x) { struct gfs2_meta_header mh; @@ -434,6 +721,7 @@ static int expect_rindex_sanity(struct gfs2_sbd *sdp, osi_list_t *ret_list, memcpy(&exp->ri, &rgd->ri, sizeof(exp->ri)); memcpy(&exp->rg, &rgd->rg, sizeof(exp->rg)); exp->bits = NULL; + exp->bh = NULL; gfs2_compute_bitstructs(sdp, exp); osi_list_add_prev(&exp->list, ret_list); } @@ -442,21 +730,59 @@ static int expect_rindex_sanity(struct gfs2_sbd *sdp, osi_list_t *ret_list, } /* + * sort_rgrp_list - sort the rgrp list + * + * A bit crude, perhaps, but we're talking about thousands, not millions of + * entries to sort, and the list will be almost sorted anyway, so there + * should be very few swaps. + */ +static void sort_rgrp_list(osi_list_t *head) +{ + struct rgrp_list *thisr, *nextr; + osi_list_t *tmp, *x, *next; + int swaps; + + while(1) { + swaps = 0; + osi_list_foreach_safe(tmp, head, x) { + next = tmp->next; + if (next == head) /* at the end */ + break; + thisr = osi_list_entry(tmp, struct rgrp_list, list); + nextr = osi_list_entry(next, struct rgrp_list, list); + if (thisr->ri.ri_addr > nextr->ri.ri_addr) { + osi_list_del(next); + osi_list_add_prev(next, tmp); + swaps++; + } + } + if (!swaps) + break; + } +} + +/* * rg_repair - try to repair a damaged rg index (rindex) * trust_lvl - This is how much we trust the rindex file. * blind_faith means we take the rindex at face value. * open_minded means it might be okay, but we should verify it. * distrust means it's not to be trusted, so we should go to * greater lengths to build it from scratch. + * indignation means we have corruption, but the file system + * was converted from GFS via gfs2_convert, and its rgrps are + * not on nice boundaries thanks to previous gfs_grow ops. Lovely. */ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane) { - int error, discrepancies; + int error, discrepancies, percent; osi_list_t expected_rglist; int calc_rg_count = 0, rgcount_from_index, rg; osi_list_t *exp, *act; /* expected, actual */ struct gfs2_rindex buf; + /* Free previous incarnations in memory, if any. */ + gfs2_rgrp_free(&sdp->rglist); + if (trust_lvl == blind_faith) return 0; else if (trust_lvl == ye_of_little_faith) { /* if rindex seems sane */ @@ -467,8 +793,10 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane) } error = expect_rindex_sanity(sdp, &expected_rglist, &calc_rg_count); - if (error) + if (error) { + gfs2_rgrp_free(&expected_rglist); return error; + } } else if (trust_lvl == open_minded) { /* If we can't trust RG index */ /* Calculate our own RG index for comparison */ error = gfs2_rindex_calculate(sdp, &expected_rglist, @@ -480,9 +808,19 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane) } else if (trust_lvl == distrust) { /* If we can't trust RG index */ error = gfs2_rindex_rebuild(sdp, &expected_rglist, - &calc_rg_count); + &calc_rg_count, 0); if (error) { - log_crit( _("Error rebuilding rg list.\n")); + log_crit( _("Error rebuilding rgrp list.\n")); + gfs2_rgrp_free(&expected_rglist); + return -1; + } + sdp->rgrps = calc_rg_count; + } + else if (trust_lvl == indignation) { /* If we can't trust anything */ + error = gfs2_rindex_rebuild(sdp, &expected_rglist, + &calc_rg_count, 1); + if (error) { + log_crit( _("Error rebuilding rgrp list.\n")); gfs2_rgrp_free(&expected_rglist); return -1; } @@ -500,13 +838,24 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane) log_warn( _("L%d: number of rgs expected = %lld.\n"), trust_lvl + 1, (unsigned long long)sdp->rgrps); if (calc_rg_count != sdp->rgrps) { - log_warn( _("L%d: They don't match; either (1) the fs was extended, (2) an odd\n"), trust_lvl + 1); - log_warn( _("L%d: rg size was used, or (3) we have a corrupt rg index.\n"), trust_lvl + 1); + log_warn( _("L%d: They don't match; either (1) the fs was " + "extended, (2) an odd\n"), trust_lvl + 1); + log_warn( _("L%d: rgrp size was used, or (3) we have a corrupt " + "rg index.\n"), trust_lvl + 1); gfs2_rgrp_free(&expected_rglist); gfs2_rgrp_free(&sdp->rglist); return -1; } /* ------------------------------------------------------------- */ + /* Sort the rindex list. Older versions of gfs_grow got the */ + /* rindex out of sorted order. But rebuilding the rindex from */ + /* scratch will rebuild it in sorted order. */ + /* The gfs2_grow program should, in theory, drop new rgrps into */ + /* the rindex in sorted order, so this should only matter for */ + /* gfs1 converted file systems. */ + /* ------------------------------------------------------------- */ + sort_rgrp_list(&sdp->rglist); + /* ------------------------------------------------------------- */ /* Now compare the rindex to what we think it should be. */ /* See how far off our expected values are. If too much, abort. */ /* The theory is: if we calculated the index to have 32 RGs and */ @@ -515,28 +864,52 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane) /* ------------------------------------------------------------- */ discrepancies = 0; for (rg = 0, act = sdp->rglist.next, exp = expected_rglist.next; - act != &sdp->rglist && exp != &expected_rglist; - act = act->next, exp = exp->next, rg++) { + act != &sdp->rglist && exp != &expected_rglist && !fsck_abort; + rg++) { struct rgrp_list *expected, *actual; expected = osi_list_entry(exp, struct rgrp_list, list); actual = osi_list_entry(act, struct rgrp_list, list); - if (!ri_equal(actual->ri, expected->ri, ri_addr) || - !ri_equal(actual->ri, expected->ri, ri_length) || + if (actual->ri.ri_addr < expected->ri.ri_addr) { + act = act->next; + discrepancies++; + log_info(_("%d addr: 0x%llx < 0x%llx * mismatch\n"), + rg + 1, actual->ri.ri_addr, + expected->ri.ri_addr); + continue; + } else if (expected->ri.ri_addr < actual->ri.ri_addr) { + exp = exp->next; + discrepancies++; + log_info(_("%d addr: 0x%llx > 0x%llx * mismatch\n"), + rg + 1, actual->ri.ri_addr, + expected->ri.ri_addr); + continue; + } + if (!ri_equal(actual->ri, expected->ri, ri_length) || !ri_equal(actual->ri, expected->ri, ri_data0) || !ri_equal(actual->ri, expected->ri, ri_data) || !ri_equal(actual->ri, expected->ri, ri_bitbytes)) { discrepancies++; + log_info(_("%d addr: 0x%llx 0x%llx * has mismatch\n"), + rg + 1, actual->ri.ri_addr, + expected->ri.ri_addr); } + act = act->next; + exp = exp->next; } - if (trust_lvl < distrust && discrepancies > (trust_lvl * 8)) { - log_warn( _("Level %d didn't work. Too many descepencies.\n"), - trust_lvl + 1); - log_warn( _("%d out of %d RGs did not match what was expected.\n"), - discrepancies, rg); - gfs2_rgrp_free(&expected_rglist); - gfs2_rgrp_free(&sdp->rglist); - return -1; + if (rg) { + /* Check to see if more than 2% of the rgrps are wrong. */ + percent = (discrepancies * 100) / rg; + if (percent > BAD_RG_PERCENT_TOLERANCE) { + log_warn( _("Level %d didn't work. Too many " + "discrepancies.\n"), trust_lvl + 1); + log_warn( _("%d out of %d rgrps (%d percent) did not " + "match what was expected.\n"), + discrepancies, rg, percent); + gfs2_rgrp_free(&expected_rglist); + gfs2_rgrp_free(&sdp->rglist); + return -1; + } } /* ------------------------------------------------------------- */ /* Now compare the rindex to what we think it should be. */ @@ -544,17 +917,38 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane) /* so look for index problems first before looking at the rgs. */ /* ------------------------------------------------------------- */ for (rg = 0, act = sdp->rglist.next, exp = expected_rglist.next; - act != &sdp->rglist && exp != &expected_rglist; - act = act->next, exp = exp->next, rg++) { + exp != &expected_rglist && !fsck_abort; rg++) { struct rgrp_list *expected, *actual; expected = osi_list_entry(exp, struct rgrp_list, list); - actual = osi_list_entry(act, struct rgrp_list, list); - ri_compare(rg, actual->ri, expected->ri, ri_addr, "llx"); - ri_compare(rg, actual->ri, expected->ri, ri_length, PRIx32); - ri_compare(rg, actual->ri, expected->ri, ri_data0, "llx"); - ri_compare(rg, actual->ri, expected->ri, ri_data, PRIx32); - ri_compare(rg, actual->ri, expected->ri, ri_bitbytes, PRIx32); + + /* If we ran out of actual rindex entries due to rindex + damage, fill in a new one with the expected values. */ + if (act == &sdp->rglist) { /* end of actual rindex */ + log_err( _("Entry missing from rindex: 0x%llx\n"), + (unsigned long long)expected->ri.ri_addr); + actual = (struct rgrp_list *) + malloc(sizeof(struct rgrp_list)); + if (!actual) { + log_err(_("Out of memory!\n")); + break; + } + memset(actual, 0, sizeof(struct rgrp_list)); + osi_list_add_prev(&actual->list, &sdp->rglist); + rindex_modified = 1; + } else { + actual = osi_list_entry(act, struct rgrp_list, list); + ri_compare(rg, actual->ri, expected->ri, ri_addr, + "llx"); + ri_compare(rg, actual->ri, expected->ri, ri_length, + PRIx32); + ri_compare(rg, actual->ri, expected->ri, ri_data0, + "llx"); + ri_compare(rg, actual->ri, expected->ri, ri_data, + PRIx32); + ri_compare(rg, actual->ri, expected->ri, ri_bitbytes, + PRIx32); + } /* If we modified the index, write it back to disk. */ if (rindex_modified) { if (query( _("Fix the index? (y/n)"))) { @@ -572,22 +966,27 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane) /* Therefore, gfs2_compute_bitstructs might */ /* have malloced the wrong length for bitmap */ /* buffers. So we have to redo it. */ - if (actual->bits) + if (actual->bits) { free(actual->bits); + actual->bits = NULL; + } } else - log_err( _("RG index not fixed.\n")); + log_err( _("rindex not fixed.\n")); gfs2_compute_bitstructs(sdp, actual); rindex_modified = FALSE; } + exp = exp->next; + if (act != &sdp->rglist) + act = act->next; } /* ------------------------------------------------------------- */ /* Read the real RGs and check their integrity. */ /* Now we can somewhat trust the rindex and the RG addresses, */ /* so let's read them in, check them and optionally fix them. */ /* ------------------------------------------------------------- */ - for (rg = 0, act = sdp->rglist.next; act != &sdp->rglist; - act = act->next, rg++) { + for (rg = 0, act = sdp->rglist.next; act != &sdp->rglist && + !fsck_abort; act = act->next, rg++) { struct rgrp_list *rgd; uint64_t prev_err = 0, errblock; int i; diff --git a/gfs2/libgfs2/fs_geometry.c b/gfs2/libgfs2/fs_geometry.c index a15c31f..7c07891 100644 --- a/gfs2/libgfs2/fs_geometry.c +++ b/gfs2/libgfs2/fs_geometry.c @@ -22,7 +22,7 @@ * Returns: the number of RGs */ -static uint64_t how_many_rgrps(struct gfs2_sbd *sdp, struct device *dev, int rgsize_specified) +uint64_t how_many_rgrps(struct gfs2_sbd *sdp, struct device *dev, int rgsize_specified) { uint64_t nrgrp; uint32_t rgblocks1, rgblocksn, bitblocks1, bitblocksn; @@ -117,7 +117,8 @@ void compute_rgrp_layout(struct gfs2_sbd *sdp, int rgsize_specified) nrgrp = rgrp + sdp->new_rgrps; } - log_info("\nNew resource groups:\n"); + if (rgrp < nrgrp) + log_info("\nNew resource groups:\n"); for (; rgrp < nrgrp; rgrp++) { rl = calloc(1, sizeof(struct rgrp_list)); if (rl == NULL) { diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index 5545b52..9e97267 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -413,6 +413,8 @@ extern int gfs2_set_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, int state); /* fs_geometry.c */ extern void rgblocks2bitblocks(unsigned int bsize, uint32_t *rgblocks, uint32_t *bitblocks); +extern uint64_t how_many_rgrps(struct gfs2_sbd *sdp, struct device *dev, + int rgsize_specified); extern void compute_rgrp_layout(struct gfs2_sbd *sdp, int rgsize_specified); extern void build_rgrps(struct gfs2_sbd *sdp, int write); diff --git a/gfs2/libgfs2/rgrp.c b/gfs2/libgfs2/rgrp.c index d37ed1b..b35c241 100644 --- a/gfs2/libgfs2/rgrp.c +++ b/gfs2/libgfs2/rgrp.c @@ -132,7 +132,15 @@ struct rgrp_list *gfs2_blk2rgrpd(struct gfs2_sbd *sdp, uint64_t blk) uint64_t gfs2_rgrp_read(struct gfs2_sbd *sdp, struct rgrp_list *rgd) { int x, length = rgd->ri.ri_length; + uint64_t max_rgrp_bitbytes, max_rgrp_len; + /* Max size of an rgrp is 2GB. Figure out how many blocks that is: */ + max_rgrp_bitbytes = ((2147483648 / sdp->bsize) / GFS2_NBBY); + max_rgrp_len = max_rgrp_bitbytes / sdp->bsize; + if (!length && length > max_rgrp_len) + return -1; + if (gfs2_check_range(sdp, rgd->ri.ri_addr)) + return -1; for (x = 0; x < length; x++){ rgd->bh[x] = bread(sdp, rgd->ri.ri_addr + x); if(gfs2_check_meta(rgd->bh[x], @@ -149,7 +157,8 @@ uint64_t gfs2_rgrp_read(struct gfs2_sbd *sdp, struct rgrp_list *rgd) } } - gfs2_rgrp_in(&rgd->rg, rgd->bh[0]); + if (rgd->bh && rgd->bh[0]) + gfs2_rgrp_in(&rgd->rg, rgd->bh[0]); return 0; } @@ -158,8 +167,10 @@ void gfs2_rgrp_relse(struct rgrp_list *rgd) int x, length = rgd->ri.ri_length; for (x = 0; x < length; x++) { - brelse(rgd->bh[x]); - rgd->bh[x] = NULL; + if (rgd->bh && rgd->bh[x]) { + brelse(rgd->bh[x]); + rgd->bh[x] = NULL; + } } } diff --git a/gfs2/libgfs2/super.c b/gfs2/libgfs2/super.c index 5d232a6..f2dd171 100644 --- a/gfs2/libgfs2/super.c +++ b/gfs2/libgfs2/super.c @@ -180,10 +180,8 @@ int rindex_read(struct gfs2_sbd *sdp, int fd, int *count1, int *sane) prev_rgd->length = prev_length; } - if(gfs2_compute_bitstructs(sdp, rgd)) { + if(gfs2_compute_bitstructs(sdp, rgd)) *sane = 0; - return -1; - } (*count1)++; prev_rgd = rgd; diff --git a/gfs2/mkfs/main_grow.c b/gfs2/mkfs/main_grow.c index efe3bfb..3436019 100644 --- a/gfs2/mkfs/main_grow.c +++ b/gfs2/mkfs/main_grow.c @@ -180,7 +180,7 @@ static void initialize_new_portion(struct gfs2_sbd *sdp, int *old_rg_count) osi_list_del(head->next); } /* Issue a discard ioctl for the new portion */ - rl = osi_list_entry(&sdp->rglist.next, struct rgrp_list, list); + rl = osi_list_entry(sdp->rglist.next, struct rgrp_list, list); discard_blocks(sdp->device_fd, rl->start * sdp->bsize, (sdp->device.length - rl->start) * sdp->bsize); /* Build the remaining resource groups */

1 0

gfs2-utils: master - fsck.gfs2: can't repair rgrps resulting from gfs_grow->gfs2_convert
by Bob Peterson 02 Feb '11

02 Feb '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: d8c8af9612e2e00b8d8739a3d72ca9669a593878 Parent: fdc45edc17d329f966acac1b0832a437ba8c6a3e Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Feb 2 09:28:26 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Feb 2 09:28:26 2011 -0600 fsck.gfs2: can't repair rgrps resulting from gfs_grow->gfs2_convert This patch expands the algorithm that repairs destroyed resource groups. It adds more levels of checking and is able to determine the locations of resource groups that are not evenly spaced. rhbz#576640 --- gfs2/edit/savemeta.c | 10 +- gfs2/fsck/fsck.h | 5 +- gfs2/fsck/initialize.c | 32 ++- gfs2/fsck/main.c | 3 +- gfs2/fsck/metawalk.c | 4 + gfs2/fsck/pass2.c | 12 + gfs2/fsck/rgrepair.c | 656 +++++++++++++++++++++++++++++++++++--------- gfs2/libgfs2/fs_geometry.c | 5 +- gfs2/libgfs2/libgfs2.h | 2 + gfs2/libgfs2/rgrp.c | 17 +- gfs2/libgfs2/super.c | 4 +- gfs2/mkfs/main_grow.c | 2 +- 12 files changed, 603 insertions(+), 149 deletions(-) diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index fa2b9bf..666a452 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -203,7 +203,7 @@ static int save_block(int fd, int out_fd, uint64_t blk) if (blk > last_fs_block) { fprintf(stderr, "\nWarning: bad block pointer '0x%llx' " - "ignored in block (block %llu (%llx))", + "ignored in block (block %llu (0x%llx))", (unsigned long long)blk, (unsigned long long)block, (unsigned long long)block); return 0; @@ -324,7 +324,9 @@ static void save_indirect_blocks(int out_fd, osi_list_t *cur_list, if (height != hgt) { /* If not at max height */ nbh = bread(&sbd, indir_block); osi_list_add_prev(&nbh->b_altlist, cur_list); - brelse(nbh); + /* The buffer_head needs to be queued ahead, so + don't release it! + brelse(nbh);*/ } } /* for all data on the indirect block */ } @@ -370,8 +372,8 @@ static void save_inode_data(int out_fd) (S_ISDIR(inode->i_di.di_mode) || (gfs1 && inode->i_di.__pad1 == GFS_FILE_DIR))) height++; - else if (height && !block_is_systemfile() && - !S_ISDIR(inode->i_di.di_mode)) + else if (height && !(inode->i_di.di_flags & GFS2_DIF_SYSTEM) && + !block_is_systemfile() && !S_ISDIR(inode->i_di.di_mode)) height--; osi_list_add(&metabh->b_altlist, &metalist[0]); for (i = 1; i <= height; i++){ diff --git a/gfs2/fsck/fsck.h b/gfs2/fsck/fsck.h index b0e1efc..bc14b88 100644 --- a/gfs2/fsck/fsck.h +++ b/gfs2/fsck/fsck.h @@ -84,9 +84,12 @@ enum rgindex_trust_level { /* how far can we trust our RG index? */ open_minded = 2, /* At least 1 RG is corrupt. Try to calculate what it should be, in a perfect world where our RGs are all on even boundaries. Blue sky. Chirping birds. */ - distrust = 3 /* The world isn't perfect, our RGs are not on nice neat + distrust = 3, /* The world isn't perfect, our RGs are not on nice neat boundaries. The fs must have been messed with by gfs2_grow or something. Count the RGs by hand. */ + indignation = 4 /* Not only do we have corruption, but the rgrps + aren't on even boundaries, so this file system + must have been converted from gfs2_convert. */ }; extern struct gfs2_inode *fsck_load_inode(struct gfs2_sbd *sbp, uint64_t block); diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c index 8859032..9fe7776 100644 --- a/gfs2/fsck/initialize.c +++ b/gfs2/fsck/initialize.c @@ -145,7 +145,8 @@ static int set_block_ranges(struct gfs2_sbd *sdp) { rgd = osi_list_entry(tmp, struct rgrp_list, list); ri = &rgd->ri; - if (ri->ri_data0 + ri->ri_data - 1 > rmax) + if (ri->ri_data0 + ri->ri_data && + ri->ri_data0 + ri->ri_data - 1 > rmax) rmax = ri->ri_data0 + ri->ri_data - 1; if (!rmin || ri->ri_data0 < rmin) rmin = ri->ri_data0; @@ -406,6 +407,20 @@ static int init_system_inodes(struct gfs2_sbd *sdp) int rgcount, sane = 1; enum rgindex_trust_level trust_lvl; uint64_t addl_mem_needed; + const char *level_desc[] = { + _("Checking if all rgrp and rindex values are good"), + _("Checking if rindex values are ascending and evenly spaced"), + _("Calculating where the rgrps should be if evenly spaced"), + _("Trying to rebuild rindex assuming evenly spaced rgrps"), + _("Trying to rebuild rindex assuming unevenly spaced rgrps"), + }; + const char *fail_desc[] = { + _("Some damage was found; we need to take remedial measures"), + _("rindex is unevenly spaced: converted from gfs1 or corrupt"), + _("rindex calculations don't match: uneven rgrp boundaries"), + _("Too many rgrp misses: rgrps must be unevenly spaced"), + _("Too much damage found: we cannot rebuild this rindex"), + }; /******************************************************************* ****************** Initialize important inodes ****************** @@ -446,18 +461,23 @@ static int init_system_inodes(struct gfs2_sbd *sdp) ******** Validate and read in resource group information ******** *******************************************************************/ log_warn( _("Validating Resource Group index.\n")); - for (trust_lvl = blind_faith; trust_lvl <= distrust; trust_lvl++) { - log_warn( _("Level %d RG check.\n"), trust_lvl + 1); + for (trust_lvl = blind_faith; trust_lvl <= indignation; trust_lvl++) { + log_warn( _("Level %d rgrp check: %s.\n"), trust_lvl + 1, + level_desc[trust_lvl]); if ((rg_repair(sdp, trust_lvl, &rgcount, &sane) == 0) && (ri_update(sdp, 0, &rgcount, &sane) == 0)) { log_warn( _("(level %d passed)\n"), trust_lvl + 1); break; } else - log_err( _("(level %d failed)\n"), trust_lvl + 1); + log_err( _("(level %d failed: %s)\n"), trust_lvl + 1, + fail_desc[trust_lvl]); + if (fsck_abort) + break; } - if (trust_lvl > distrust) { - log_err( _("RG recovery impossible; I can't fix this file system.\n")); + if (trust_lvl > indignation) { + log_err( _("Resource Group recovery impossible; I can't fix " + "this file system.\n")); return -1; } log_info( _("%u resource groups found.\n"), rgcount); diff --git a/gfs2/fsck/main.c b/gfs2/fsck/main.c index 157ed02..bb540e7 100644 --- a/gfs2/fsck/main.c +++ b/gfs2/fsck/main.c @@ -336,7 +336,8 @@ int main(int argc, char **argv) error = FSCK_CANCELED; } - check_statfs(sbp); + if (!fsck_abort) + check_statfs(sbp); /* Free up our system inodes */ inode_put(&sbp->md.inum); diff --git a/gfs2/fsck/metawalk.c b/gfs2/fsck/metawalk.c index 8415b15..3e7e653 100644 --- a/gfs2/fsck/metawalk.c +++ b/gfs2/fsck/metawalk.c @@ -729,6 +729,10 @@ static int check_leaf_blks(struct gfs2_inode *ip, struct metawalk_fxns *pass) if (pass->check_dentry && S_ISDIR(ip->i_di.di_mode)) { error = check_entries(ip, lbh, DIR_EXHASH, &count, pass); + + if (skip_this_pass || fsck_abort) + return 0; + if(error < 0) { stack; brelse(lbh); diff --git a/gfs2/fsck/pass2.c b/gfs2/fsck/pass2.c index 42aa588..5379ec7 100644 --- a/gfs2/fsck/pass2.c +++ b/gfs2/fsck/pass2.c @@ -557,6 +557,8 @@ static int check_system_dir(struct gfs2_inode *sysinode, const char *dirname, } } error = check_dir(sysinode->i_sbd, iblock, &pass2_fxns); + if (skip_this_pass || fsck_abort) /* if asked to skip the rest */ + return FSCK_OK; if(error < 0) { stack; return -1; @@ -667,18 +669,26 @@ int pass2(struct gfs2_sbd *sbp) stack; return FSCK_ERROR; } + if (skip_this_pass || fsck_abort) /* if asked to skip the rest */ + return FSCK_OK; if (check_system_dir(sbp->md.pinode, "per_node", build_per_node)) { stack; return FSCK_ERROR; } + if (skip_this_pass || fsck_abort) /* if asked to skip the rest */ + return FSCK_OK; if (check_system_dir(sbp->master_dir, "master", build_master)) { stack; return FSCK_ERROR; } + if (skip_this_pass || fsck_abort) /* if asked to skip the rest */ + return FSCK_OK; if (check_system_dir(sbp->md.rooti, "root", build_root)) { stack; return FSCK_ERROR; } + if (skip_this_pass || fsck_abort) /* if asked to skip the rest */ + return FSCK_OK; log_info( _("Checking directory inodes.\n")); /* Grab each directory inode, and run checks on it */ for(dirblk = 0; dirblk < last_fs_block; dirblk++) { @@ -712,6 +722,8 @@ int pass2(struct gfs2_sbd *sbp) } } error = check_dir(sbp, dirblk, &pass2_fxns); + if (skip_this_pass || fsck_abort) /* if asked to skip the rest */ + return FSCK_OK; if(error < 0) { stack; return FSCK_ERROR; diff --git a/gfs2/fsck/rgrepair.c b/gfs2/fsck/rgrepair.c index ee062dc..bb0309c 100644 --- a/gfs2/fsck/rgrepair.c +++ b/gfs2/fsck/rgrepair.c @@ -17,6 +17,9 @@ int rindex_modified = FALSE; struct special_blocks false_rgrps; +#define BAD_RG_PERCENT_TOLERANCE 11 +#define AWAY_FROM_BITMAPS 0x1000 + #define ri_equal(ondisk, expected, field) (ondisk.field == expected.field) #define ri_compare(rg, ondisk, expected, field, fmt, type) \ @@ -49,7 +52,7 @@ static void find_journaled_rgs(struct gfs2_sbd *sdp) osi_list_init(&false_rgrps.list); for (j = 0; j < sdp->md.journals; j++) { - log_debug( _("Checking for RGs in journal%d.\n"), j); + log_debug( _("Checking for rgrps in journal%d.\n"), j); ip = sdp->md.journal[j]; jblocks = ip->i_di.di_size / sdp->sd_sb.sb_bsize; for (b = 0; b < jblocks; b++) { @@ -58,7 +61,7 @@ static void find_journaled_rgs(struct gfs2_sbd *sdp) break; bh = bread(sdp, dblock); if (!gfs2_check_meta(bh, GFS2_METATYPE_RG)) { - log_debug( _("False RG found at block 0x%llx\n"), + log_debug( _("False rgrp found at block 0x%llx\n"), (unsigned long long)dblock); gfs2_special_set(&false_rgrps, dblock); } @@ -75,66 +78,38 @@ static int is_false_rg(uint64_t block) } /* - * gfs2_rindex_rebuild - rebuild a corrupt Resource Group (RG) index manually - * where trust_lvl == distrust - * - * If this routine is called, it means we have RGs in odd/unexpected places, - * and there is a corrupt RG or RG index entry. It also means we can't trust - * the RG index to be sane, and the RGs don't agree with how mkfs would have - * built them by default. So we have no choice but to go through and count - * them by hand. We've tried twice to recover the RGs and RG index, and - * failed, so this is our last chance to remedy the situation. - * - * This routine tries to minimize performance impact by: - * 1. Skipping through the filesystem at known increments when possible. - * 2. Shuffle through every block when RGs are not found at the predicted - * locations. - * - * Note: A GFS2 filesystem differs from a GFS1 file system in that there will - * only be ONE chunk (i.e. no artificial subdevices on either size of the - * journals). The journals and even the rindex are kept as part of the file - * system, so we need to rebuild that information by hand. Also, with GFS1, - * the different chunks ("subdevices") could have different RG sizes, which - * made for quite a mess when trying to recover RGs. GFS2 always uses the - * same RG size determined by the original mkfs, so recovery is easier. + * find_shortest_rgdist - hunt and peck for the shortest distance between RGs. * + * Sample several of them because an RG that's been blasted may + * look like twice the distance. If we can find 6 of them, that + * should be enough to figure out the correct layout. + * This also figures out first_rg_dist since that's always different. */ -static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, - int *num_rgs) +static uint64_t find_shortest_rgdist(struct gfs2_sbd *sdp, + uint64_t *initial_first_rg_dist, + uint64_t *first_rg_dist) { + uint64_t blk, block_of_last_rg, shortest_dist_btwn_rgs; struct gfs2_buffer_head *bh; - uint64_t shortest_dist_btwn_rgs; - uint64_t blk, block_of_last_rg; - uint64_t fwd_block, block_bump; - uint64_t first_rg_dist, initial_first_rg_dist; - struct rgrp_list *calc_rgd, *prev_rgd; - int number_of_rgs, rgi; + int number_of_rgs = 0; struct gfs2_rindex buf, tmpndx; - int rg_was_fnd = FALSE, corrupt_rgs = 0, bitmap_was_fnd; - osi_list_t *tmp; /* Figure out if there are any RG-looking blocks in the journal we need to ignore. */ find_journaled_rgs(sdp); - osi_list_init(ret_list); - number_of_rgs = 0; - initial_first_rg_dist = first_rg_dist = sdp->sb_addr + 1; + + *initial_first_rg_dist = *first_rg_dist = sdp->sb_addr + 1; block_of_last_rg = sdp->sb_addr + 1; - /* ------------------------------------------------------------- */ - /* First, hunt and peck for the shortest distance between RGs. */ - /* Sample several of them because an RG that's been blasted may */ - /* look like twice the distance. If we can find 6 of them, that */ - /* should be enough to figure out the correct layout. */ - /* ------------------------------------------------------------- */ shortest_dist_btwn_rgs = sdp->device.length; + for (blk = sdp->sb_addr + 1; - blk < sdp->device.length && number_of_rgs < 6; - blk++) { + blk < sdp->device.length && number_of_rgs < 6; blk++) { bh = bread(sdp, blk); if (((blk == sdp->sb_addr + 1) || (!gfs2_check_meta(bh, GFS2_METATYPE_RG))) && !is_false_rg(blk)) { - log_debug( _("RG found at block 0x%llx\n"), (unsigned long long)blk); + log_debug( _("rgrp found at block 0x%llx\n"), + (unsigned long long)blk); if (blk > sdp->sb_addr + 1) { uint64_t rgdist; @@ -151,8 +126,8 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, /* from the rest because of the superblock */ /* and 64K dead space. */ /* ----------------------------------------- */ - if (first_rg_dist == initial_first_rg_dist) - first_rg_dist = rgdist; + if (*first_rg_dist == *initial_first_rg_dist) + *first_rg_dist = rgdist; if (rgdist < shortest_dist_btwn_rgs) { shortest_dist_btwn_rgs = rgdist; log_debug( _("(shortest so far)\n")); @@ -166,18 +141,15 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, } brelse(bh); } - number_of_rgs = 0; - gfs2_special_free(&false_rgrps); - /* -------------------------------------------------------------- */ /* Sanity-check our first_rg_dist. If RG #2 got nuked, the */ /* first_rg_dist would measure from #1 to #3, which would be bad. */ /* We need to take remedial measures to fix it (from the index). */ /* -------------------------------------------------------------- */ - log_debug( _("First RG distance: 0x%llx\n"), (unsigned long long)first_rg_dist); - log_debug( _("Distance between RGs: 0x%llx\n"), + log_debug( _("First rgrp distance: 0x%llx\n"), (unsigned long long)*first_rg_dist); + log_debug( _("Distance between rgrps: 0x%llx\n"), (unsigned long long)shortest_dist_btwn_rgs); - if (first_rg_dist >= shortest_dist_btwn_rgs + + if (*first_rg_dist >= shortest_dist_btwn_rgs + (shortest_dist_btwn_rgs / 4)) { /* read in the second RG index entry for this subd. */ gfs2_readi(sdp->md.riinode, (char *)&buf, @@ -185,28 +157,302 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, sizeof(struct gfs2_rindex)); gfs2_rindex_in(&tmpndx, (char *)&buf); if (tmpndx.ri_addr > sdp->sb_addr + 1) { /* sanity check */ - log_warn( _("RG 2 is damaged: getting dist from index: ")); - first_rg_dist = tmpndx.ri_addr - (sdp->sb_addr + 1); - log_warn("0x%llx\n", (unsigned long long)first_rg_dist); + log_warn( _("rgrp 2 is damaged: getting dist from index: ")); + *first_rg_dist = tmpndx.ri_addr - (sdp->sb_addr + 1); + log_warn("0x%llx\n", (unsigned long long)*first_rg_dist); } else { - log_warn( _("RG index 2 is damaged: extrapolating dist: ")); - first_rg_dist = sdp->device.length - + log_warn( _("rgrp index 2 is damaged: extrapolating dist: ")); + *first_rg_dist = sdp->device.length - (sdp->rgrps - 1) * (sdp->device.length / sdp->rgrps); - log_warn("0x%llx\n", (unsigned long long)first_rg_dist); + log_warn("0x%llx\n", (unsigned long long)*first_rg_dist); } - log_debug( _("Adjusted first RG distance: 0x%llx\n"), - (unsigned long long)first_rg_dist); + log_debug( _("Adjusted first rgrp distance: 0x%llx\n"), + (unsigned long long)*first_rg_dist); } /* if first RG distance is within tolerance */ + + gfs2_special_free(&false_rgrps); + return shortest_dist_btwn_rgs; +} + +/* + * count_usedspace - count the used bits in a rgrp bitmap buffer + */ +static uint64_t count_usedspace(struct gfs2_sbd *sdp, int first, + struct gfs2_buffer_head *bh) +{ + int off, x, y, bytes_to_check; + uint32_t rg_used = 0; + unsigned int state; + + /* Count up the free blocks in the bitmap */ + off = (first) ? sizeof(struct gfs2_rgrp) : + sizeof(struct gfs2_meta_header); + bytes_to_check = sdp->bsize - off; + for (x = 0; x < bytes_to_check; x++) { + unsigned char *byte; + + byte = (unsigned char *)&bh->b_data[off + x]; + if (*byte == 0x55) { + rg_used += GFS2_NBBY; + continue; + } + if (*byte == 0x00) + continue; + for (y = 0; y < GFS2_NBBY; y++) { + state = (*byte >> (GFS2_BIT_SIZE * y)) & GFS2_BIT_MASK; + if (state == GFS2_BLKST_FREE || + state == GFS2_BLKST_UNLINKED) + continue; + rg_used++; + } + } + return rg_used; +} + +/* + * find_next_rgrp_dist - find the distance to the next rgrp + * + * This function is only called if the rgrps are determined to be on uneven + * boundaries. In a normal gfs2 file system, after mkfs.gfs2, all the + * rgrps but the first and second one will be the same distance from the + * previous rgrp. (The first rgrp will predictably be after the superblock + * and the second one will be adjusted based on the number 64KB skipped + * at the start of the file system.) The only way we can deviate from that + * pattern is if the user did gfs_grow on a gfs1 file system, then converted + * it to gfs2 using gfs2_convert. + * + * This function finds the distance to the next rgrp for these cases. + */ +static uint64_t find_next_rgrp_dist(struct gfs2_sbd *sdp, uint64_t blk, + struct rgrp_list *prevrgd) +{ + uint64_t rgrp_dist = 0, used_blocks, block, next_block, twogigs; + osi_list_t *tmp; + struct rgrp_list *rgd = NULL, *next_rgd; + struct gfs2_buffer_head *bh; + struct gfs2_meta_header mh; + int first, length, b, found, mega_in_blocks; + uint32_t free_blocks; + + for (tmp = sdp->rglist.next; tmp != &sdp->rglist; tmp = tmp->next) { + rgd = osi_list_entry(tmp, struct rgrp_list, list); + if (rgd->ri.ri_addr == blk) + break; + } + if (rgd && tmp && tmp != &sdp->rglist && tmp->next && + rgd->ri.ri_addr == blk) { + tmp = tmp->next; + next_rgd = osi_list_entry(tmp, struct rgrp_list, list); + rgrp_dist = next_rgd->ri.ri_addr - rgd->ri.ri_addr; + return rgrp_dist; + } + mega_in_blocks = (1024 * 1024) / sdp->bsize; + twogigs = 2048 * mega_in_blocks; + /* Unfortunately, if we fall through to here we can't trust the + rindex. So we have to analyze the current rgrp to figure out + the bare minimum block number where it ends. If we don't have + rindex, all we know about this rgrp is what's on disk: its + rg_free. If we analyze the rgrp's bitmap and the bitmaps that + follow, we can figure out how many bits are used. If we add + rg_free, we get the total number of blocks this rgrp + represents. After that should be the next rgrp, but it may + skip a few blocks (hopefully no more than 4). */ + used_blocks = 0; + length = 0; + block = prevrgd->ri.ri_addr; + first = 1; + found = 0; + while (1) { + if (block >= sdp->device.length) + break; + if (block >= prevrgd->ri.ri_addr + twogigs) + break; + bh = bread(sdp, block); + gfs2_meta_header_in(&mh, bh); + if ((mh.mh_magic != GFS2_MAGIC) || + (first && mh.mh_type != GFS2_METATYPE_RG) || + (!first && mh.mh_type != GFS2_METATYPE_RB)) { + brelse(bh); + break; + } + if (first) { + struct gfs2_rgrp *rg; + + rg = (struct gfs2_rgrp *)bh->b_data; + free_blocks = be32_to_cpu(rg->rg_free); + } + used_blocks += count_usedspace(sdp, first, bh); + first = 0; + block++; + length++; + brelse(bh); + /* Check if this distance points to an rgrp: + We have to look for blocks that resemble rgrps and bitmaps. + If they do, we need to count blocks used and free and see + if adding that number of free blocks accounts for the + next rgrp we find. Otherwise, you could have a length of + 6 with additional user blocks that just happen to look like + bitmap blocks. Count them all as bitmaps and you'll be + hopelessly lost. */ + rgrp_dist = used_blocks + free_blocks + length; + next_block = prevrgd->ri.ri_addr + rgrp_dist; + /* Now we account for block rounding done by mkfs.gfs2 */ + for (b = 0; b <= length + GFS2_NBBY; b++) { + if (next_block >= sdp->device.length) + break; + bh = bread(sdp, next_block + b); + gfs2_meta_header_in(&mh, bh); + brelse(bh); + if (mh.mh_magic == GFS2_MAGIC) { + if (mh.mh_type == GFS2_METATYPE_RG) { + found = 1; + break; + } + /* if the first thing we find is a bitmap, + there must be a damaged rgrp on the + previous block. */ + if (mh.mh_type == GFS2_METATYPE_RB) { + found = 1; + rgrp_dist--; + break; + } + } + rgrp_dist++; + } + if (found) { + block = next_block; + log_info( _("rgrp found at 0x%llx, length=%d, " + "used=%llu, free=%d\n"), + prevrgd->ri.ri_addr, length, + (unsigned long long)used_blocks, + free_blocks); + break; + } + } + return rgrp_dist; +} + +/* + * hunt_and_peck - find the distance to the next rgrp + * + * This function is only called if the rgrps are determined to be on uneven + * boundaries, and also corrupt. So we have to go out searching for one. + */ +static uint64_t hunt_and_peck(struct gfs2_sbd *sdp, uint64_t blk, + struct rgrp_list *prevrgd, uint64_t last_bump) +{ + uint64_t rgrp_dist = 0, block, twogigs, last_block, last_meg; + struct gfs2_buffer_head *bh; + struct gfs2_meta_header mh; + int b, mega_in_blocks; + + /* Skip ahead the previous amount: we might get lucky. + If we're close to the end of the device, take the rest. */ + if (gfs2_check_range(sdp, blk + last_bump)) + return sdp->fssize - blk; + + bh = bread(sdp, blk + last_bump); + gfs2_meta_header_in(&mh, bh); + brelse(bh); + if (mh.mh_magic == GFS2_MAGIC && mh.mh_type == GFS2_METATYPE_RG) { + log_info( _("rgrp found at 0x%llx, length=%lld\n"), + (unsigned long long)blk + last_bump, + (unsigned long long)last_bump); + return last_bump; + } + + rgrp_dist = AWAY_FROM_BITMAPS; /* Get away from any bitmaps + associated with the previous rgrp */ + block = prevrgd->ri.ri_addr + rgrp_dist; + /* Now we account for block rounding done by mkfs.gfs2. A rgrp can + be at most 2GB in size, so that's where we call it. We do somewhat + obscure math here to avoid integer overflows. */ + mega_in_blocks = (1024 * 1024) / sdp->bsize; + twogigs = 2048 * mega_in_blocks; + if (block + twogigs <= sdp->fssize) { + last_block = twogigs; + last_meg = 0; + } else { + /* There won't be a rgrp in the last megabyte. */ + last_block = sdp->fssize - block - mega_in_blocks; + last_meg = mega_in_blocks; + } + for (b = AWAY_FROM_BITMAPS; b < last_block; b++) { + bh = bread(sdp, block + b); + gfs2_meta_header_in(&mh, bh); + brelse(bh); + if (mh.mh_magic == GFS2_MAGIC) { + if (mh.mh_type == GFS2_METATYPE_RG) + break; + /* if the first thing we find is a bitmap, there must + be a damaged rgrp on the previous block. */ + if (mh.mh_type == GFS2_METATYPE_RB) { + rgrp_dist--; + break; + } + } + rgrp_dist++; + } + return rgrp_dist + last_meg; +} + +/* + * gfs2_rindex_rebuild - rebuild a corrupt Resource Group (RG) index manually + * where trust_lvl == distrust + * + * If this routine is called, it means we have RGs in odd/unexpected places, + * and there is a corrupt RG or RG index entry. It also means we can't trust + * the RG index to be sane, and the RGs don't agree with how mkfs would have + * built them by default. So we have no choice but to go through and count + * them by hand. We've tried twice to recover the RGs and RG index, and + * failed, so this is our last chance to remedy the situation. + * + * This routine tries to minimize performance impact by: + * 1. Skipping through the filesystem at known increments when possible. + * 2. Shuffle through every block when RGs are not found at the predicted + * locations. + * + * Note: A GFS2 filesystem differs from a GFS1 file system in that there will + * only be ONE chunk (i.e. no artificial subdevices on either size of the + * journals). The journals and even the rindex are kept as part of the file + * system, so we need to rebuild that information by hand. Also, with GFS1, + * the different chunks ("subdevices") could have different RG sizes, which + * made for quite a mess when trying to recover RGs. GFS2 always uses the + * same RG size determined by the original mkfs, so recovery is easier. + * + * If "gfs_grow" is specified the file system was most likely converted + * from gfs1 to gfs2 after a gfs_grow operation. In that case, the rgrps + * will not be on predictable boundaries. + */ +static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, + int *num_rgs, int gfs_grow) +{ + struct gfs2_buffer_head *bh; + uint64_t shortest_dist_btwn_rgs; + uint64_t blk; + uint64_t fwd_block, block_bump; + uint64_t first_rg_dist, initial_first_rg_dist; + struct rgrp_list *calc_rgd, *prev_rgd; + int number_of_rgs, rgi; + int rg_was_fnd = FALSE, corrupt_rgs = 0, bitmap_was_fnd; + osi_list_t *tmp; + + osi_list_init(ret_list); + initial_first_rg_dist = first_rg_dist = sdp->sb_addr + 1; + shortest_dist_btwn_rgs = find_shortest_rgdist(sdp, + &initial_first_rg_dist, + &first_rg_dist); + number_of_rgs = 0; /* -------------------------------------------------------------- */ /* Now go through the RGs and verify their integrity, fixing as */ /* needed when corruption is encountered. */ /* -------------------------------------------------------------- */ prev_rgd = NULL; block_bump = first_rg_dist; - for (blk = sdp->sb_addr + 1; blk <= sdp->device.length; - blk += block_bump) { + blk = sdp->sb_addr + 1; + while (blk <= sdp->device.length) { log_debug( _("Block 0x%llx\n"), (unsigned long long)blk); bh = bread(sdp, blk); rg_was_fnd = (!gfs2_check_meta(bh, GFS2_METATYPE_RG)); @@ -214,7 +460,7 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, /* Allocate a new RG and index. */ calc_rgd = malloc(sizeof(struct rgrp_list)); if (!calc_rgd) { - log_crit( _("Can't allocate memory for rg repair.\n")); + log_crit( _("Can't allocate memory for rgrp repair.\n")); return -1; } memset(calc_rgd, 0, sizeof(struct rgrp_list)); @@ -227,11 +473,14 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, /* ------------------------------------------------- */ corrupt_rgs++; if (corrupt_rgs < 5) - log_debug( _("Missing or damaged RG at block %llu" - " (0x%llx)\n"), - (unsigned long long)blk, (unsigned long long)blk); + log_debug( _("Missing or damaged rgrp at block " + "%llu (0x%llx)\n"), + (unsigned long long)blk, + (unsigned long long)blk); else { - log_crit( _("Error: too many bad RGs.\n")); + log_crit( _("Error: too many missing or " + "damaged rgrps using this method. " + "Time to try another method.\n")); return -1; } } @@ -263,6 +512,8 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, prev_rgd->ri.ri_length = bitblocks; prev_rgd->ri.ri_data = rgblocks; + prev_rgd->ri.ri_data0 = prev_rgd->ri.ri_addr + + prev_rgd->ri.ri_length; prev_rgd->ri.ri_data -= prev_rgd->ri.ri_data % GFS2_NBBY; prev_rgd->ri.ri_bitbytes = prev_rgd->ri.ri_data / @@ -271,19 +522,42 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, (unsigned long)prev_rgd->ri.ri_data); } number_of_rgs++; - log_warn( _("%c RG %d at block 0x%llX %s"), - (rg_was_fnd ? ' ' : '*'), number_of_rgs, - (unsigned long long)blk, - (rg_was_fnd ? "intact" : "*** DAMAGED ***")); + if (rg_was_fnd) + log_info( _(" rgrp %d at block 0x%llx intact"), + number_of_rgs, (unsigned long long)blk); + else + log_warn( _("* rgrp %d at block 0x%llx *** DAMAGED ***"), + number_of_rgs, (unsigned long long)blk); prev_rgd = calc_rgd; - block_of_last_rg = blk; - + /* + * Figure out where our next rgrp should be. + */ if (blk == sdp->sb_addr + 1) block_bump = first_rg_dist; - else + else if (!gfs_grow) { block_bump = shortest_dist_btwn_rgs; - if (block_bump != 1) - log_warn( _(" [length 0x%llx]\n"), (unsigned long long)block_bump); + /* if we have uniformly-spaced rgrps, there may be + some wasted space at the end of the device. + Since we don't want to create a short rgrp and + break our uniformity, just quit here. */ + if (blk + (2 * block_bump) > sdp->device.length) + break; + } else if (rg_was_fnd) + block_bump = find_next_rgrp_dist(sdp, blk, prev_rgd); + else + block_bump = hunt_and_peck(sdp, blk, prev_rgd, + block_bump); + if (block_bump != 1) { + if (rg_was_fnd) + log_info( _(" [length 0x%llx]\n"), + (unsigned long long)block_bump); + else + log_warn( _(" [length 0x%llx]\n"), + (unsigned long long)block_bump); + } else { + log_warn("\n"); + } + blk += block_bump; } /* for each rg block */ /* ----------------------------------------------------------------- */ /* If we got to the end of the fs, we still need to fix the */ @@ -296,6 +570,8 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, rgblocks2bitblocks(sdp->bsize, &rgblocks, &bitblocks); prev_rgd->ri.ri_length = bitblocks; + prev_rgd->ri.ri_data0 = prev_rgd->ri.ri_addr + + prev_rgd->ri.ri_length; prev_rgd->ri.ri_data = rgblocks; prev_rgd->ri.ri_data -= prev_rgd->ri.ri_data % GFS2_NBBY; prev_rgd->ri.ri_bitbytes = prev_rgd->ri.ri_data / GFS2_NBBY; @@ -306,8 +582,8 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, /* ---------------------------------------------- */ /* Now dump out the information (if verbose mode) */ /* ---------------------------------------------- */ - log_debug( _("RG index rebuilt as follows:\n")); - for (tmp = ret_list, rgi = 0; tmp != ret_list; + log_debug( _("rindex rebuilt as follows:\n")); + for (tmp = ret_list->next, rgi = 0; tmp != ret_list; tmp = tmp->next, rgi++) { calc_rgd = osi_list_entry(tmp, struct rgrp_list, list); log_debug("%d: 0x%llx / %x / 0x%llx" @@ -337,33 +613,45 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list, static int gfs2_rindex_calculate(struct gfs2_sbd *sdp, osi_list_t *ret_list, int *num_rgs) { + uint64_t num_rgrps = 0; + + /* ----------------------------------------------------------------- */ + /* Calculate how many RGs there are supposed to be based on the */ + /* rindex filesize. Remember that our trust level is open-minded */ + /* here. If the filesize of the rindex file is not a multiple of */ + /* our rindex structures, then something's wrong and we can't trust */ + /* the index. */ + /* ----------------------------------------------------------------- */ + *num_rgs = sdp->md.riinode->i_di.di_size / sizeof(struct gfs2_rindex); + osi_list_init(ret_list); - sdp->rgsize = GFS2_DEFAULT_RGSIZE; /* compute_rgrp_layout adjusts */ if (device_geometry(sdp)) { fprintf(stderr, _("Geometry error\n")); exit(-1); } if (fix_device_geometry(sdp)) { fprintf(stderr, _("Device is too small (%llu bytes)\n"), - (unsigned long long)sdp->device.length << GFS2_BASIC_BLOCK_SHIFT); + (unsigned long long)sdp->device.length << GFS2_BASIC_BLOCK_SHIFT); exit(-1); } + /* Try all possible rgrp sizes: 2048, 1024, 512, 256, 128, 64, 32 */ + for (sdp->rgsize = GFS2_DEFAULT_RGSIZE; sdp->rgsize >= 32; + sdp->rgsize /= 2) { + num_rgrps = how_many_rgrps(sdp, &sdp->device, TRUE); + if (num_rgrps == *num_rgs) { + log_info(_("rgsize must be: %lld (0x%llx)\n"), + (unsigned long long)sdp->rgsize, + (unsigned long long)sdp->rgsize); + break; + } + } /* Compute the default resource group layout as mkfs would have done */ - compute_rgrp_layout(sdp, FALSE); + compute_rgrp_layout(sdp, TRUE); build_rgrps(sdp, FALSE); /* FALSE = calc but don't write to disk. */ - *num_rgs = 0; - log_debug( _("fs_total_size = 0x%llX blocks.\n"), + log_debug( _("fs_total_size = 0x%llx blocks.\n"), (unsigned long long)sdp->device.length); - /* ----------------------------------------------------------------- */ - /* Calculate how many RGs there are supposed to be based on the */ - /* rindex filesize. Remember that our trust level is open-minded */ - /* here. If the filesize of the rindex file is not a multiple of */ - /* our rindex structures, then something's wrong and we can't trust */ - /* the index. */ - /* ----------------------------------------------------------------- */ - *num_rgs = sdp->md.riinode->i_di.di_size / sizeof(struct gfs2_rindex); - log_warn( _("L2: number of rgs in the index = %d.\n"), *num_rgs); + log_warn( _("L3: number of rgs in the index = %d.\n"), *num_rgs); /* Move the rg list to the return list */ ret_list->next = sdp->rglist.next; ret_list->prev = sdp->rglist.prev; @@ -380,14 +668,14 @@ static int rewrite_rg_block(struct gfs2_sbd *sdp, struct rgrp_list *rg, uint64_t errblock) { int x = errblock - rg->ri.ri_addr; + const char *typedesc = x ? "GFS2_METATYPE_RB" : "GFS2_METATYPE_RG"; - log_err( _("Block #%lld (0x%llx) (%d of %d) is neither" - " GFS2_METATYPE_RB nor GFS2_METATYPE_RG.\n"), + log_err( _("Block #%lld (0x%llx) (%d of %d) is not %s.\n"), (unsigned long long)rg->ri.ri_addr + x, (unsigned long long)rg->ri.ri_addr + x, - (int)x+1, (int)rg->ri.ri_length); + (int)x+1, (int)rg->ri.ri_length, typedesc); if (query( _("Fix the Resource Group? (y/n)"))) { - log_err( _("Attempting to repair the RG.\n")); + log_err( _("Attempting to repair the rgrp.\n")); rg->bh[x] = bread(sdp, rg->ri.ri_addr + x); if (x) { struct gfs2_meta_header mh; @@ -437,6 +725,7 @@ static int expect_rindex_sanity(struct gfs2_sbd *sdp, osi_list_t *ret_list, memcpy(&exp->ri, &rgd->ri, sizeof(exp->ri)); memcpy(&exp->rg, &rgd->rg, sizeof(exp->rg)); exp->bits = NULL; + exp->bh = NULL; gfs2_compute_bitstructs(sdp, exp); osi_list_add_prev(&exp->list, ret_list); } @@ -445,21 +734,59 @@ static int expect_rindex_sanity(struct gfs2_sbd *sdp, osi_list_t *ret_list, } /* + * sort_rgrp_list - sort the rgrp list + * + * A bit crude, perhaps, but we're talking about thousands, not millions of + * entries to sort, and the list will be almost sorted anyway, so there + * should be very few swaps. + */ +static void sort_rgrp_list(osi_list_t *head) +{ + struct rgrp_list *thisr, *nextr; + osi_list_t *tmp, *x, *next; + int swaps; + + while(1) { + swaps = 0; + osi_list_foreach_safe(tmp, head, x) { + next = tmp->next; + if (next == head) /* at the end */ + break; + thisr = osi_list_entry(tmp, struct rgrp_list, list); + nextr = osi_list_entry(next, struct rgrp_list, list); + if (thisr->ri.ri_addr > nextr->ri.ri_addr) { + osi_list_del(next); + osi_list_add_prev(next, tmp); + swaps++; + } + } + if (!swaps) + break; + } +} + +/* * rg_repair - try to repair a damaged rg index (rindex) * trust_lvl - This is how much we trust the rindex file. * blind_faith means we take the rindex at face value. * open_minded means it might be okay, but we should verify it. * distrust means it's not to be trusted, so we should go to * greater lengths to build it from scratch. + * indignation means we have corruption, but the file system + * was converted from GFS via gfs2_convert, and its rgrps are + * not on nice boundaries thanks to previous gfs_grow ops. Lovely. */ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane) { - int error, discrepancies; + int error, discrepancies, percent; osi_list_t expected_rglist; int calc_rg_count = 0, rgcount_from_index, rg; osi_list_t *exp, *act; /* expected, actual */ struct gfs2_rindex buf; + /* Free previous incarnations in memory, if any. */ + gfs2_rgrp_free(&sdp->rglist); + if (trust_lvl == blind_faith) return 0; else if (trust_lvl == ye_of_little_faith) { /* if rindex seems sane */ @@ -470,8 +797,10 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane) } error = expect_rindex_sanity(sdp, &expected_rglist, &calc_rg_count); - if (error) + if (error) { + gfs2_rgrp_free(&expected_rglist); return error; + } } else if (trust_lvl == open_minded) { /* If we can't trust RG index */ /* Calculate our own RG index for comparison */ error = gfs2_rindex_calculate(sdp, &expected_rglist, @@ -483,9 +812,19 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane) } else if (trust_lvl == distrust) { /* If we can't trust RG index */ error = gfs2_rindex_rebuild(sdp, &expected_rglist, - &calc_rg_count); + &calc_rg_count, 0); if (error) { - log_crit( _("Error rebuilding rg list.\n")); + log_crit( _("Error rebuilding rgrp list.\n")); + gfs2_rgrp_free(&expected_rglist); + return -1; + } + sdp->rgrps = calc_rg_count; + } + else if (trust_lvl == indignation) { /* If we can't trust anything */ + error = gfs2_rindex_rebuild(sdp, &expected_rglist, + &calc_rg_count, 1); + if (error) { + log_crit( _("Error rebuilding rgrp list.\n")); gfs2_rgrp_free(&expected_rglist); return -1; } @@ -503,13 +842,24 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane) log_warn( _("L%d: number of rgs expected = %lld.\n"), trust_lvl + 1, (unsigned long long)sdp->rgrps); if (calc_rg_count != sdp->rgrps) { - log_warn( _("L%d: They don't match; either (1) the fs was extended, (2) an odd\n"), trust_lvl + 1); - log_warn( _("L%d: rg size was used, or (3) we have a corrupt rg index.\n"), trust_lvl + 1); + log_warn( _("L%d: They don't match; either (1) the fs was " + "extended, (2) an odd\n"), trust_lvl + 1); + log_warn( _("L%d: rgrp size was used, or (3) we have a corrupt " + "rg index.\n"), trust_lvl + 1); gfs2_rgrp_free(&expected_rglist); gfs2_rgrp_free(&sdp->rglist); return -1; } /* ------------------------------------------------------------- */ + /* Sort the rindex list. Older versions of gfs_grow got the */ + /* rindex out of sorted order. But rebuilding the rindex from */ + /* scratch will rebuild it in sorted order. */ + /* The gfs2_grow program should, in theory, drop new rgrps into */ + /* the rindex in sorted order, so this should only matter for */ + /* gfs1 converted file systems. */ + /* ------------------------------------------------------------- */ + sort_rgrp_list(&sdp->rglist); + /* ------------------------------------------------------------- */ /* Now compare the rindex to what we think it should be. */ /* See how far off our expected values are. If too much, abort. */ /* The theory is: if we calculated the index to have 32 RGs and */ @@ -518,28 +868,52 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane) /* ------------------------------------------------------------- */ discrepancies = 0; for (rg = 0, act = sdp->rglist.next, exp = expected_rglist.next; - act != &sdp->rglist && exp != &expected_rglist; - act = act->next, exp = exp->next, rg++) { + act != &sdp->rglist && exp != &expected_rglist && !fsck_abort; + rg++) { struct rgrp_list *expected, *actual; expected = osi_list_entry(exp, struct rgrp_list, list); actual = osi_list_entry(act, struct rgrp_list, list); - if (!ri_equal(actual->ri, expected->ri, ri_addr) || - !ri_equal(actual->ri, expected->ri, ri_length) || + if (actual->ri.ri_addr < expected->ri.ri_addr) { + act = act->next; + discrepancies++; + log_info(_("%d addr: 0x%llx < 0x%llx * mismatch\n"), + rg + 1, actual->ri.ri_addr, + expected->ri.ri_addr); + continue; + } else if (expected->ri.ri_addr < actual->ri.ri_addr) { + exp = exp->next; + discrepancies++; + log_info(_("%d addr: 0x%llx > 0x%llx * mismatch\n"), + rg + 1, actual->ri.ri_addr, + expected->ri.ri_addr); + continue; + } + if (!ri_equal(actual->ri, expected->ri, ri_length) || !ri_equal(actual->ri, expected->ri, ri_data0) || !ri_equal(actual->ri, expected->ri, ri_data) || !ri_equal(actual->ri, expected->ri, ri_bitbytes)) { discrepancies++; + log_info(_("%d addr: 0x%llx 0x%llx * has mismatch\n"), + rg + 1, actual->ri.ri_addr, + expected->ri.ri_addr); } + act = act->next; + exp = exp->next; } - if (trust_lvl < distrust && discrepancies > (trust_lvl * 8)) { - log_warn( _("Level %d didn't work. Too many descepencies.\n"), - trust_lvl + 1); - log_warn( _("%d out of %d RGs did not match what was expected.\n"), - discrepancies, rg); - gfs2_rgrp_free(&expected_rglist); - gfs2_rgrp_free(&sdp->rglist); - return -1; + if (rg) { + /* Check to see if more than 2% of the rgrps are wrong. */ + percent = (discrepancies * 100) / rg; + if (percent > BAD_RG_PERCENT_TOLERANCE) { + log_warn( _("Level %d didn't work. Too many " + "discrepancies.\n"), trust_lvl + 1); + log_warn( _("%d out of %d rgrps (%d percent) did not " + "match what was expected.\n"), + discrepancies, rg, percent); + gfs2_rgrp_free(&expected_rglist); + gfs2_rgrp_free(&sdp->rglist); + return -1; + } } /* ------------------------------------------------------------- */ /* Now compare the rindex to what we think it should be. */ @@ -547,17 +921,38 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane) /* so look for index problems first before looking at the rgs. */ /* ------------------------------------------------------------- */ for (rg = 0, act = sdp->rglist.next, exp = expected_rglist.next; - act != &sdp->rglist && exp != &expected_rglist; - act = act->next, exp = exp->next, rg++) { + exp != &expected_rglist && !fsck_abort; rg++) { struct rgrp_list *expected, *actual; expected = osi_list_entry(exp, struct rgrp_list, list); - actual = osi_list_entry(act, struct rgrp_list, list); - ri_compare(rg, actual->ri, expected->ri, ri_addr, "llx", unsigned long long); - ri_compare(rg, actual->ri, expected->ri, ri_length, "lx", unsigned long); - ri_compare(rg, actual->ri, expected->ri, ri_data0, "llx", unsigned long long); - ri_compare(rg, actual->ri, expected->ri, ri_data, "lx", unsigned long); - ri_compare(rg, actual->ri, expected->ri, ri_bitbytes, "lx", unsigned long); + + /* If we ran out of actual rindex entries due to rindex + damage, fill in a new one with the expected values. */ + if (act == &sdp->rglist) { /* end of actual rindex */ + log_err( _("Entry missing from rindex: 0x%llx\n"), + (unsigned long long)expected->ri.ri_addr); + actual = (struct rgrp_list *) + malloc(sizeof(struct rgrp_list)); + if (!actual) { + log_err(_("Out of memory!\n")); + break; + } + memset(actual, 0, sizeof(struct rgrp_list)); + osi_list_add_prev(&actual->list, &sdp->rglist); + rindex_modified = 1; + } else { + actual = osi_list_entry(act, struct rgrp_list, list); + ri_compare(rg, actual->ri, expected->ri, ri_addr, + "llx", unsigned long long); + ri_compare(rg, actual->ri, expected->ri, ri_length, + "lx", unsigned long); + ri_compare(rg, actual->ri, expected->ri, ri_data0, + "llx", unsigned long long); + ri_compare(rg, actual->ri, expected->ri, ri_data, + "lx", unsigned long); + ri_compare(rg, actual->ri, expected->ri, ri_bitbytes, + "lx", unsigned long); + } /* If we modified the index, write it back to disk. */ if (rindex_modified) { if (query( _("Fix the index? (y/n)"))) { @@ -575,22 +970,27 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane) /* Therefore, gfs2_compute_bitstructs might */ /* have malloced the wrong length for bitmap */ /* buffers. So we have to redo it. */ - if (actual->bits) + if (actual->bits) { free(actual->bits); + actual->bits = NULL; + } } else - log_err( _("RG index not fixed.\n")); + log_err( _("rindex not fixed.\n")); gfs2_compute_bitstructs(sdp, actual); rindex_modified = FALSE; } + exp = exp->next; + if (act != &sdp->rglist) + act = act->next; } /* ------------------------------------------------------------- */ /* Read the real RGs and check their integrity. */ /* Now we can somewhat trust the rindex and the RG addresses, */ /* so let's read them in, check them and optionally fix them. */ /* ------------------------------------------------------------- */ - for (rg = 0, act = sdp->rglist.next; act != &sdp->rglist; - act = act->next, rg++) { + for (rg = 0, act = sdp->rglist.next; act != &sdp->rglist && + !fsck_abort; act = act->next, rg++) { struct rgrp_list *rgd; uint64_t prev_err = 0, errblock; int i; diff --git a/gfs2/libgfs2/fs_geometry.c b/gfs2/libgfs2/fs_geometry.c index 9c69661..caffeb7 100644 --- a/gfs2/libgfs2/fs_geometry.c +++ b/gfs2/libgfs2/fs_geometry.c @@ -24,7 +24,7 @@ * Returns: the number of RGs */ -static uint64_t how_many_rgrps(struct gfs2_sbd *sdp, struct device *dev, int rgsize_specified) +uint64_t how_many_rgrps(struct gfs2_sbd *sdp, struct device *dev, int rgsize_specified) { uint64_t nrgrp; uint32_t rgblocks1, rgblocksn, bitblocks1, bitblocksn; @@ -119,7 +119,8 @@ void compute_rgrp_layout(struct gfs2_sbd *sdp, int rgsize_specified) nrgrp = rgrp + sdp->new_rgrps; } - log_info("\nNew resource groups:\n"); + if (rgrp < nrgrp) + log_info("\nNew resource groups:\n"); for (; rgrp < nrgrp; rgrp++) { rl = calloc(1, sizeof(struct rgrp_list)); if (rl == NULL) { diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index 402a4f9..387e8a7 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -413,6 +413,8 @@ extern int gfs2_set_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, int state); /* fs_geometry.c */ extern void rgblocks2bitblocks(unsigned int bsize, uint32_t *rgblocks, uint32_t *bitblocks); +extern uint64_t how_many_rgrps(struct gfs2_sbd *sdp, struct device *dev, + int rgsize_specified); extern void compute_rgrp_layout(struct gfs2_sbd *sdp, int rgsize_specified); extern void build_rgrps(struct gfs2_sbd *sdp, int write); diff --git a/gfs2/libgfs2/rgrp.c b/gfs2/libgfs2/rgrp.c index b5e68b2..2a6fa3f 100644 --- a/gfs2/libgfs2/rgrp.c +++ b/gfs2/libgfs2/rgrp.c @@ -134,7 +134,15 @@ struct rgrp_list *gfs2_blk2rgrpd(struct gfs2_sbd *sdp, uint64_t blk) uint64_t gfs2_rgrp_read(struct gfs2_sbd *sdp, struct rgrp_list *rgd) { int x, length = rgd->ri.ri_length; + uint64_t max_rgrp_bitbytes, max_rgrp_len; + /* Max size of an rgrp is 2GB. Figure out how many blocks that is: */ + max_rgrp_bitbytes = ((2147483648 / sdp->bsize) / GFS2_NBBY); + max_rgrp_len = max_rgrp_bitbytes / sdp->bsize; + if (!length && length > max_rgrp_len) + return -1; + if (gfs2_check_range(sdp, rgd->ri.ri_addr)) + return -1; for (x = 0; x < length; x++){ rgd->bh[x] = bread(sdp, rgd->ri.ri_addr + x); if(gfs2_check_meta(rgd->bh[x], @@ -151,7 +159,8 @@ uint64_t gfs2_rgrp_read(struct gfs2_sbd *sdp, struct rgrp_list *rgd) } } - gfs2_rgrp_in(&rgd->rg, rgd->bh[0]); + if (rgd->bh && rgd->bh[0]) + gfs2_rgrp_in(&rgd->rg, rgd->bh[0]); return 0; } @@ -160,8 +169,10 @@ void gfs2_rgrp_relse(struct rgrp_list *rgd) int x, length = rgd->ri.ri_length; for (x = 0; x < length; x++) { - brelse(rgd->bh[x]); - rgd->bh[x] = NULL; + if (rgd->bh && rgd->bh[x]) { + brelse(rgd->bh[x]); + rgd->bh[x] = NULL; + } } } diff --git a/gfs2/libgfs2/super.c b/gfs2/libgfs2/super.c index 70e9c82..995e503 100644 --- a/gfs2/libgfs2/super.c +++ b/gfs2/libgfs2/super.c @@ -182,10 +182,8 @@ int rindex_read(struct gfs2_sbd *sdp, int fd, int *count1, int *sane) prev_rgd->length = prev_length; } - if(gfs2_compute_bitstructs(sdp, rgd)) { + if(gfs2_compute_bitstructs(sdp, rgd)) *sane = 0; - return -1; - } (*count1)++; prev_rgd = rgd; diff --git a/gfs2/mkfs/main_grow.c b/gfs2/mkfs/main_grow.c index e76affc..03eb57b 100644 --- a/gfs2/mkfs/main_grow.c +++ b/gfs2/mkfs/main_grow.c @@ -181,7 +181,7 @@ static void initialize_new_portion(struct gfs2_sbd *sdp, int *old_rg_count) osi_list_del(head->next); } /* Issue a discard ioctl for the new portion */ - rl = osi_list_entry(&sdp->rglist.next, struct rgrp_list, list); + rl = osi_list_entry(sdp->rglist.next, struct rgrp_list, list); discard_blocks(sdp->device_fd, rl->start * sdp->bsize, (sdp->device.length - rl->start) * sdp->bsize); /* Build the remaining resource groups */

1 0

cluster: STABLE31 - cman: Minor fixes for checkquorum script
by Chris Feist 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=27… Commit: 27e711a03024fc685df7502032947a482341821c Parent: 753b6c506ed7caa8e39e5dcac676223378ccfbe2 Author: Chris Feist <cfeist(a)redhat.com> AuthorDate: Tue Feb 1 15:06:36 2011 -0600 Committer: Chris Feist <cfeist(a)redhat.com> CommitterDate: Tue Feb 1 15:06:36 2011 -0600 cman: Minor fixes for checkquorum script Remove all references to self-fencing Removed absolute path the binaries in checkquorum Added missing uninstall information for SHAREDIRTEX --- cman/scripts/checkquorum | 14 +++++++------- make/uninstall.mk | 3 +++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/cman/scripts/checkquorum b/cman/scripts/checkquorum index 43cbc6d..61934cd 100755 --- a/cman/scripts/checkquorum +++ b/cman/scripts/checkquorum @@ -26,14 +26,14 @@ if (($#ARGV != -1) && ($ARGV[0] eq "repair")) { if (!quorum()) { if (has_quorum_already_been_formed()) { - debug("Quorum has already existed, node can be self fenced!\n"); + debug("Quorum has already existed, node can be rebooted!\n"); if (-e $timerfile) { $tf = open (FILE, "$timerfile"); $time = <FILE>; close (FILE); $timediff = time() - $time; if ($timediff >= $wait_time) { - self_fence() + reboot() } else { $remaining = $wait_time - $timediff; debug("Time has not exceeded wait time ($remaining seconds remaining).\n"); @@ -45,16 +45,16 @@ if (!quorum()) { close (FILE); } } else { - debug("This is a new startup no self-fencing will occur.\n"); + debug("This is a new startup no reboot will occur.\n"); `rm -f $timerfile`; } } else { - debug("Quorum exists, no self-fencing should occur.\n"); + debug("Quorum exists, no reboot should occur.\n"); `rm -f $timerfile`; } sub has_quorum_already_been_formed { - $oe = `/usr/sbin/corosync-objctl 2>&1 | grep -E "runtime.totem.pg.mrp.srp.operational_entered|Could not initialize objdb library|Cannot connect to quorum service" `; + $oe = `corosync-objctl 2>&1 | grep -E "runtime.totem.pg.mrp.srp.operational_entered|Could not initialize objdb library|Cannot connect to quorum service" `; if ($oe =~ /^Could not/ || $oe =~ /^Cannot/) { debug("corosync is not running\n"); exit 0; @@ -79,8 +79,8 @@ sub quorum { return 0; } -sub self_fence { - debug("Self fencing commencing...\n"); +sub reboot { + debug("Reboot commencing...\n"); `rm -f $timerfile`; if ($hardreboot == 1) { `echo 1 > /proc/sys/kernel/sysrq`; diff --git a/make/uninstall.mk b/make/uninstall.mk index 8440187..01e8d2d 100644 --- a/make/uninstall.mk +++ b/make/uninstall.mk @@ -38,6 +38,9 @@ endif ifdef PKGCONF ${UNINSTALL} ${PKGCONF} ${pkgconfigdir} endif +ifdef SHAREDIRTEX + ${UNINSTALL} ${SHAREDIRTEX} ${sharedir} +endif ifdef SHAREDIRT ${UNINSTALL} ${SHAREDIRT} ${sharedir} endif

1 0

cluster: STABLE31 - cman: Added checkquorum script for self fencing
by Chris Feist 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=75… Commit: 753b6c506ed7caa8e39e5dcac676223378ccfbe2 Parent: 8cb4fbc7e7ffc16cfffcc1a14a3253830a77f69d Author: Chris Feist <cfeist(a)redhat.com> AuthorDate: Tue Feb 1 14:15:04 2011 -0600 Committer: Chris Feist <cfeist(a)redhat.com> CommitterDate: Tue Feb 1 14:20:52 2011 -0600 cman: Added checkquorum script for self fencing A checkquorum script has been added which when copied to the /etc/watchdog.d directory will cause the machine to node to reboot itself if it has lost quorum for ~60 seconds. Resolves: rhbz#560700 --- cman/Makefile | 2 +- cman/man/Makefile | 3 +- cman/man/checkquorum.8 | 29 ++++++++++++++ cman/scripts/Makefile | 10 +++++ cman/scripts/checkquorum | 97 ++++++++++++++++++++++++++++++++++++++++++++++ make/install.mk | 4 ++ 6 files changed, 143 insertions(+), 2 deletions(-) diff --git a/cman/Makefile b/cman/Makefile index ead0baa..1cf8bc9 100644 --- a/cman/Makefile +++ b/cman/Makefile @@ -1,4 +1,4 @@ include ../make/defines.mk include $(OBJDIR)/make/passthrough.mk -SUBDIRS=lib cman_tool daemon qdisk notifyd init.d man +SUBDIRS=lib cman_tool daemon qdisk notifyd init.d man scripts diff --git a/cman/man/Makefile b/cman/man/Makefile index df20abb..f7fbebf 100644 --- a/cman/man/Makefile +++ b/cman/man/Makefile @@ -5,7 +5,8 @@ MANTARGET= \ qdiskd.8 \ mkqdisk.8 \ cmannotifyd.8 \ - cman_notify.8 + cman_notify.8 \ + checkquorum.8 include ../../make/defines.mk include $(OBJDIR)/make/install.mk diff --git a/cman/man/checkquorum.8 b/cman/man/checkquorum.8 new file mode 100644 index 0000000..96f61f0 --- /dev/null +++ b/cman/man/checkquorum.8 @@ -0,0 +1,29 @@ +.TH "checkquorum" "8" "February 2011" "" "Check Quorum Watchdog Script" +.SH "NAME" +checkquorum \- Check Quorum Watchdog Script +.SH "SYNOPSIS" +\fBcheckquorum +.SH "DESCRIPTION" +.PP +The \fBcheckquorum\fP watchdog script, when copied to the +.IR /etc/watchdog.d +directory and after enabling/starting the watchdog daemon causes the node to reboot if quorum is +lost and not regained within a user configurable amount of time (default: 60 seconds). +.SH "OPTIONS" +The checkquorum script includes several options which can be set by editing +the script with a text editor. +.TP +.BR $wait_time +Amount of time in seconds to wait after quorum is lost before trigger a reboot +(Default: 60 seconds). +.TP +.BR $hardreboot +Instantly reboot the machine without cleanly shutting down the system. +Useful when the machine may hang on reboot. Set to 1 to hard reboot the +system, 0 to do a normal reboot. +.SH "NOTES" +\fBcheckquorum\fP should never be called outside of watchdog except for +debugging purposes. + +.SH "SEE ALSO" +watchdog(8) diff --git a/cman/scripts/Makefile b/cman/scripts/Makefile new file mode 100644 index 0000000..b4866c8 --- /dev/null +++ b/cman/scripts/Makefile @@ -0,0 +1,10 @@ +SHAREDIRTEX=checkquorum + +include ../../make/defines.mk +include $(OBJDIR)/make/clean.mk +include $(OBJDIR)/make/install.mk +include $(OBJDIR)/make/uninstall.mk + +all: + +clean: generalclean diff --git a/cman/scripts/checkquorum b/cman/scripts/checkquorum new file mode 100755 index 0000000..43cbc6d --- /dev/null +++ b/cman/scripts/checkquorum @@ -0,0 +1,97 @@ +#!/usr/bin/perl -w +# Quorum detection watchdog script +# +# This script will return -2 if the node had quorum at one point +# and then subsequently lost it +# +# Copyright 2011 Red Hat, Inc. + +# Amount of time in seconds to wait after quorum is lost to fail script +$wait_time = 60; + +# Hard Reboot the system (doesn't cleanly shut down the system) +$hardreboot = 0; + +# Location of temporary file to capture timeouts +$timerfile = "/var/run/cluster/checkquorum-timer"; + +# Enable debug messages (0 to disable, 1 to enable) +$debugval = 0; + +# If command is called attempting to 'repair' we automatically fail +if (($#ARGV != -1) && ($ARGV[0] eq "repair")) { + debug ("Failing on repair\n"); + exit 1; +} + +if (!quorum()) { + if (has_quorum_already_been_formed()) { + debug("Quorum has already existed, node can be self fenced!\n"); + if (-e $timerfile) { + $tf = open (FILE, "$timerfile"); + $time = <FILE>; + close (FILE); + $timediff = time() - $time; + if ($timediff >= $wait_time) { + self_fence() + } else { + $remaining = $wait_time - $timediff; + debug("Time has not exceeded wait time ($remaining seconds remaining).\n"); + } + } else { + debug("Creating timer file...\n"); + $tf = open (FILE, ">$timerfile"); + print FILE time(); + close (FILE); + } + } else { + debug("This is a new startup no self-fencing will occur.\n"); + `rm -f $timerfile`; + } +} else { + debug("Quorum exists, no self-fencing should occur.\n"); + `rm -f $timerfile`; +} + +sub has_quorum_already_been_formed { + $oe = `/usr/sbin/corosync-objctl 2>&1 | grep -E "runtime.totem.pg.mrp.srp.operational_entered|Could not initialize objdb library|Cannot connect to quorum service" `; + if ($oe =~ /^Could not/ || $oe =~ /^Cannot/) { + debug("corosync is not running\n"); + exit 0; + } + $oe =~ s/.*=//; + if ($oe > 1) { + return 1; + } else { + return 0; + } +} + +sub quorum { + $cq = `corosync-quorumtool -s 2>&1 | grep -E "Quorate:|Cannot connect to quorum service"`; + if ($cq =~ /Cannot connect to quorum service/) { + debug("corosync is not running\n"); + exit 0; + } + $cq =~ s/Quorate: *//; + chomp ($cq); + return 1 if ($cq eq "Yes"); + return 0; +} + +sub self_fence { + debug("Self fencing commencing...\n"); + `rm -f $timerfile`; + if ($hardreboot == 1) { + `echo 1 > /proc/sys/kernel/sysrq`; + `echo b > /proc/sysrq-trigger`; + } + exit -2; +} + +sub debug { + $out = pop(@_); + if ($debugval) { + print $out; + } +} diff --git a/make/install.mk b/make/install.mk index 3f23bca..fa6ac92 100644 --- a/make/install.mk +++ b/make/install.mk @@ -66,6 +66,10 @@ ifdef PKGCONF install -d ${pkgconfigdir} install -m644 ${PKGCONF} ${pkgconfigdir} endif +ifdef SHAREDIRTEX + install -d ${sharedir} + install -m755 ${SHAREDIRTEX} ${sharedir} +endif ifdef SHAREDIRT install -d ${sharedir} install -m644 ${SHAREDIRT} ${sharedir}

1 0

cluster: RHEL6 - rgmanager: Fix corner case in critical/non-critical handling
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d1… Commit: d100504de6eff5f83dba79319ad0bd560f7a57df Parent: c7187470032d2ab7c32a6a3ae43a358e1a99656b Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Fri Sep 24 16:45:29 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:34:35 2011 -0500 rgmanager: Fix corner case in critical/non-critical handling If a subtree had failed and you removed __independent_subtree from the configuration for that subtree as part of a reconfiguration operation, the subtree would fail to stop, causing the service to enter the failed state. Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/restree.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index 55cc146..9652c6e 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -1596,8 +1596,8 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, assert(node->rn_resource->r_incarnations >= 0); if (node->rn_resource->r_incarnations > 0) --node->rn_resource->r_incarnations; - } else if (node->rn_state != RES_DISABLED && - !(node->rn_flags & RF_QUIESCE)) { + } else if (rv != 0 && (node->rn_state != RES_DISABLED && + !(node->rn_flags & RF_QUIESCE))) { node->rn_state = RES_FAILED; pthread_mutex_unlock(&node->rn_resource->r_mutex); return SFL_FAILURE;

1 0

cluster: RHEL6 - rgmanager: clean up independent subtree restart handling
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c7… Commit: c7187470032d2ab7c32a6a3ae43a358e1a99656b Parent: 0ffd512aea6ed74ed0127284d0112bcbffa33061 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Tue Sep 14 10:10:05 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:34:22 2011 -0500 rgmanager: clean up independent subtree restart handling Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/restree.c | 28 ++++++++++++++++------------ rgmanager/src/daemons/rg_state.c | 11 +++++++---- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index 30c7179..55cc146 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -509,9 +509,6 @@ assign_restart_policy(resource_t *curres, resource_node_t *parent, if (max_restarts <= 0) max_restarts = 0; free(val); - - if (!max_restarts) - return; } snprintf(tok, sizeof(tok), "%s/@__restart_expire_time", base); @@ -521,11 +518,13 @@ assign_restart_policy(resource_t *curres, resource_node_t *parent, if (conf_get(tok, &val) == 0) { #endif restart_expire_time = (time_t)expand_time(val); - if ((int64_t)restart_expire_time < 0) + if ((int64_t)restart_expire_time <= 0) restart_expire_time = 0; free(val); } + if (restart_expire_time == 0 || max_restarts == 0) + return; goto out_assign; } @@ -1511,7 +1510,8 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, RF_NEEDSTOP | RF_QUIESCE, 0); restart_clear(node->rn_restart_counter); return SFL_RECOVERABLE|SFL_PARTIAL; - } else if (!rte) { + } else if (!rte || + !node->rn_restart_counter) { restart_add(node->rn_restart_counter); mark_nodes(node, RES_FAILED, RF_NEEDSTART | RF_NEEDSTOP, 0); @@ -1552,7 +1552,7 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, mark_nodes(node, RES_FAILED, RF_NEEDSTOP | RF_QUIESCE, 0); rv |= SFL_PARTIAL; - } else if (!rte) { + } else if (!rte || !node->rn_restart_counter) { restart_add(node->rn_restart_counter); mark_nodes(node, RES_FAILED, RF_NEEDSTOP | RF_NEEDSTART, 0); @@ -1573,18 +1573,21 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, node->rn_flags &= ~RF_NEEDSTOP; rv |= res_exec(node, op, NULL, 0); - if (node->rn_flags & RF_QUIESCE) { + if (node->rn_flags & (RF_NEEDSTART|RF_QUIESCE) && + node->rn_flags & RF_INDEPENDENT && + node->rn_flags & RF_NON_CRITICAL) { /* Non-critical resources = do not fail * service if the resource fails to stop */ if (rv & SFL_FAILURE) { - logt_print(LOG_WARNING, "Failure to stop %s:%s" + logt_print(LOG_WARNING, "Failed to stop subtree %s:%s" " during non-critical recovery " "operation\n", node->rn_resource->r_rule->rr_type, primary_attr_value( node->rn_resource)); - rv &= ~SFL_FAILURE; + rv = SFL_PARTIAL; + node->rn_flags |= RF_QUIESCE; } } @@ -1593,7 +1596,8 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, assert(node->rn_resource->r_incarnations >= 0); if (node->rn_resource->r_incarnations > 0) --node->rn_resource->r_incarnations; - } else if (node->rn_state != RES_DISABLED) { + } else if (node->rn_state != RES_DISABLED && + !(node->rn_flags & RF_QUIESCE)) { node->rn_state = RES_FAILED; pthread_mutex_unlock(&node->rn_resource->r_mutex); return SFL_FAILURE; @@ -1601,8 +1605,8 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, pthread_mutex_unlock(&node->rn_resource->r_mutex); if (node->rn_flags & RF_QUIESCE) { - node->rn_flags &= ~RF_QUIESCE; - node->rn_state = RES_DISABLED; + mark_nodes(node, RES_DISABLED, 0, + RF_NEEDSTART|RF_QUIESCE); } else { node->rn_state = RES_STOPPED; } diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index 9328a88..babac7a 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -1248,17 +1248,20 @@ handle_started_status(const char *svcName, int ret, "Attempting inline recovery\n", svcName); ret2 = group_op(svcName, RG_CONDSTOP); - if (!(ret2 & SFL_FAILURE)) { - ret2 = group_op(svcName, RG_CONDSTART); + if (ret2 & SFL_PARTIAL) { + ret |= SFL_PARTIAL; + ret2 &= ~SFL_PARTIAL; } - if (ret2) { + if (!(ret2 & SFL_FAILURE)) { + ret2 = group_op(svcName, RG_CONDSTART); + } else { logt_print(LOG_WARNING, "Inline recovery of %s failed\n", svcName); return ret; } - logt_print(LOG_NOTICE, "Inline recovery of %s succeeded\n", + logt_print(LOG_NOTICE, "Inline recovery of %s complete\n", svcName); if (ret & SFL_PARTIAL) { logt_print(LOG_NOTICE, "Note: Some non-critical "

1 0

cluster: RHEL6 - rgmanager: Add failure tolerances to resources.rng
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0f… Commit: 0ffd512aea6ed74ed0127284d0112bcbffa33061 Parent: d11004237d32ef094cf515e9215be2430723dacf Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Fri Sep 10 15:12:08 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:33:27 2011 -0500 rgmanager: Add failure tolerances to resources.rng Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/ra2rng.xsl | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/rgmanager/src/resources/ra2rng.xsl b/rgmanager/src/resources/ra2rng.xsl index 425faa9..11782d7 100644 --- a/rgmanager/src/resources/ra2rng.xsl +++ b/rgmanager/src/resources/ra2rng.xsl @@ -39,6 +39,12 @@ <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/> </optional> <optional> + <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/> + </optional> + <optional> + <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/> + </optional> + <optional> <ref name="CHILDREN"/> </optional> </element>

1 0

cluster: RHEL6 - rgmanager: Add independent subtree restart thresholds
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d1… Commit: d11004237d32ef094cf515e9215be2430723dacf Parent: 4e2261f72411aae2604d9d3b771f221b11ef4b6b Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Fri Sep 10 14:45:15 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:33:04 2011 -0500 rgmanager: Add independent subtree restart thresholds __max_restarts => number of restarts to tolerate __restart_expire_time => in the amount of time given here __independent_subtree="1": - after threshold is exceeded for the subtree, restart the service - if no threshold, never restart the service __independent_subtree="2" - after threshold is exceeded for the subtree, stop the subtree - if no threshold, stop the subtree on first failure Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/restree.c | 95 ++++++++++++++++++++++++++++++++------- 1 files changed, 79 insertions(+), 16 deletions(-) diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index 8719791..30c7179 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -482,19 +482,53 @@ res_exec(resource_node_t *node, int op, const char *arg, int depth) static inline void assign_restart_policy(resource_t *curres, resource_node_t *parent, - resource_node_t *node) + resource_node_t *node, int ccsfd, char *base) { char *val; int max_restarts = 0; time_t restart_expire_time = 0; + char tok[1024]; node->rn_restart_counter = NULL; if (!curres || !node) return; - if (parent) /* Non-parents don't get one for now */ + if (parent && + !(node->rn_flags & RF_INDEPENDENT)) return; + if (node->rn_flags & RF_INDEPENDENT) { + /* per-resource-node failures / expire times */ + snprintf(tok, sizeof(tok), "%s/@__max_restarts", base); +#ifndef NO_CCS + if (ccs_get(ccsfd, tok, &val) == 0) { +#else + if (conf_get(tok, &val) == 0) { +#endif + max_restarts = atoi(val); + if (max_restarts <= 0) + max_restarts = 0; + free(val); + + if (!max_restarts) + return; + } + + snprintf(tok, sizeof(tok), "%s/@__restart_expire_time", base); +#ifndef NO_CCS + if (ccs_get(ccsfd, tok, &val) == 0) { +#else + if (conf_get(tok, &val) == 0) { +#endif + restart_expire_time = (time_t)expand_time(val); + if ((int64_t)restart_expire_time < 0) + restart_expire_time = 0; + free(val); + } + + goto out_assign; + } + val = (char *)res_attr_value(curres, "max_restarts"); if (!val) return; @@ -508,6 +542,7 @@ assign_restart_policy(resource_t *curres, resource_node_t *parent, return; } +out_assign: node->rn_restart_counter = restart_init(restart_expire_time, max_restarts); } @@ -597,20 +632,25 @@ do_load_resource(int ccsfd, char *base, node->rn_state = RES_STOPPED; node->rn_flags = 0; node->rn_actions = (resource_act_t *)act_dup(curres->r_actions); - assign_restart_policy(curres, parent, node); - snprintf(tok, sizeof(tok), "%s/@__independent_subtree", base); + + if (parent) { + /* Independent subtree / non-critical for top-level is + * not useful and can interfere with restart thresholds for + * non critical resources */ + snprintf(tok, sizeof(tok), "%s/@__independent_subtree", base); #ifndef NO_CCS - if (ccs_get(ccsfd, tok, &ref) == 0) { + if (ccs_get(ccsfd, tok, &ref) == 0) { #else - if (conf_get(tok, &ref) == 0) { + if (conf_get(tok, &ref) == 0) { #endif - if (atoi(ref) == 1 || strcasecmp(ref, "yes") == 0) - node->rn_flags |= RF_INDEPENDENT; - if (atoi(ref) == 2 || strcasecmp(ref, "non-critical") == 0) { - curres->r_flags |= RF_NON_CRITICAL; + if (atoi(ref) == 1 || strcasecmp(ref, "yes") == 0) + node->rn_flags |= RF_INDEPENDENT; + if (atoi(ref) == 2 || strcasecmp(ref, "non-critical") == 0) { + curres->r_flags |= RF_NON_CRITICAL; + } + free(ref); } - free(ref); } snprintf(tok, sizeof(tok), "%s/@__enforce_timeouts", base); @@ -668,8 +708,11 @@ do_load_resource(int ccsfd, char *base, * resource is non-critical */ node->rn_flags |= RF_NON_CRITICAL | RF_INDEPENDENT; + } + assign_restart_policy(curres, parent, node, ccsfd, base); + *newnode = node; list_insert(tree, node); @@ -1337,7 +1380,7 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, char *type, void *__attribute__((unused))ret, int realop, resource_node_t *node) { - int rv = 0, me, op; + int rv = 0, me, op, rte = 0; /* Restore default operation. */ op = realop; @@ -1403,6 +1446,10 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, /* Nothing to do - children are also disabled */ return 0; + if ((realop == RS_START || realop == RS_CONVALESCE) && + node->rn_flags & RF_INDEPENDENT) + restart_clear(node->rn_restart_counter); + pthread_mutex_lock(&node->rn_resource->r_mutex); if (node->rn_flags & RF_RECONFIG && @@ -1456,14 +1503,22 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, resources of this node must be restarted, but siblings of this node are not affected. */ if (node->rn_flags & RF_INDEPENDENT) { - if (node->rn_flags & RF_NON_CRITICAL) { + + rte = restart_threshold_exceeded(node->rn_restart_counter); + if ((node->rn_flags & RF_NON_CRITICAL) && (rte || + !node->rn_restart_counter)) { mark_nodes(node, RES_FAILED, RF_NEEDSTOP | RF_QUIESCE, 0); + restart_clear(node->rn_restart_counter); return SFL_RECOVERABLE|SFL_PARTIAL; - } else { + } else if (!rte) { + restart_add(node->rn_restart_counter); mark_nodes(node, RES_FAILED, RF_NEEDSTART | RF_NEEDSTOP, 0); return SFL_RECOVERABLE; + } else { + restart_clear(node->rn_restart_counter); + return SFL_FAILURE; } } @@ -1487,15 +1542,23 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, the resource tree. */ if (op == RS_STATUS && (rv & (SFL_FAILURE|SFL_RECOVERABLE)) && (node->rn_flags & RF_INDEPENDENT)) { + + rte = restart_threshold_exceeded(node->rn_restart_counter); + rv = SFL_RECOVERABLE; - if (node->rn_flags & RF_NON_CRITICAL) { + if ((node->rn_flags & RF_NON_CRITICAL) && (rte || + !node->rn_restart_counter)) { /* if non-critical, just stop */ mark_nodes(node, RES_FAILED, RF_NEEDSTOP | RF_QUIESCE, 0); rv |= SFL_PARTIAL; - } else { + } else if (!rte) { + restart_add(node->rn_restart_counter); mark_nodes(node, RES_FAILED, RF_NEEDSTOP | RF_NEEDSTART, 0); + } else { + restart_clear(node->rn_restart_counter); + rv = SFL_FAILURE; } } }

1 0

cluster: RHEL6 - rgmanager: Add -c option to man page & clusvcadm -h
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4e… Commit: 4e2261f72411aae2604d9d3b771f221b11ef4b6b Parent: 3b03b46fe7d3c7d747db9a2b7721cc56aef458f2 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Fri Sep 10 11:49:10 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:32:49 2011 -0500 rgmanager: Add -c option to man page & clusvcadm -h Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/man/clusvcadm.8 | 9 +++++++++ rgmanager/src/utils/clusvcadm.c | 3 +++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/rgmanager/man/clusvcadm.8 b/rgmanager/man/clusvcadm.8 index d1435ef..d5e09eb 100644 --- a/rgmanager/man/clusvcadm.8 +++ b/rgmanager/man/clusvcadm.8 @@ -33,6 +33,9 @@ clusvcadm \- Cluster User Service Administration Utility .B [\-s .I <service> .B ] +.B [\-c +.I <service> +.B ] .B [\-v] .SH "DESCRIPTION" @@ -117,6 +120,12 @@ Stops the service named service until a member transition or until it is enabled again. +.IP "\-c <service>" +Attempt to convalesce the named +.I +service +by restarting failed, non-critical components. + .IP \-v Display version information and exit. diff --git a/rgmanager/src/utils/clusvcadm.c b/rgmanager/src/utils/clusvcadm.c index bd0723f..8d0b502 100644 --- a/rgmanager/src/utils/clusvcadm.c +++ b/rgmanager/src/utils/clusvcadm.c @@ -167,6 +167,9 @@ printf(" -Z <group> Freeze resource group. This prevents\n" " stopping the whole service.\n"); printf(" -U <group> Unfreeze (thaw) resource group. Restores\n" " a group to normal operation.\n"); +printf(" -c <group> Convalesce (repair, fix) resource group.\n" + " Attempts to start failed, non-critical \n" + " resources within a resource group.\n"); printf("Resource Group Locking (for cluster Shutdown / Debugging):\n"); printf(" -l Lock local resource group managers.\n"

1 0

cluster: RHEL6 - rgmanager: Support convalesce w/ central_processing
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=3b… Commit: 3b03b46fe7d3c7d747db9a2b7721cc56aef458f2 Parent: c2fa8fe7c8f2a3cbf1023a170f3f78a8de559b7a Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Thu Sep 9 10:58:17 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:32:31 2011 -0500 rgmanager: Support convalesce w/ central_processing Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/include/event.h | 1 + rgmanager/src/daemons/service_op.c | 84 +++++++++++++++++++++++ rgmanager/src/daemons/slang_event.c | 18 +++++- rgmanager/src/resources/default_event_script.sl | 4 + 4 files changed, 106 insertions(+), 1 deletions(-) diff --git a/rgmanager/include/event.h b/rgmanager/include/event.h index a9a8235..ad3fe39 100644 --- a/rgmanager/include/event.h +++ b/rgmanager/include/event.h @@ -124,6 +124,7 @@ void set_transition_throttling(int nsecs); int service_op_start(char *svcName, int *target_list, int target_list_len, int *new_owner); int service_op_stop(char *svcName, int do_disable, int event_type); +int service_op_convalesce(const char *svcName); int service_op_migrate(char *svcName, int target_node); diff --git a/rgmanager/src/daemons/service_op.c b/rgmanager/src/daemons/service_op.c index 112b267..f094129 100644 --- a/rgmanager/src/daemons/service_op.c +++ b/rgmanager/src/daemons/service_op.c @@ -186,6 +186,90 @@ service_op_stop(char *svcName, int do_disable, int event_type) } +int +service_op_convalesce(const char *svcName) +{ + SmMessageSt msg; + int msg_ret; + msgctx_t ctx; + rg_state_t svcStatus; + int msgtarget = my_id(); + + /* Build the message header */ + msg.sm_hdr.gh_magic = GENERIC_HDR_MAGIC; + msg.sm_hdr.gh_command = RG_ACTION_REQUEST; + msg.sm_hdr.gh_arg1 = RG_ACTION_MASTER; + msg.sm_hdr.gh_length = sizeof (SmMessageSt); + + msg.sm_data.d_action = RG_CONVALESCE; + + strncpy(msg.sm_data.d_svcName, svcName, + sizeof(msg.sm_data.d_svcName)); + msg.sm_data.d_ret = 0; + msg.sm_data.d_svcOwner = 0; + + /* Open a connection to the local node - it will decide what to + do in this case. XXX inefficient; should queue requests + locally and immediately forward requests otherwise */ + + if (get_service_state_internal(svcName, &svcStatus) < 0) + return RG_EFAIL; + if (svcStatus.rs_owner > 0) { + if (member_online(svcStatus.rs_owner)) { + msgtarget = svcStatus.rs_owner; + } else { + /* If the owner is not online, + mark the service as 'stopped' but + otherwise, do nothing. + */ + return svc_stop(svcName, RG_STOP); + } + } + + if (msg_open(MSG_CLUSTER, msgtarget, RG_PORT, &ctx, 2 * cluster_timeout)< 0) { + logt_print(LOG_ERR, + "#58: Failed opening connection to member #%d\n", + my_id()); + return -1; + } + + /* Encode */ + swab_SmMessageSt(&msg); + + /* Send stop message to the other node */ + if (msg_send(&ctx, &msg, sizeof (SmMessageSt)) < + (int)sizeof (SmMessageSt)) { + logt_print(LOG_ERR, "Failed to send complete message\n"); + msg_close(&ctx); + return -1; + } + + /* Check the response */ + do { + msg_ret = msg_receive(&ctx, &msg, + sizeof (SmMessageSt), 10); + if ((msg_ret == -1 && errno != ETIMEDOUT) || + (msg_ret > 0)) { + break; + } + } while(1); + + if (msg_ret != sizeof (SmMessageSt)) { + logt_print(LOG_WARNING, "Strange response size: %d vs %d\n", + msg_ret, (int)sizeof(SmMessageSt)); + return 0; /* XXX really UNKNOWN */ + } + + /* Got a valid response from other node. */ + msg_close(&ctx); + + /* Decode */ + swab_SmMessageSt(&msg); + + return msg.sm_data.d_ret; +} + + /* service_op_migrate() - send a virtual machine to another host in the cluster diff --git a/rgmanager/src/daemons/slang_event.c b/rgmanager/src/daemons/slang_event.c index 55f0341..0b9f0d0 100644 --- a/rgmanager/src/daemons/slang_event.c +++ b/rgmanager/src/daemons/slang_event.c @@ -86,7 +86,8 @@ static int _user_restart = RG_RESTART, _user_migrate = RG_MIGRATE, _user_freeze = RG_FREEZE, - _user_unfreeze = RG_UNFREEZE; + _user_unfreeze = RG_UNFREEZE, + _user_convalesce = RG_CONVALESCE; SLang_Intrin_Var_Type rgmanager_vars[] = @@ -139,6 +140,7 @@ SLang_Intrin_Var_Type rgmanager_vars[] = MAKE_VARIABLE((char *)"USER_MIGRATE", &_user_migrate, SLANG_INT_TYPE, 1), MAKE_VARIABLE((char *)"USER_FREEZE", &_user_freeze, SLANG_INT_TYPE, 1), MAKE_VARIABLE((char *)"USER_UNFREEZE", &_user_unfreeze,SLANG_INT_TYPE, 1), + MAKE_VARIABLE((char *)"USER_CONVALESCE",&_user_convalesce,SLANG_INT_TYPE, 1), /* Errors */ MAKE_VARIABLE((char *)"rg_error", &_rg_err, SLANG_INT_TYPE, 1), @@ -444,6 +446,18 @@ sl_service_property(char *svcName, char *prop) /** usage: + service_convalesce(name); + */ +static int +sl_convalesce_service(const char *svcname) +{ + return service_op_convalesce(svcname); +} + + +/** + usage: + stop_service(name, disable_flag); */ static int @@ -1034,6 +1048,8 @@ static SLang_Intrin_Fun_Type rgmanager_slang[] = SLANG_VOID_TYPE), MAKE_INTRINSIC_0((char *)"service_stop", sl_stop_service, SLANG_INT_TYPE), + MAKE_INTRINSIC_S((char *)"service_convalesce", sl_convalesce_service, + SLANG_INT_TYPE), MAKE_INTRINSIC_0((char *)"service_start", sl_start_service, SLANG_INT_TYPE), MAKE_INTRINSIC_0((char *)"service_migrate", sl_migrate_service, diff --git a/rgmanager/src/resources/default_event_script.sl b/rgmanager/src/resources/default_event_script.sl index fad22ac..4eae767 100644 --- a/rgmanager/src/resources/default_event_script.sl +++ b/rgmanager/src/resources/default_event_script.sl @@ -597,6 +597,10 @@ define default_user_event_handler() ret = service_migrate(service_name, user_target); + } else if (user_request == USER_CONVALESCE) { + + ret = service_convalesce(service_name); + } return ret;

1 0

cluster: RHEL6 - rgmanager: Do not fail service if non-critical resources fail to stop
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c2… Commit: c2fa8fe7c8f2a3cbf1023a170f3f78a8de559b7a Parent: 109a4f729592e2f9039ec369df440cbb21a078c7 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Sep 8 16:20:19 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:32:16 2011 -0500 rgmanager: Do not fail service if non-critical resources fail to stop During non-critical component recovery (e.g. stop and leave dead), rgmanager stops parts up to the __independent_subtree="2" flag. If any stop operations fail during this phase, rgmanager should ignore them since the resources are non-critical. During a normal relocation/restart/enable/disable/etc, these operations are critical and a fail to stop will result in the service being placed in to the failed state. Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/restree.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index ab0e20d..8719791 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -1510,6 +1510,21 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, node->rn_flags &= ~RF_NEEDSTOP; rv |= res_exec(node, op, NULL, 0); + if (node->rn_flags & RF_QUIESCE) { + /* Non-critical resources = do not fail + * service if the resource fails to stop + */ + if (rv & SFL_FAILURE) { + logt_print(LOG_WARNING, "Failure to stop %s:%s" + " during non-critical recovery " + "operation\n", + node->rn_resource->r_rule->rr_type, + primary_attr_value( + node->rn_resource)); + rv &= ~SFL_FAILURE; + } + } + if (rv == 0 && (node->rn_state == RES_STARTED || node->rn_state == RES_FAILED)) { assert(node->rn_resource->r_incarnations >= 0);

1 0

cluster: RHEL6 - rgmanager: Fix handling of independent subtrees
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=10… Commit: 109a4f729592e2f9039ec369df440cbb21a078c7 Parent: c5db095bea06e76e021577bd56d2658f90ebbecc Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Sep 8 15:56:28 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:32:00 2011 -0500 rgmanager: Fix handling of independent subtrees Independent subtrees were not getting handled correctly in all cases. This prevented correct recovery (e.g. stop) of resources which failed when an ancestor was an independent subtree. Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/restree.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index e7866e2..ab0e20d 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -1149,8 +1149,8 @@ mark_nodes(resource_node_t *node, int state, int setflags, int clearflags) resource_node_t *child; list_for(&node->rn_child, child, x) { - if (child->rn_child) - mark_nodes(child->rn_child, state, setflags, + if (child) + mark_nodes(child, state, setflags, clearflags); } @@ -1375,7 +1375,7 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, printf("Node %s:%s - Convalesce\n", node->rn_resource->r_rule->rr_type, primary_attr_value(node->rn_resource)); - node->rn_state = RES_STOPPED; + mark_nodes(node, RES_STOPPED, RF_NEEDSTART, 0); op = RS_START; } @@ -1470,8 +1470,10 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, return SFL_FAILURE; } - if (node->rn_state != RES_DISABLED) - mark_nodes(node, RES_STARTED, 0, RF_NEEDSTOP); + if (node->rn_state != RES_DISABLED) { + node->rn_state = RES_STARTED; + node->rn_flags &= ~RF_NEEDSTOP; + } } if (node->rn_child) { @@ -1483,7 +1485,7 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, and all our children as failed and return a flag stating that this section is recoverable apart from siblings in the resource tree. */ - if (op == RS_STATUS && (rv & SFL_FAILURE) && + if (op == RS_STATUS && (rv & (SFL_FAILURE|SFL_RECOVERABLE)) && (node->rn_flags & RF_INDEPENDENT)) { rv = SFL_RECOVERABLE; if (node->rn_flags & RF_NON_CRITICAL) { @@ -1520,8 +1522,7 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, } pthread_mutex_unlock(&node->rn_resource->r_mutex); - if (node->rn_flags & RF_QUIESCE && - node->rn_flags & RF_NON_CRITICAL) { + if (node->rn_flags & RF_QUIESCE) { node->rn_flags &= ~RF_QUIESCE; node->rn_state = RES_DISABLED; } else {

1 0

cluster: RHEL6 - rgmanager: Ensure state is preserved across config changes
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c5… Commit: c5db095bea06e76e021577bd56d2658f90ebbecc Parent: 57232d8ad1dde6927a7d8cd267d1f3813e2bf0ca Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Sep 8 15:22:49 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:31:47 2011 -0500 rgmanager: Ensure state is preserved across config changes Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/restree.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index a5f27b8..e7866e2 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -1796,6 +1796,9 @@ resource_tree_delta(resource_node_t **ltree, resource_node_t **rtree) if (rc == 2) rn->rn_flags |= RF_NEEDSTART | RF_RECONFIG; + if (rc == 0) + rn->rn_state = ln->rn_state; + /* Ok, same resource. Recurse. */ ln->rn_flags |= RF_COMMON; rn->rn_flags |= RF_COMMON;

1 0

cluster: RHEL6 - rgmanager: Allow restart,disable recovery policy
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=57… Commit: 57232d8ad1dde6927a7d8cd267d1f3813e2bf0ca Parent: abe50ac2721ec8124aa2a614c2a0a05e4cfa3ad7 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Thu Sep 2 15:06:09 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:31:32 2011 -0500 rgmanager: Allow restart,disable recovery policy This policy allows administrators to allow rgmanager to start and monitor services where failover is not required. Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/rg_state.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index 9eb686f..9328a88 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -2220,6 +2220,13 @@ handle_recover_req(char *svcName, int *new_owner) /* Check restart counter/timer for this resource */ if (check_restart(svcName) > 0) { clear_restart(svcName); + + if (strstr(policy, "disable")) { + logt_print(LOG_NOTICE, + "Restart threshold for %s exceeded; " + "disabling\n", svcName); + return svc_disable(svcName); + } logt_print(LOG_NOTICE, "Restart threshold for %s exceeded; " "attempting to relocate\n", svcName); return handle_relocate_req(svcName, RG_START_RECOVER, -1,

1 0

cluster: RHEL6 - rgmanager: Add convalesce operation
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ab… Commit: abe50ac2721ec8124aa2a614c2a0a05e4cfa3ad7 Parent: b631ffdb818f7cf3512840dd99b8844aa230b03d Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Sep 1 15:24:22 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:31:11 2011 -0500 rgmanager: Add convalesce operation This option enables the administrator to repair a partially-failed service without affecting the rest of the service. Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/include/resgroup.h | 1 + rgmanager/include/reslist.h | 1 + rgmanager/src/clulib/rg_strings.c | 1 + rgmanager/src/daemons/groups.c | 3 + rgmanager/src/daemons/restree.c | 14 ++++ rgmanager/src/daemons/rg_state.c | 119 ++++++++++++++++++++++++++++++++++++- rgmanager/src/daemons/rg_thread.c | 20 ++++++ rgmanager/src/utils/clusvcadm.c | 7 ++- 8 files changed, 162 insertions(+), 4 deletions(-) diff --git a/rgmanager/include/resgroup.h b/rgmanager/include/resgroup.h index a0b6fc1..2e81eb9 100644 --- a/rgmanager/include/resgroup.h +++ b/rgmanager/include/resgroup.h @@ -157,6 +157,7 @@ int svc_disable(const char *svcName); int svc_fail(const char *svcName); int svc_freeze(const char *svcName); int svc_unfreeze(const char *svcName); +int svc_convalesce(const char *svcName); int svc_migrate(const char *svcName, int target); int svc_start_remote(const char *svcName, int request, uint32_t target); int svc_report_failure(const char *svcName); diff --git a/rgmanager/include/reslist.h b/rgmanager/include/reslist.h index a8acd8e..921c483 100644 --- a/rgmanager/include/reslist.h +++ b/rgmanager/include/reslist.h @@ -130,6 +130,7 @@ int res_start(resource_node_t **tree, resource_t *res, void *ret); int res_stop(resource_node_t **tree, resource_t *res, void *ret); int res_status(resource_node_t **tree, resource_t *res, void *ret); int res_status_inquiry(resource_node_t **tree, resource_t *res, void *ret); +int res_convalesce(resource_node_t **tree, resource_t *res, void *ret); int res_condstart(resource_node_t **tree, resource_t *res, void *ret); int res_condstop(resource_node_t **tree, resource_t *res, void *ret); int res_exec(resource_node_t *node, int op, const char *arg, int depth); diff --git a/rgmanager/src/clulib/rg_strings.c b/rgmanager/src/clulib/rg_strings.c index fdb1dad..b0cd184 100644 --- a/rgmanager/src/clulib/rg_strings.c +++ b/rgmanager/src/clulib/rg_strings.c @@ -58,6 +58,7 @@ const struct string_val rg_req_strings[] = { {RG_QUERY_LOCK, "lock status inquiry"}, {RG_MIGRATE, "migrate"}, {RG_STATUS_INQUIRY, "out of band service status inquiry"}, + {RG_CONVALESCE, "convalesce"}, {RG_NONE, "none"}, {0, NULL} }; diff --git a/rgmanager/src/daemons/groups.c b/rgmanager/src/daemons/groups.c index afce054..1d3c518 100644 --- a/rgmanager/src/daemons/groups.c +++ b/rgmanager/src/daemons/groups.c @@ -975,6 +975,9 @@ group_op(const char *groupname, int op) case RG_CONDSTART: ret = res_condstart(&_tree, res, NULL); break; + case RG_CONVALESCE: + ret = res_convalesce(&_tree, res, NULL); + break; } pthread_rwlock_unlock(&resource_lock); diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index a717376..a5f27b8 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -1615,6 +1615,20 @@ res_condstop(resource_node_t **tree, resource_t *res, void *ret) /** + Repair/fix/convalesce all occurrences of a resource in a tree + + @param tree Tree to search for our resource. + @param res Resource to start/stop + @param ret Unused + */ +int +res_convalesce(resource_node_t **tree, resource_t *res, void *ret) +{ + return _res_op(tree, res, NULL, ret, RS_CONVALESCE); +} + + +/** Start all occurrences of a resource in a tree @param tree Tree to search for our resource. diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index 9049a7c..9eb686f 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -803,6 +803,92 @@ svc_start(const char *svcName, int req) /** + * Fix stuff + */ +int +svc_convalesce(const char *svcName) +{ + struct dlm_lksb lockp; + rg_state_t svcStatus; + int ret; + + if (rg_lock(svcName, &lockp) < 0) { + logt_print(LOG_ERR, "#451: Unable to obtain cluster lock: %s\n", + strerror(errno)); + return RG_EFAIL; + } + + if (get_rg_state(svcName, &svcStatus) != 0) { + rg_unlock(&lockp); + logt_print(LOG_ERR, "#461: Failed getting status for RG %s\n", + svcName); + return RG_EFAIL; + } + + switch(svcStatus.rs_state) { + case RG_STATE_STARTED: + break; + case RG_STATE_STARTING: + case RG_STATE_STOPPING: + case RG_STATE_RECOVER: + case RG_STATE_MIGRATE: + case RG_STATE_ERROR: + rg_unlock(&lockp); + return RG_EAGAIN; + default: + rg_unlock(&lockp); + return RG_EINVAL; + } + + if (svcStatus.rs_flags & RG_FLAG_FROZEN) { + rg_unlock(&lockp); + return RG_EFROZEN; + } + + if (svcStatus.rs_owner != (uint32_t)my_id()) { + rg_unlock(&lockp); + return RG_EFORWARD; + } + + if (!(svcStatus.rs_flags & RG_FLAG_PARTIAL)) { + rg_unlock(&lockp); + return RG_ERUN; + } + + rg_unlock(&lockp); + + logt_print(LOG_INFO, "Repairing %s\n", svcName); + ret = group_op(svcName, RG_CONVALESCE); + + switch(ret) { + default: + logt_print(LOG_WARNING, "Failed to repair %s\n", svcName); + /* Fail to restart a non-critical resource + * does not fail the service. */ + return RG_EFAIL; + case 0: + logt_print(LOG_INFO, "Repair of %s was successful\n", svcName); + break; + } + + /* Success - flip owner in state info */ + if (rg_lock(svcName, &lockp) < 0) { + logt_print(LOG_ERR, "#455: Unable to obtain cluster lock: %s\n", + strerror(errno)); + return RG_EFAIL; + } + + /* No need for a 'get' here since the service is still STARTED */ + svcStatus.rs_flags &= ~RG_FLAG_PARTIAL; + + set_rg_state(svcName, &svcStatus); + rg_unlock(&lockp); + + return 0; +} + + +/** * Migrate a service to another node. Relies on agent * operating synchronously */ @@ -1111,8 +1197,31 @@ svc_status(const char *svcName) } /* For running services, if the return code is 0, we're done*/ - if (svcStatus.rs_state == RG_STATE_STARTED) - return handle_started_status(svcName, ret, &svcStatus); + if (svcStatus.rs_state == RG_STATE_STARTED) { + ret = handle_started_status(svcName, ret, &svcStatus); + + if (ret & SFL_PARTIAL) { + ret &= ~SFL_PARTIAL; + svcStatus.rs_flags |= RG_FLAG_PARTIAL; + if (rg_lock(svcName, &lockp) < 0) { + logt_print(LOG_ERR, + "#481: Unable to obtain cluster lock: %s\n", + strerror(errno)); + return RG_EFAIL; + } + + if (set_rg_state(svcName, &svcStatus) != 0) { + rg_unlock(&lockp); + logt_print(LOG_ERR, + "#482: Failed setting status for RG %s\n", + svcName); + return RG_EFAIL; + } + rg_unlock(&lockp); + } + + return ret; + } return handle_migrate_status(svcName, ret, &svcStatus); } @@ -1153,9 +1262,10 @@ handle_started_status(const char *svcName, int ret, svcName); if (ret & SFL_PARTIAL) { logt_print(LOG_NOTICE, "Note: Some non-critical " - "resources are still stopped.\n"); + "resources were stopped during recovery.\n"); logt_print(LOG_NOTICE, "Run 'clusvcadm -c %s' to " "restore them to operation.\n", svcName); + return SFL_PARTIAL; } return 0; @@ -1262,6 +1372,7 @@ _svc_stop(const char *svcName, int req, int recover, uint32_t newstate) svcStatus.rs_last_owner = svcStatus.rs_owner; svcStatus.rs_owner = 0; svcStatus.rs_state = RG_STATE_STOPPED; + svcStatus.rs_flags = 0; if (set_rg_state(svcName, &svcStatus) != 0) { rg_unlock(&lockp); return RG_EFAIL; @@ -1292,6 +1403,7 @@ _svc_stop(const char *svcName, int req, int recover, uint32_t newstate) logt_print(LOG_DEBUG, "%s is clean; skipping double-stop\n", svcName); svcStatus.rs_state = newstate; + svcStatus.rs_flags = 0; if (set_rg_state(svcName, &svcStatus) != 0) { rg_unlock(&lockp); @@ -1372,6 +1484,7 @@ _svc_stop_finish(const char *svcName, int failed, uint32_t newstate) } svcStatus.rs_state = newstate; + svcStatus.rs_flags = 0; logt_print(LOG_NOTICE, "Service %s is %s\n", svcName, rg_state_str(svcStatus.rs_state)); diff --git a/rgmanager/src/daemons/rg_thread.c b/rgmanager/src/daemons/rg_thread.c index 446f2d2..72b5f96 100644 --- a/rgmanager/src/daemons/rg_thread.c +++ b/rgmanager/src/daemons/rg_thread.c @@ -277,6 +277,26 @@ resgroup_thread_main(void *arg) ret = RG_NONE; break; + case RG_CONVALESCE: + error = svc_convalesce(myname); + + if (error == 0) { + ret = RG_SUCCESS; + + pthread_mutex_lock(&my_queue_mutex); + purge_status_checks(&my_queue); + pthread_mutex_unlock(&my_queue_mutex); + } else if (error == RG_EFORWARD) { + ret = RG_NONE; + break; + } else { + /* + * Bad news. + */ + ret = RG_EFAIL; + } + break; + case RG_MIGRATE: error = svc_migrate(myname, req->rr_target); diff --git a/rgmanager/src/utils/clusvcadm.c b/rgmanager/src/utils/clusvcadm.c index 137837a..bd0723f 100644 --- a/rgmanager/src/utils/clusvcadm.c +++ b/rgmanager/src/utils/clusvcadm.c @@ -235,7 +235,7 @@ main(int argc, char **argv) const char *actionstr = NULL; cluster_member_list_t *membership; - while ((opt = getopt(argc, argv, "lSue:M:d:r:n:m:FvR:s:Z:U:qh?")) != EOF) { + while ((opt = getopt(argc, argv, "lSue:M:d:r:n:c:m:FvR:s:Z:U:qh?")) != EOF) { switch (opt) { case 'l': return do_lock(); @@ -312,6 +312,11 @@ main(int argc, char **argv) action = RG_UNFREEZE; svcname = optarg; break; + case 'c': + actionstr = "convalescing"; + action = RG_CONVALESCE; + svcname = optarg; + break; case 'q': close(STDOUT_FILENO); break;

1 0

cluster: RHEL6 - rgmanager: Mark non-critical resources disabled
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b6… Commit: b631ffdb818f7cf3512840dd99b8844aa230b03d Parent: 5907340776e360b327642f24f7ace0ae812b7a81 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Mon Aug 30 13:37:38 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:30:58 2011 -0500 rgmanager: Mark non-critical resources disabled Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/include/resgroup.h | 1 + rgmanager/include/reslist.h | 2 + rgmanager/src/daemons/restree.c | 75 ++++++++++++++++++++++++++------------ rgmanager/src/daemons/rg_state.c | 27 +++++++++----- 4 files changed, 72 insertions(+), 33 deletions(-) diff --git a/rgmanager/include/resgroup.h b/rgmanager/include/resgroup.h index 13b4dae..a0b6fc1 100644 --- a/rgmanager/include/resgroup.h +++ b/rgmanager/include/resgroup.h @@ -229,6 +229,7 @@ const char *rg_strerror(int val); */ #define SFL_FAILURE (1<<0) #define SFL_RECOVERABLE (1<<1) +#define SFL_PARTIAL (1<<2) //#define DEBUG #ifdef DEBUG diff --git a/rgmanager/include/reslist.h b/rgmanager/include/reslist.h index 142fce6..a8acd8e 100644 --- a/rgmanager/include/reslist.h +++ b/rgmanager/include/reslist.h @@ -29,12 +29,14 @@ the configuration */ #define RF_ENFORCE_TIMEOUTS (1<<9) /** Enforce timeouts for this node */ #define RF_NON_CRITICAL (1<<10) /** stop this resource if it fails */ +#define RF_QUIESCE (1<<11) /** don't restart this resource */ #define RES_STOPPED (0) #define RES_STARTED (1) #define RES_FAILED (2) +#define RES_DISABLED (3) #ifndef SHAREDIR #define SHAREDIR "/usr/share/rgmanager" diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index e480cc8..a717376 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -962,7 +962,8 @@ _print_resource_tree(FILE *fp, resource_node_t **tree, int level) fprintf(fp, "NON-CRITICAL "); fprintf(fp, "]"); } - fprintf(fp, " {\n"); + + fprintf(fp, " (S%d) {\n", node->rn_state); for (x = 0; node->rn_resource->r_attrs && node->rn_resource->r_attrs[x].ra_value; x++) { @@ -1153,7 +1154,8 @@ mark_nodes(resource_node_t *node, int state, int setflags, int clearflags) clearflags); } - node->rn_state = state; + if (state >= RES_STOPPED) + node->rn_state = state; node->rn_flags |= (setflags); node->rn_flags &= ~(clearflags); } @@ -1171,6 +1173,9 @@ do_status(resource_node_t *node) int has_recover = 0; time_t delta = 0, now = 0; + if (node->rn_state == RES_DISABLED) + return 0; + now = time(NULL); for (; node->rn_actions[x].ra_name; x++) { @@ -1365,6 +1370,15 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, CONDSTART and CONDSTOP are no-ops if the appropriate flag is not set. */ + if ((op == RS_CONVALESCE) && + node->rn_state == RES_DISABLED) { + printf("Node %s:%s - Convalesce\n", + node->rn_resource->r_rule->rr_type, + primary_attr_value(node->rn_resource)); + node->rn_state = RES_STOPPED; + op = RS_START; + } + if ((op == RS_CONDSTART) && (node->rn_flags & RF_NEEDSTART)) { printf("Node %s:%s - CONDSTART\n", @@ -1385,7 +1399,12 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, /* Start starts before children */ if (me && (op == RS_START)) { + if (node->rn_state == RES_DISABLED) + /* Nothing to do - children are also disabled */ + return 0; + pthread_mutex_lock(&node->rn_resource->r_mutex); + if (node->rn_flags & RF_RECONFIG && realop == RS_CONDSTART) { rv = res_exec(node, RS_RECONFIG, NULL, 0); @@ -1430,21 +1449,29 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, dependent children are failed, whether or not this node is independent or not. */ - mark_nodes(node, RES_FAILED, - RF_NEEDSTART | RF_NEEDSTOP, 0); /* If we're an independent subtree, return a flag stating that this section is recoverable apart from siblings in the resource tree. All child resources of this node must be restarted, but siblings of this node are not affected. */ - if (node->rn_flags & RF_INDEPENDENT) - return SFL_RECOVERABLE; + if (node->rn_flags & RF_INDEPENDENT) { + if (node->rn_flags & RF_NON_CRITICAL) { + mark_nodes(node, RES_FAILED, + RF_NEEDSTOP | RF_QUIESCE, 0); + return SFL_RECOVERABLE|SFL_PARTIAL; + } else { + mark_nodes(node, RES_FAILED, + RF_NEEDSTART | RF_NEEDSTOP, 0); + return SFL_RECOVERABLE; + } + } return SFL_FAILURE; } - mark_nodes(node, RES_STARTED, 0, RF_NEEDSTOP); + if (node->rn_state != RES_DISABLED) + mark_nodes(node, RES_STARTED, 0, RF_NEEDSTOP); } if (node->rn_child) { @@ -1458,14 +1485,16 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, the resource tree. */ if (op == RS_STATUS && (rv & SFL_FAILURE) && (node->rn_flags & RF_INDEPENDENT)) { - if (node->rn_flags & RF_NON_CRITICAL) + rv = SFL_RECOVERABLE; + if (node->rn_flags & RF_NON_CRITICAL) { /* if non-critical, just stop */ - mark_nodes(node, RES_FAILED, - RF_NEEDSTOP, 0); - else + mark_nodes(node, RES_FAILED, RF_NEEDSTOP | RF_QUIESCE, 0); + + rv |= SFL_PARTIAL; + } else { mark_nodes(node, RES_FAILED, RF_NEEDSTOP | RF_NEEDSTART, 0); - rv = SFL_RECOVERABLE; + } } } @@ -1475,27 +1504,27 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, /* Decrease incarnations so the script knows how many *other* incarnations there are. */ pthread_mutex_lock(&node->rn_resource->r_mutex); - if (node->rn_state == RES_STARTED) { - assert(node->rn_resource->r_incarnations >= 0); - if (node->rn_resource->r_incarnations > 0) - --node->rn_resource->r_incarnations; - } node->rn_flags &= ~RF_NEEDSTOP; rv |= res_exec(node, op, NULL, 0); - if (rv != 0) { - if (node->rn_state == RES_STARTED) { - /* Fail to stop: fix incarnations */ - ++node->rn_resource->r_incarnations; - } + if (rv == 0 && (node->rn_state == RES_STARTED || + node->rn_state == RES_FAILED)) { + assert(node->rn_resource->r_incarnations >= 0); + if (node->rn_resource->r_incarnations > 0) + --node->rn_resource->r_incarnations; + } else if (node->rn_state != RES_DISABLED) { node->rn_state = RES_FAILED; pthread_mutex_unlock(&node->rn_resource->r_mutex); return SFL_FAILURE; } pthread_mutex_unlock(&node->rn_resource->r_mutex); - if (node->rn_state != RES_STOPPED) { + if (node->rn_flags & RF_QUIESCE && + node->rn_flags & RF_NON_CRITICAL) { + node->rn_flags &= ~RF_QUIESCE; + node->rn_state = RES_DISABLED; + } else { node->rn_state = RES_STOPPED; } } diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index d31ea2b..9049a7c 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -1122,7 +1122,7 @@ static int handle_started_status(const char *svcName, int ret, rg_state_t __attribute__((unused)) *svcStatus) { - int newowner; + int newowner, ret2; if (ret & SFL_FAILURE) { newowner = msvc_check_cluster(svcName); @@ -1138,20 +1138,27 @@ handle_started_status(const char *svcName, int ret, logt_print(LOG_WARNING, "Some independent resources in %s failed; " "Attempting inline recovery\n", svcName); - ret = group_op(svcName, RG_CONDSTOP); - if (!(ret & SFL_FAILURE)) { - ret = group_op(svcName, RG_CONDSTART); + ret2 = group_op(svcName, RG_CONDSTOP); + if (!(ret2 & SFL_FAILURE)) { + ret2 = group_op(svcName, RG_CONDSTART); } - if (ret) { + if (ret2) { logt_print(LOG_WARNING, "Inline recovery of %s failed\n", svcName); - } else { - logt_print(LOG_NOTICE, - "Inline recovery of %s succeeded\n", - svcName); - return 0; + return ret; } + + logt_print(LOG_NOTICE, "Inline recovery of %s succeeded\n", + svcName); + if (ret & SFL_PARTIAL) { + logt_print(LOG_NOTICE, "Note: Some non-critical " + "resources are still stopped.\n"); + logt_print(LOG_NOTICE, "Run 'clusvcadm -c %s' to " + "restore them to operation.\n", svcName); + } + + return 0; } return ret;

1 0

cluster: RHEL6 - rgmanager: Present all flags in clustat output
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=59… Commit: 5907340776e360b327642f24f7ace0ae812b7a81 Parent: 0e5e14cd1471464edf14776bd7ac84d14623a03d Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Aug 25 14:34:59 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:30:46 2011 -0500 rgmanager: Present all flags in clustat output Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/utils/clustat.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/rgmanager/src/utils/clustat.c b/rgmanager/src/utils/clustat.c index d3137e0..b64d474 100644 --- a/rgmanager/src/utils/clustat.c +++ b/rgmanager/src/utils/clustat.c @@ -455,6 +455,7 @@ _txt_rg_state(rg_state_t *rs, cluster_member_list_t *members, int flags, { char owner[MAXHOSTNAMELEN+1]; char state_string[255] = ""; + char flags_string[16] = ""; char *name = rs->rs_name, *ptr; int l; @@ -484,10 +485,14 @@ _txt_rg_state(rg_state_t *rs, cluster_member_list_t *members, int flags, } /* Show a frozen service */ - if (rs->rs_flags & RG_FLAG_FROZEN) { + if (rs->rs_flags) { + rg_flags_str(flags_string, sizeof(flags_string), rs->rs_flags, + NULL); + snprintf(state_string, sizeof(state_string), - "%-*.*s[Z]", statsize-3, statsize-3, - rg_state_str(rs->rs_state)); + "%-*.*s[%s]", (int)(statsize-(2+strlen(flags_string))), + (int)(statsize-(2+strlen(flags_string))), + rg_state_str(rs->rs_state), flags_string); } else { snprintf(state_string, sizeof(state_string), "%-*.*s", statsize, statsize,

1 0

cluster: RHEL6 - rgmanager: Use rg_strings.c for flags
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0e… Commit: 0e5e14cd1471464edf14776bd7ac84d14623a03d Parent: 5203d9eefe530a13525dc32d9f48568fbabfd495 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Aug 25 13:50:55 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:30:14 2011 -0500 rgmanager: Use rg_strings.c for flags Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/clulib/rg_strings.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/clulib/rg_strings.c b/rgmanager/src/clulib/rg_strings.c index 24ee479..fdb1dad 100644 --- a/rgmanager/src/clulib/rg_strings.c +++ b/rgmanager/src/clulib/rg_strings.c @@ -81,9 +81,15 @@ const struct string_val rg_state_strings[] = { const struct string_val rg_flags_strings[] = { {RG_FLAG_FROZEN, "frozen"}, + {RG_FLAG_PARTIAL, "partial"}, {0, NULL} }; +const struct string_val rg_flags_short[] = { + {RG_FLAG_FROZEN, "Z"}, + {RG_FLAG_PARTIAL, "P"}, + {0, NULL} +}; const struct string_val agent_ops[] = { {RS_START, "start"}, @@ -185,14 +191,18 @@ rg_flag_str(int val) const char * rg_flags_str(char *flags_string, size_t size, int val, char *separator) { + const struct string_val *table = rg_flags_strings; int i; const char *string; + if (!separator) + table = rg_flags_short; + for (i = 0; i < (sizeof(val) * 8); i++) { if ( val & (1 << i)) { - if (strlen(flags_string)) + if (strlen(flags_string) && separator) strncat(flags_string, separator, size - (strlen(flags_string) + strlen(separator) + 1)); - string = rg_search_table(rg_flags_strings, (1 << i)); + string = rg_search_table(table, (1 << i)); strncat(flags_string, string, size - (strlen(flags_string) + strlen(string) + 1)); } }

1 0

cluster: RHEL6 - rgmanager: Header cleanup
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=52… Commit: 5203d9eefe530a13525dc32d9f48568fbabfd495 Parent: ca924c428bbf149531f896b52c9ba6f1597c634b Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Aug 25 13:32:19 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:29:56 2011 -0500 rgmanager: Header cleanup Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/include/res-ocf.h | 1 + rgmanager/include/resgroup.h | 3 +++ rgmanager/include/reslist.h | 2 +- 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/rgmanager/include/res-ocf.h b/rgmanager/include/res-ocf.h index 557e128..cc65a4d 100644 --- a/rgmanager/include/res-ocf.h +++ b/rgmanager/include/res-ocf.h @@ -48,5 +48,6 @@ #define RS_MIGRATE (13) #define RS_RECONFIG (14) #define RS_STATUS_INQUIRY (15) /** Quick status */ +#define RS_CONVALESCE (16) #endif diff --git a/rgmanager/include/resgroup.h b/rgmanager/include/resgroup.h index c639315..13b4dae 100644 --- a/rgmanager/include/resgroup.h +++ b/rgmanager/include/resgroup.h @@ -100,6 +100,7 @@ extern size_t rg_state_t_version_sizes[]; #define RG_FREEZE 23 #define RG_UNFREEZE 24 #define RG_STATUS_INQUIRY 25 +#define RG_CONVALESCE 26 #define RG_NONE 999 const char *rg_req_str(int req); @@ -129,6 +130,8 @@ int handle_start_remote_req(char *svcName, int req); /* Resource group flags (for now) */ #define RG_FLAG_FROZEN (1<<0) /** Resource frozen */ +#define RG_FLAG_PARTIAL (1<<1) /** One or more non-critical + resources offline */ const char *rg_state_str(int val); const char *rg_flag_str(int val); diff --git a/rgmanager/include/reslist.h b/rgmanager/include/reslist.h index 8376478..142fce6 100644 --- a/rgmanager/include/reslist.h +++ b/rgmanager/include/reslist.h @@ -28,7 +28,7 @@ resource class if you delete it from the configuration */ #define RF_ENFORCE_TIMEOUTS (1<<9) /** Enforce timeouts for this node */ -#define RF_NON_CRITCIAL (1<<10) /** stop this resource if it fails */ +#define RF_NON_CRITICAL (1<<10) /** stop this resource if it fails */

1 0

cluster: RHEL6 - rgmanager: Add non-critical base behavior
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ca… Commit: ca924c428bbf149531f896b52c9ba6f1597c634b Parent: 16ab187d7733c653dddc3e1b9cd90524ccdf8947 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Aug 25 13:17:24 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:29:29 2011 -0500 rgmanager: Add non-critical base behavior Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/restree.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index 5f37716..e480cc8 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -663,6 +663,13 @@ do_load_resource(int ccsfd, char *base, curres->r_flags &= ~RF_NON_CRITICAL; } + if (curres->r_flags & RF_NON_CRITICAL) { + /* Independent subtree is implied if a + * resource is non-critical + */ + node->rn_flags |= RF_NON_CRITICAL | RF_INDEPENDENT; + } + *newnode = node; list_insert(tree, node); @@ -1451,8 +1458,13 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, the resource tree. */ if (op == RS_STATUS && (rv & SFL_FAILURE) && (node->rn_flags & RF_INDEPENDENT)) { - mark_nodes(node, RES_FAILED, - RF_NEEDSTART | RF_NEEDSTOP, 0); + if (node->rn_flags & RF_NON_CRITICAL) + /* if non-critical, just stop */ + mark_nodes(node, RES_FAILED, + RF_NEEDSTOP, 0); + else + mark_nodes(node, RES_FAILED, + RF_NEEDSTOP | RF_NEEDSTART, 0); rv = SFL_RECOVERABLE; } }

1 0

cluster: RHEL6 - rgmanager: Add non-critical flag to resources
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=16… Commit: 16ab187d7733c653dddc3e1b9cd90524ccdf8947 Parent: 0a4a433df0274085d6cb530c529740b77fbb93f0 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Thu Aug 12 16:28:59 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:29:08 2011 -0500 rgmanager: Add non-critical flag to resources Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/include/reslist.h | 1 + rgmanager/src/daemons/restree.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/rgmanager/include/reslist.h b/rgmanager/include/reslist.h index 79cbbb4..8376478 100644 --- a/rgmanager/include/reslist.h +++ b/rgmanager/include/reslist.h @@ -28,6 +28,7 @@ resource class if you delete it from the configuration */ #define RF_ENFORCE_TIMEOUTS (1<<9) /** Enforce timeouts for this node */ +#define RF_NON_CRITCIAL (1<<10) /** stop this resource if it fails */ diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index 1ae9746..5f37716 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -605,8 +605,11 @@ do_load_resource(int ccsfd, char *base, #else if (conf_get(tok, &ref) == 0) { #endif - if (atoi(ref) > 0 || strcasecmp(ref, "yes") == 0) + if (atoi(ref) == 1 || strcasecmp(ref, "yes") == 0) node->rn_flags |= RF_INDEPENDENT; + if (atoi(ref) == 2 || strcasecmp(ref, "non-critical") == 0) { + curres->r_flags |= RF_NON_CRITICAL; + } free(ref); } @@ -653,6 +656,13 @@ do_load_resource(int ccsfd, char *base, curres->r_refs++; + if (curres->r_refs > 1 && + (curres->r_flags & RF_NON_CRITICAL)) { + res_build_name(tok, sizeof(tok), curres); + printf("Non-critical flag for %s is being cleared due to multiple references.\n", tok); + curres->r_flags &= ~RF_NON_CRITICAL; + } + *newnode = node; list_insert(tree, node); @@ -941,6 +951,8 @@ _print_resource_tree(FILE *fp, resource_node_t **tree, int level) fprintf(fp, "DESTROY "); if (node->rn_flags & RF_ENFORCE_TIMEOUTS) fprintf(fp, "ENFORCE-TIMEOUTS "); + if (node->rn_flags & RF_NON_CRITICAL) + fprintf(fp, "NON-CRITICAL "); fprintf(fp, "]"); } fprintf(fp, " {\n");

1 0

cluster: RHEL6 - qdisk: Informational syslog message indicating label overrides device
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0a… Commit: 0a4a433df0274085d6cb530c529740b77fbb93f0 Parent: b0aa94c16ee8b018858c138c8b997e1673828610 Author: Jeremy Miller <csf1dsh(a)ups.com> AuthorDate: Tue Feb 1 11:52:54 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 11:54:44 2011 -0500 qdisk: Informational syslog message indicating label overrides device When user specifies both quorum label and quorum device (ccs allows this), the user isn't notified that the label will override the device when searching through disks for the quorum partition. This can mislead the user into thinking that qdiskd will in fact use the quorum device they specified. This can have serious consequences when the user intends qdiskd to use a specified a multipath device such as "/dev/mapper/qdisk", but in actuality qdiskd will just use the first device it finds with matching user specified label (for example "/dev/dm-17"). According to Red Hat documentation, when using multipath, one should always use /dev/mapper/xxx devices to ensure proper path failover, rather than /dev/dm-xx or /dev/mpath/xxx devices. Resolves: rhbz#635413 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/qdisk/main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c index 617a705..ebdb018 100644 --- a/cman/qdisk/main.c +++ b/cman/qdisk/main.c @@ -1746,6 +1746,11 @@ get_static_config_data(qd_ctx *ctx, int ccsfd) snprintf(query, sizeof(query), "/cluster/quorumd/@label"); if (ccs_get(ccsfd, query, &val) == 0) { ctx->qc_label = val; + /* courtesy info message */ + if (ctx->qc_device) + logt_print(LOG_INFO, "Quorum Label (%s) will be used to " + "locate quorum partition, overriding Quorum Device\n", + ctx->qc_label); } if (!ctx->qc_device && !ctx->qc_label) {

1 0

cluster: STABLE31 - qdisk: Informational syslog message indicating label overrides device
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8c… Commit: 8cb4fbc7e7ffc16cfffcc1a14a3253830a77f69d Parent: 5822073b63d1b83af623bb3c72dccc97f4eb2e27 Author: Jeremy Miller <csf1dsh(a)ups.com> AuthorDate: Tue Feb 1 11:52:54 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 11:52:54 2011 -0500 qdisk: Informational syslog message indicating label overrides device When user specifies both quorum label and quorum device (ccs allows this), the user isn't notified that the label will override the device when searching through disks for the quorum partition. This can mislead the user into thinking that qdiskd will in fact use the quorum device they specified. This can have serious consequences when the user intends qdiskd to use a specified a multipath device such as "/dev/mapper/qdisk", but in actuality qdiskd will just use the first device it finds with matching user specified label (for example "/dev/dm-17"). According to Red Hat documentation, when using multipath, one should always use /dev/mapper/xxx devices to ensure proper path failover, rather than /dev/dm-xx or /dev/mpath/xxx devices. Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/qdisk/main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c index 617a705..ebdb018 100644 --- a/cman/qdisk/main.c +++ b/cman/qdisk/main.c @@ -1746,6 +1746,11 @@ get_static_config_data(qd_ctx *ctx, int ccsfd) snprintf(query, sizeof(query), "/cluster/quorumd/@label"); if (ccs_get(ccsfd, query, &val) == 0) { ctx->qc_label = val; + /* courtesy info message */ + if (ctx->qc_device) + logt_print(LOG_INFO, "Quorum Label (%s) will be used to " + "locate quorum partition, overriding Quorum Device\n", + ctx->qc_label); } if (!ctx->qc_device && !ctx->qc_label) {

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits February 2011