cluster: RHEL6 - Revert "fence_scsi: write devices to tmp file on unfence"
Fabio M. Di Nitto
fabbione at fedoraproject.org
Mon May 23 14:12:53 UTC 2011
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0b01247c8f7c2abaf653171543b0142188da4a82
Commit: 0b01247c8f7c2abaf653171543b0142188da4a82
Parent: c9794a5fc92160d616205bf8bbae33029408a3e0
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate: Mon May 23 16:11:01 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Mon May 23 16:11:01 2011 +0200
Revert "fence_scsi: write devices to tmp file on unfence"
This reverts commit c449755291a536bafa27006a66301c13adcafdf3.
---
fence/agents/scsi/fence_scsi.pl | 38 +++-----------------------------------
1 files changed, 3 insertions(+), 35 deletions(-)
diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl
index 591dc66..f7b47b9 100644
--- a/fence/agents/scsi/fence_scsi.pl
+++ b/fence/agents/scsi/fence_scsi.pl
@@ -40,7 +40,6 @@ sub do_action_on ($@)
my $self = (caller(0))[3];
my ($node_key, @devices) = @_;
- dev_unlink ();
key_write ($node_key);
foreach $dev (@devices) {
@@ -127,9 +126,6 @@ sub do_verify_on ($@)
next;
}
- ## write dev to device file once registration is verified
- dev_write ($dev);
-
## check that a reservation exists
if (!get_reservation_key ($dev)) {
log_debug ("no reservation exists on device $dev");
@@ -341,38 +337,12 @@ sub do_reset (S)
return;
}
-sub dev_unlink ()
-{
- my $self = (caller(0))[3];
- my $file = "/var/run/cluster/fence_scsi.dev";
-
- if (-e $file) {
- unlink ($file) or die "$!\n";
- }
-
- return;
-}
-
-sub dev_write ($)
-{
- my $self = (caller(0))[3];
- my $file = "/var/run/cluster/fence_scsi.dev";
- my $dev = shift;
-
- open (\*FILE, ">>$file") or die "$!\n";
- print FILE "$dev\n";
- close (FILE);
-
- return;
-}
-
sub key_read ()
{
my $self = (caller(0))[3];
- my $file = "/var/run/cluster/fence_scsi.key";
my $key;
- open (\*FILE, "<$file") or die "$!\n";
+ open (\*FILE, "</var/run/cluster/fence_scsi.key") or die "$!\n";
chomp ($key = <FILE>);
close (FILE);
@@ -382,11 +352,9 @@ sub key_read ()
sub key_write ($)
{
my $self = (caller(0))[3];
- my $file = "/var/run/cluster/fence_scsi.key";
- my $key = shift;
- open (\*FILE, ">$file") or die "$!\n";
- print FILE "$key\n";
+ open (\*FILE, ">/var/run/cluster/fence_scsi.key") or die "$!\n";
+ print FILE "$_[0]\n";
close (FILE);
return;
More information about the cluster-commits
mailing list