cluster-commits February 2011

cluster-commits@lists.fedorahosted.org

7 participants
135 discussions

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

← Newer
1
2
3
4
5
6
7
8
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits February 2011