From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29829 invoked by alias); 4 Sep 2008 21:36:49 -0000 Received: (qmail 29823 invoked by alias); 4 Sep 2008 21:36:49 -0000 X-Spam-Status: No, hits=-1.0 required=5.0 tests=AWL,BAYES_20,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com X-Spam-Level: Subject: RHEL4 - fence_scsi.pl: check if nodeid is zero To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL4 X-Git-Reftype: branch X-Git-Oldrev: 3ac098920b654410883a31e762fdd150b6f21c14 X-Git-Newrev: 3df1a7c5dd25d0579b6d82fb8375efb9f4ecf0eb From: "Ryan O'Hara" Message-Id: <20080904213542.9DC4D1203BA@lists.fedorahosted.org> Date: Fri, 05 Sep 2008 13:06:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00376.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=3df1a7c5dd25d0579b6d82fb8375efb9f4ecf0eb Commit: 3df1a7c5dd25d0579b6d82fb8375efb9f4ecf0eb Parent: 3ac098920b654410883a31e762fdd150b6f21c14 Author: rohara AuthorDate: Thu Sep 4 16:35:42 2008 -0500 Committer: rohara CommitterDate: Thu Sep 4 16:35:42 2008 -0500 fence_scsi.pl: check if nodeid is zero If the nodeid we get from the XML query of cluster.conf is zero, then either the node does not exist in the cluster of the nodeid is not set. Each case is invalid, so report an error and exit. --- fence/agents/scsi/fence_scsi.pl | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl index c2dea6f..e0da751 100755 --- a/fence/agents/scsi/fence_scsi.pl +++ b/fence/agents/scsi/fence_scsi.pl @@ -187,6 +187,10 @@ sub get_key my $cluster_id = get_cluster_id; my $node_id = get_node_id($node); + if ($node_id == 0) { + die "Unable to determine nodeid for $node.\n"; + } + my $key = sprintf "%x%.4x", $cluster_id, $node_id; return $key;