cluster: RHEL54 - CMAN: scsi_reserve should always echo after failure
rohara
rohara at fedoraproject.org
Thu Nov 12 22:29:44 UTC 2009
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8711b3ed2f2e003afa2aa7432b2185db2e9617be
Commit: 8711b3ed2f2e003afa2aa7432b2185db2e9617be
Parent: db1904fc765c5ec9f8a9e7ac22fc8f15f5d9bbaf
Author: Ryan O'Hara <rohara at redhat.com>
AuthorDate: Thu Nov 12 16:23:27 2009 -0600
Committer: Ryan O'Hara <rohara at redhat.com>
CommitterDate: Thu Nov 12 16:23:27 2009 -0600
CMAN: scsi_reserve should always echo after failure
There were a few places in the scsi_reserve init script where we
did not echo after calling 'failure'. Without the echo the output
is mangled.
---
fence/agents/scsi/scsi_reserve | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/fence/agents/scsi/scsi_reserve b/fence/agents/scsi/scsi_reserve
index 2f10abc..f0f5a63 100755
--- a/fence/agents/scsi/scsi_reserve
+++ b/fence/agents/scsi/scsi_reserve
@@ -89,6 +89,7 @@ if [ -z "$pv_devices" ] ; then
logger -t scsi_reserve \
"[error] did not find devices in cluster volumes"
failure
+ echo
exit 1
fi
@@ -113,6 +114,7 @@ do
logger -t scsi_reserve \
"[error] $dev is not a multipath device"
failure
+ echo
exit 1
fi
else
@@ -134,6 +136,7 @@ if [ -z "$cluster_id" ] ; then
logger -s -t scsi_reserve \
"[error] unable to determine cluster id"
failure
+ echo
exit 1
fi
@@ -146,6 +149,7 @@ if [ -z "$node_id" ] ; then
logger -t scsi_reserve \
"[error] unable to determine node id"
failure
+ echo
exit 1
fi
@@ -157,6 +161,7 @@ if [ -z "$key" ] ; then
logger -t scsi_reserve \
"[error] unable to generate key"
failure
+ echo
exit 1
fi
More information about the cluster-commits
mailing list