public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* Cluster Project branch, RHEL4, updated. gfs-kernel_2_6_9_76-28-g9133a64
@ 2008-04-07 16:14 rohara
0 siblings, 0 replies; only message in thread
From: rohara @ 2008-04-07 16:14 UTC (permalink / raw)
To: cluster-cvs, cluster-devel
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=9133a6446a47c56bd735d01d761f0c91f8491fe0
The branch, RHEL4 has been updated
via 9133a6446a47c56bd735d01d761f0c91f8491fe0 (commit)
from 481965dc9ddb3cbbe06e82ecd507a2b77621206a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9133a6446a47c56bd735d01d761f0c91f8491fe0
Author: Ryan O'Hara <rohara@redhat.com>
Date: Mon Apr 7 11:13:40 2008 -0500
BZ 409391 : fence_scsi and scsi_reserve script no longer use state file for
tracking registered devices (/var/run/scsi_reserve).
-----------------------------------------------------------------------
Summary of changes:
fence/agents/scsi/fence_scsi.pl | 80 ++++----
fence/agents/scsi/fence_scsi_test.pl | 174 ++++++++---------
fence/agents/scsi/scsi_reserve | 356 +++++++++++++++++++---------------
3 files changed, 328 insertions(+), 282 deletions(-)
diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl
index 51531ce..c2dea6f 100755
--- a/fence/agents/scsi/fence_scsi.pl
+++ b/fence/agents/scsi/fence_scsi.pl
@@ -11,9 +11,6 @@ $_ = $0;
s/.*\///;
my $pname = $_;
-# WARNING!! Do not add code bewteen "#BEGIN_VERSION_GENERATION" and
-# "#END_VERSION_GENERATION" It is generated by the Makefile
-
#BEGIN_VERSION_GENERATION
$FENCE_RELEASE_NAME="";
$REDHAT_COPYRIGHT="";
@@ -195,7 +192,6 @@ sub get_key
return $key;
}
-
sub get_options_stdin
{
my $opt;
@@ -232,6 +228,10 @@ sub get_options_stdin
{
$opt_n = $val;
}
+ elsif ($name eq "nodename")
+ {
+ $opt_n = $val;
+ }
elsif ($name eq "verbose")
{
$opt_v = $val;
@@ -248,7 +248,8 @@ sub get_key_list
($dev) = @_;
my ($in, $out, $err);
- my $cmd = "sg_persist -d $dev -i -k";
+
+ my $cmd = "sg_persist -n -d $dev -i -k";
my $pid = open3($in, $out, $err, $cmd) or die "$!\n";
waitpid($pid, 0);
@@ -274,46 +275,36 @@ sub get_key_list
return %key_list;
}
-#sub get_scsi_devices
-#{
-# my ($in, $out, $err);
-# my $cmd = "lvs --noheadings --separator : -o vg_attr,devices";
-# my $pid = open3($in, $out, $err, $cmd) or die "$!\n";
-#
-# waitpid($pid, 0);
-#
-# die "Unable to execute lvs.\n" if ($?>>8);
-#
-# while (<$out>)
-# {
-# chomp;
-# print "OUT: $_\n" if $opt_v;
-#
-# my ($vg_attrs, $device) = split(/:/, $_);
-#
-# if ($vg_attrs =~ /.*c$/)
-# {
-# $device =~ s/\(.*\)//;
-# push(@volumes, $device);
-# }
-# }
-#
-# close($in);
-# close($out);
-# close($err);
-#}
-
sub get_scsi_devices
{
- open(FILE, "/var/run/scsi_reserve") or die "$!\n";
+ my ($in, $out, $err);
+
+ my $cmd = "vgs --config 'global { locking_type = 0 }'" .
+ " --noheadings --separator : -o vg_attr,pv_name 2> /dev/null";
+
+ my $pid = open3($in, $out, $err, $cmd) or die "$!\n";
+
+ waitpid($pid, 0);
- while (<FILE>)
+ die "Unable to execute lvs.\n" if ($?>>8);
+
+ while (<$out>)
{
chomp;
- push(@volumes, $_);
+ print "OUT: $_\n" if $opt_v;
+
+ my ($vg_attrs, $device) = split(/:/, $_);
+
+ if ($vg_attrs =~ /.*c$/)
+ {
+ $device =~ s/\(.*\)//;
+ push(@volumes, $device);
+ }
}
- close FILE;
+ close($in);
+ close($out);
+ close($err);
}
sub check_sg_persist
@@ -342,7 +333,7 @@ sub do_register
($dev, $key) = @_;
my ($in, $out, $err);
- my $cmd = "sg_persist -d $dev -o -G -S $key";
+ my $cmd = "sg_persist -n -d $dev -o -G -S $key";
my $pid = open3($in, $out, $err, $cmd) or die "$!\n";
waitpid($pid, 0);
@@ -379,13 +370,18 @@ sub fence_node
do_register($dev, $host_key);
}
+ if (!$key_list{$node_key})
+ {
+ next;
+ }
+
if ($host_key eq $node_key)
{
- $cmd = "sg_persist -d $dev -o -G -K $host_key -S 0";
+ $cmd = "sg_persist -n -d $dev -o -G -K $host_key -S 0";
}
else
{
- $cmd = "sg_persist -d $dev -o -A -K $host_key -S $node_key -T 5";
+ $cmd = "sg_persist -n -d $dev -o -A -K $host_key -S $node_key -T 5";
}
my $pid = open3($in, $out, $err, $cmd) or die "$!\n";
@@ -415,7 +411,7 @@ if (@ARGV > 0) {
usage if defined $opt_h;
version if defined $opt_V;
- fail_usage "Unkown parameter." if (@ARGV > 0);
+ fail_usage "Unknown parameter." if (@ARGV > 0);
fail_usage "No '-n' flag specified." unless defined $opt_n;
diff --git a/fence/agents/scsi/fence_scsi_test.pl b/fence/agents/scsi/fence_scsi_test.pl
index 7a7bbc3..35bea49 100755
--- a/fence/agents/scsi/fence_scsi_test.pl
+++ b/fence/agents/scsi/fence_scsi_test.pl
@@ -1,125 +1,96 @@
#!/usr/bin/perl
+use POSIX;
use IPC::Open3;
-use Sys::Hostname;
+use XML::LibXML;
use Getopt::Std;
-use POSIX;
my @devices;
my %results;
-# WARNING!! Do not add code bewteen "#BEGIN_VERSION_GENERATION" and
-# "#END_VERSION_GENERATION" It is generated by the Makefile
-
#BEGIN_VERSION_GENERATION
$FENCE_RELEASE_NAME="";
$REDHAT_COPYRIGHT="";
$BUILD_DATE="";
#END_VERSION_GENERATION
-sub get_key
+sub get_scsi_block_devices
{
- my $name = @_;
- my $addr = gethostbyname($name) or die "$!\n";
+ my $block_dir = "/sys/block";
- return unpack("H*", $addr);
-}
+ opendir(DIR, $block_dir) or die "$!\n";
-sub register_device
-{
- my $func = (caller(0))[3];
- my ($dev, $key) = @_;
+ my @block_devices = grep { /^sd*/ } readdir(DIR);
+
+ closedir(DIR);
- print "DEBUG: $func ($dev, $key)\n" if ($opt_d);
+ for $block_dev (@block_devices)
+ {
+ push(@devices, "/dev/" . $block_dev);
+ }
+}
+sub get_cluster_vol_devices
+{
my ($in, $out, $err);
- my $cmd = "sg_persist -d $dev -o -G -S $key";
+
+ my $cmd = "vgs --config 'global { locking_type = 0 }'" .
+ " --noheadings --separator : -o vg_attr,pv_name";
my $pid = open3($in, $out, $err, $cmd) or die "$!\n";
waitpid($pid, 0);
- my $rval = WEXITSTATUS($?);
+ die "[error] unable to execute vgs command.\n" if WEXITSTATUS($?);
+
+ while (<$out>)
+ {
+ chomp;
+
+ my ($vg_attr, $pv_name) = split(/:/, $_);
- $results{$dev}[0] = $rval;
+ if ($vg_attr =~ /.*c$/)
+ {
+ ###### DEBUG ######
+ print "DEBUG: pv_name = $pv_name\n";
- print "DEBUG: [$rval] $cmd\n" if ($opt_d);
+ push(@devices, $pv_name);
+ }
+ }
close($in);
close($out);
close($err);
-
- return $rval;
}
-sub unregister_device
+sub register_device
{
- my $func = (caller(0))[3];
my ($dev, $key) = @_;
-
- print "DEBUG: $func ($dev, $key)\n" if ($opt_d);
-
my ($in, $out, $err);
- my $cmd = "sg_persist -d $dev -o -G -K $key -S 0";
+ my $cmd = "sg_persist -n -d $dev -o -G -S $key";
my $pid = open3($in, $out, $err, $cmd) or die "$!\n";
waitpid($pid, 0);
- my $rval = WEXITSTATUS($?);
-
- $results{$dev}[1] = $rval;
-
- print "DEBUG: [$rval] $cmd\n" if ($opt_d);
+ $results{$dev}[0] = WEXITSTATUS($?);
close($in);
close($out);
close($err);
-
- return $rval;
}
-sub get_block_devices
-{
- my $block_dir = "/sys/block";
-
- opendir(DIR, $block_dir) or die "Error: $! $block_dir\n";
-
- my @block_devices = grep { /^sd*/ } readdir(DIR);
-
- closedir(DIR);
-
- for $dev (@block_devices)
- {
- push @devices, "/dev/" . $dev;
- }
-}
-
-sub get_cluster_devices
+sub unregister_device
{
+ my ($dev, $key) = @_;
my ($in, $out, $err);
- my $cmd = "vgs --config 'global { locking_type = 0 }'" .
- " --noheadings --separator : -o vg_attr,pv_name";
-
+ my $cmd = "sg_persist -n -d $dev -o -G -K $key -S 0";
my $pid = open3($in, $out, $err, $cmd) or die "$!\n";
waitpid($pid, 0);
- die "Error: unable to exec vgs command.\n" if WEXITSTATUS($?);
-
- while (<$out>)
- {
- chomp;
-
- my ($vg_attr, $dev) = split(/:/, $_);
-
- if ($vg_attr =~ /.*c$/)
- {
- $dev =~ s/\(.*\)//;
- push @devices, $dev;
- }
- }
+ $results{$dev}[1] = WEXITSTATUS($?);
close($in);
close($out);
@@ -128,20 +99,38 @@ sub get_cluster_devices
sub test_devices
{
- my $name = hostname() or die "$!\n";
- my $key = get_key($name);
+ my $key = "0xDEADBEEF";
foreach $dev (@devices)
{
- if (register_device($dev, $key) != 0)
- {
- }
- if (unregister_device($dev, $key) != 0)
- {
- }
+ register_device($dev, $key);
+ unregister_device($dev, $key);
}
}
+sub check_config_fence
+{
+ my $xml = XML::LibXML->new();
+ my $tree = $xml->parse_file("/etc/cluster/cluster.conf");
+ my $root = "//cluster/fencedevices/fencedevice";
+
+ my $xpath_fence = "count(${root}[\@agent='fence_scsi'])";
+
+ return ( ! $tree->findvalue($xpath_fence));
+}
+
+sub check_config_nodes
+{
+ my $xml = XML::LibXML->new();
+ my $tree = $xml->parse_file("/etc/cluster/cluster.conf");
+ my $root = "//cluster/clusternodes/clusternode";
+
+ my $xpath_name = "count(${root}/\@name)";
+ my $xpath_nodeid = "count(${root}/\@nodeid)";
+
+ return ($tree->findvalue($xpath_name) != $tree->findvalue($xpath_nodeid));
+}
+
sub print_results
{
my $device_count = scalar(@devices);
@@ -198,9 +187,9 @@ sub print_usage
print " -h Help. Prints out this usage information.\n\n";
}
-### MAIN #######################################################
+### MAIN #######################################################################
-if (getopts("cdhsv") == 0)
+if (getopts("cdhst:v") == 0)
{
print_usage;
exit(1);
@@ -215,25 +204,34 @@ if ($opt_h)
if ($opt_c)
{
print "\nTesting devices in cluster volumes...\n";
- get_cluster_devices;
+ get_cluster_vol_devices;
+ test_devices;
+ print_results;
}
if ($opt_s)
{
print "\nTesting all SCSI block devices...\n";
- get_block_devices;
+ get_scsi_block_devices;
+ test_devices;
+ print_results;
}
-if (!$opt_c && !$opt_s)
+if ($opt_t)
+{
+ if ($opt_t eq "fence")
+ {
+ exit check_config_fence;
+ }
+ if ($opt_t eq "nodes")
+ {
+ exit check_config_nodes;
+ }
+}
+
+if (!$opt_c && !$opt_s && !$opt_t)
{
print "\nPlease specify either cluster or SCSI mode.\n";
print_usage;
exit(1);
}
-
-test_devices;
-
-print_results;
-
-exit 0;
-
diff --git a/fence/agents/scsi/scsi_reserve b/fence/agents/scsi/scsi_reserve
index 4c2f114..67c0d2d 100755
--- a/fence/agents/scsi/scsi_reserve
+++ b/fence/agents/scsi/scsi_reserve
@@ -1,21 +1,50 @@
#!/bin/bash
#
+# scsi_reserve:
+#
# chkconfig: 345 25 75
# description: start/stop persistent reservation service for lvm
+# config: /etc/sysconfig/scsi_reserve
. /etc/init.d/functions
-[ -f /etc/sysconfig/scsi_reserve ] && . /etc/sysconfig/scsi_reserve
+# read in config file if it exists
+#
+if [ -f /etc/sysconfig/scsi_reserve ] ; then
+ . /etc/sysconfig/scsi_reserve
+fi
+
+# check if cluster is configured for fence_scsi
+#
+if ! fence_scsi_test -t fence ; then
+ logger -t scsi_reserve \
+ "[error] cluster not configured for scsi reservations"
+ exit 1
+fi
+
+# check for nodeids in config file
+#
+if ! fence_scsi_test -t nodes ; then
+ logger -t scsi_reserve \
+ "[error] cluster must define nodeid for all nodes"
+ exit 1
+fi
# check for sg_persist command provided by sg3_utils package
#
if ! sg_persist -V &> /dev/null ; then
- echo "error: sg_persist not found"
- exit 2
+ logger -t scsi_reserve \
+ "[error] unable to exec sg_persist"
+ exit 1
fi
-# get scsi devices that are part of clustered volumes
+# check that cman is running
#
+if ! cman_tool status &> /dev/null ; then
+ logger -t scsi_reserve \
+ "[error] cman does not appear to be running"
+ exit 1
+fi
# get physical volumes (devices) that are part of cluster volumes
#
@@ -23,174 +52,197 @@ scsi_devices=$( vgs --config 'global { locking_type = 0 }' \
--noheadings -o vg_attr,pv_name 2> /dev/null \
| awk ' $1 ~ /.*c$/ { print $2 } ' )
-# if no scsi devices were found we can exit now
-#
-[ -z "$scsi_devices" ] && exit 0
-
-# get the node name and node addr from cman
-#
-node_name=$( cman_tool status | grep "Node name" | awk -F": " '{ print $2 }' )
-node_addr=$( cman_tool status | grep "Node addr" | awk -F": " '{ print $2 }' )
+if [ -z "$scsi_devices" ] ; then
+ logger -t scsi_reserve \
+ "[error] did not find devices in cluster volumes"
+ exit 1
+fi
-# get cluster id and node id from cman
+# get the cluster id from cman
#
-c_id=$( cman_tool status | grep "Cluster ID" | awk -F": " '{ print $2 }' )
-n_id=$( cman_tool status | grep "Node ID" | awk -F": " '{ print $2 }' )
+cluster_id=$( cman_tool status | grep -i "Cluster ID" \
+ | awk -F": " '{ print $2 }' )
-[ -z "$c_id" ] && exit 1
-[ -z "$n_id" ] && exit 1
+if [ -z "$cluster_id" ] ; then
+ logger -s -t scsi_reserve \
+ "[error] unable to determine cluster id"
+ exit 1
+fi
-# create unique key for this host
+# get the node id from cman
#
-key=$( printf "%x%.4x" $c_id $n_id )
-
-###############################################################################
-
-case $1 in
-
-start)
-
-rval=0
+node_id=$( cman_tool status | grep -i "Node ID" \
+ | awk -F": " '{ print $2 }' )
-echo "$key" > /var/lock/subsys/scsi_reserve
-
-cat /dev/null > /var/run/scsi_reserve
+if [ -z "$node_id" ] ; then
+ logger -t scsi_reserve \
+ "[error] unable to determine node id"
+ exit 1
+fi
-# register each device using our key
+# generate unique key using cluster_id and node_id
#
-for dev in $scsi_devices
-do
-
- echo -n "Registering device: $dev"
-
- for error in 1
- do
- sg_persist -d $dev -o -G -S $key &>/dev/null || break
- error=0
- done
-
- if [ $error -eq 0 ]; then
- echo $dev >> /var/run/scsi_reserve
- success "register of device $dev"
- else
- # perhaps we are already resgistered
- #
- if sg_persist -d $dev -i -k 2>/dev/null | grep -qiE "$key" ; then
- echo $dev >> /var/run/scsi_reserve
- success "register device $dev"
- else
- failure
- rval=1
- fi
- fi
-
- echo
-
- # create a reservation
- #
- sg_persist -d $dev -o -R -K $key -T 5 &>/dev/null
-
-done
-
-# start the watchdog if configured and registration was successful
-#
-if [ "$rval" == 0 ] && [ "${WATCHDOG}" == yes ] ; then
- echo -n "Starting watchdog: "
- if watchdog -c /etc/cluster/scsi_watchdog.conf ; then
- success "watchdog start"
- else
- failure "watchdog start"
- fi
- echo
+key=$( printf "%x%.4x" $cluster_id $node_id )
+
+if [ -z "$key" ] ; then
+ logger -t scsi_reserve \
+ "[error] unable to generate key"
+ exit 1
fi
-;;
-stop)
+################################################################################
-rval=0
+case $1 in
-# stop the watchdog before we unregister
-#
-if [ "${WATCHDOG}" == yes ] ; then
- echo -n "Stopping watchdog: "
-
- if killproc watchdog ; then
- success "watchdog stop"
- else
- failure "watchdog stop"
- fi
- echo
-fi
+ start)
-# unregister each device for this node
-#
-for dev in $scsi_devices
-do
- echo -n "Unregistering device: $dev"
-
- # get list of keys registered for this device
- #
- reg_keys=$( sg_persist -d $dev -i -k | grep '^[[:space:]]*0x' )
-
- # check if this node/key is the node/key holding the reservation
- #
- if sg_persist -d $dev -i -r 2>/dev/null | grep -qiE "$key" ; then
- if echo "$reg_keys" | grep -qivE "${key#0}" ; then
- error=1
- else
- for error in 1
- do
- sg_persist -d $dev -o -G -K $key -S 0 &>/dev/null || break
- error=0
- done
- fi
- else
- for error in 1
- do
- sg_persist -d $dev -o -G -K $key -S 0 &>/dev/null || break
error=0
- done
- fi
+ count=0
+
+ echo -n "Starting scsi_reserve:"
+
+ for dev in $scsi_devices
+ do
+ # check if our key is already resgistered with this device
+ #
+ if sg_persist -n -d $dev -i -k | grep -qiE "^[[:space:]]*0x$key" ; then
+ logger -t scsi_reserve \
+ "[info] already registered with $dev (key=0x$key)"
+ continue
+ fi
+
+ # create the scsi registration
+ #
+ if ! sg_persist -n -d $dev -o -I -S $key &> /dev/null ; then
+ logger -t scsi_reserve \
+ "[error] unable to register device $dev (key=0x$key)"
+ : $[ count = $count + 1 ]
+ error=1
+ else
+ logger -t scsi_reserve \
+ "[info] registered with device $dev (key=0x$key)"
+ fi
+
+ # check to see if reservation already exists
+ #
+ if sg_persist -n -d $dev -i -r | grep -qiE "^[[:space:]]*Key=0x" ; then
+ logger -t scsi_reserve \
+ "[info] reservation already exists on $dev"
+ continue
+ fi
+
+ # create the scsi reservation
+ #
+ if ! sg_persist -n -d $dev -o -R -K $key -T 5 &> /dev/null ; then
+ logger -t scsi_reserver \
+ "[error] unable to create reservation on $dev (key=0x$key)"
+ : $[ count = $count + 1 ]
+ error=1
+ fi
+ done
+
+ # leave fence domain if any errors occured during registration
+ #
+ if [ $error -eq 0 ] ; then
+ success
+ else
+ logger -t scsi_reserve \
+ "[info] $count errors during registration"
+ logger -t scsi_reserve \
+ "[info] leaving the fence domain"
+ fence_tool leave
+ failure
+ fi
+
+ echo
+
+ ;; # end of start
+
+ stop)
- if [ $error -eq 0 ] ; then
- success "unregister device $dev"
- else
- failure
- rval=1
- fi
-
- echo
-done
+ error=0
+ count=0
+
+ echo -n "Stopping scsi_reserve:"
+
+ for dev in $scsi_devices
+ do
+ # get list of keys registered with this device
+ #
+ key_list=$( sg_persist -n -d $dev -i -k | grep -iE "^[[:space:]]*0x" )
+
+ # check that our key is registered with this device
+ #
+ if ! sg_persist -d $dev -i -k | grep -qiE "^[[:space:]]*0x$key" ; then
+ logger -t scsi_reserve \
+ "[info] not registered with $dev (key=0x$key)"
+ continue
+ fi
+
+ # check if our key is the reservation holder
+ #
+ if sg_persist -n -d $dev -i -r 2>/dev/null | grep -qiE "$key" ; then
+ if echo "$key_list" | grep -qivE "$key" ; then
+ logger -t scsi_reserve \
+ "[error] unable to remove registration on $dev (key=0x$key)"
+ : $[ count = $count + 1 ]
+ error=1
+ continue
+ fi
+ fi
+
+ # remove registration for this device
+ #
+ if ! sg_persist -n -d $dev -o -G -K $key -S 0 &> /dev/null ; then
+ logger -t scsi_reserve \
+ "[error] failed to remove registration on $dev (key=0x$key)"
+ : $[ count = $count + 1 ]
+ error=1
+ else
+ logger -t scsi_reserve \
+ "[info] removed registration on $dev (key=0x$key)"
+ fi
+
+ done
+
+ # report success or failure
+ #
+ if [ $error -eq 0 ] ; then
+ success
+ else
+ logger -t scsi_reserve \
+ "[info] $count errors occured during unregistration"
+ failure
+ fi
+
+ echo
+
+ ;; # end of stop
+
+ status)
-rm -f /var/lock/subsys/scsi_reserve
+ error=0
-;;
+ for dev in $scsi_devices
+ do
+ if sg_persist -n -d $dev -i -k | grep -qiE "$key" ; then
+ devices[${#devices[@]}]=$dev
+ fi
+ done
-status)
+ if [ -z "$devices" ] ; then
+ echo "No registered devices found."
+ else
+ echo "Found ${#devices[@]} registered device(s):"
-rval=0
+ for i in "${devices[@]}"
+ do
+ echo $i
+ done
+ fi
-# find devices that are registered with our key
-#
-for dev in $scsi_devices
-do
- if sg_persist -d $dev -i -k 2>/dev/null | grep -qiE "$key" ; then
- devices[${#devices[@]}]=$dev
- fi
-done
-
-if [ -z "$devices" ]; then
- echo "No devices resgistered."
-else
- echo "Found ${#devices[@]} registered device(s):"
-
- for i in "${devices[@]}" ; do
- echo $i
- done
-fi
-;;
+ ;; # end of status
esac
-exit $rval
-
+exit $error
hooks/post-receive
--
Cluster Project
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-04-07 16:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-04-07 16:14 Cluster Project branch, RHEL4, updated. gfs-kernel_2_6_9_76-28-g9133a64 rohara
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).