From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9260 invoked by alias); 29 Sep 2008 14:16:43 -0000 Received: (qmail 9254 invoked by alias); 29 Sep 2008 14:16:43 -0000 X-Spam-Status: No, hits=-0.2 required=5.0 tests=AWL,BAYES_50,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: master - 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/master X-Git-Reftype: branch X-Git-Oldrev: 1b4bd5be033b91ed355e2ca47e3811c89a518010 X-Git-Newrev: 88fb54d63ea2575e950e77d48c522ac4bfd1aad1 From: "Ryan O'Hara" Message-Id: <20080929141539.92260120468@lists.fedorahosted.org> Date: Mon, 29 Sep 2008 14:17: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/msg00552.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=88fb54d63ea2575e950e77d48c522ac4bfd1aad1 Commit: 88fb54d63ea2575e950e77d48c522ac4bfd1aad1 Parent: 1b4bd5be033b91ed355e2ca47e3811c89a518010 Author: rohara AuthorDate: Thu Sep 4 16:25:56 2008 -0500 Committer: Ryan O'Hara CommitterDate: Mon Sep 29 09:15:31 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 d5a8d08..5a37135 100644 --- a/fence/agents/scsi/fence_scsi.pl +++ b/fence/agents/scsi/fence_scsi.pl @@ -199,6 +199,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;