From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9989 invoked by alias); 4 Apr 2008 22:54:21 -0000 Received: (qmail 9960 invoked by uid 9579); 4 Apr 2008 22:54:21 -0000 Date: Fri, 04 Apr 2008 22:54:00 -0000 Message-ID: <20080404225421.9945.qmail@sourceware.org> From: rohara@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, RHEL4, updated. gfs-kernel_2_6_9_76-26-g6626fda X-Git-Refname: refs/heads/RHEL4 X-Git-Reftype: branch X-Git-Oldrev: c128baa7cc5397f1fcfc72d35cdb39c089c56043 X-Git-Newrev: 6626fda2200aa1abed902646371eee265be7fc04 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-q2/txt/msg00018.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=6626fda2200aa1abed902646371eee265be7fc04 The branch, RHEL4 has been updated via 6626fda2200aa1abed902646371eee265be7fc04 (commit) from c128baa7cc5397f1fcfc72d35cdb39c089c56043 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6626fda2200aa1abed902646371eee265be7fc04 Author: Ryan O'Hara Date: Fri Apr 4 17:52:41 2008 -0500 BZ 409391 : fence_scsi and scsi_reserve script no longer use state file for tracking registered devices (/var/run/scsi_reserve). ----------------------------------------------------------------------- Summary of changes: fence/agents/scsi/scsi_reserve.sysconfig | 4 --- fence/agents/scsi/scsi_watchdog | 40 ------------------------------ fence/agents/scsi/scsi_watchdog.conf | 1 - 3 files changed, 0 insertions(+), 45 deletions(-) delete mode 100644 fence/agents/scsi/scsi_reserve.sysconfig delete mode 100755 fence/agents/scsi/scsi_watchdog delete mode 100644 fence/agents/scsi/scsi_watchdog.conf diff --git a/fence/agents/scsi/scsi_reserve.sysconfig b/fence/agents/scsi/scsi_reserve.sysconfig deleted file mode 100644 index 06441f4..0000000 --- a/fence/agents/scsi/scsi_reserve.sysconfig +++ /dev/null @@ -1,4 +0,0 @@ -# Enable the watchdog daemon by setting WATCHDOG to "yes". -# This will result in the machine being rebooted if/when it is -# fenced from the cluster. Default is "no". -WATCHDOG=no diff --git a/fence/agents/scsi/scsi_watchdog b/fence/agents/scsi/scsi_watchdog deleted file mode 100755 index 8e59de8..0000000 --- a/fence/agents/scsi/scsi_watchdog +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -if [ ! -f "/var/lock/subsys/scsi_reserve" ]; then - logger -p user.warning -t scsi_reserve "file /var/lock/subsys/scsi_reserve does not exist" - exit 0 -fi - -if [ ! -f "/var/run/scsi_reserve" ]; then - logger -p user.warning -t scsi_reserve "file /var/run scsi_reserve does not exist" - exit 0 -fi - -key=$( cat /var/lock/subsys/scsi_reserve ) - -if [ -z "$key" ]; then - logger -p user.warning -t scsi_reserve "unable to determine reservation key" - exit 0 -fi - -scsi_devices=$( cat /var/run/scsi_reserve ) - -if [ -z "$scsi_devices" ]; then - logger -p user.warning -t scsi_reserve "no devices found" - exit 0 -fi - -for dev in $scsi_devices -do - if sg_persist -d $dev -i -k 2>/dev/null | grep -qiE "${key#0}" ; then - devices[${#devices[@]}]=$dev - fi -done - -if [ -z "$devices" ]; then - logger -p user.warning -t scsi_reserve "no registered devices found" - exit -1 -fi - -exit 0 - diff --git a/fence/agents/scsi/scsi_watchdog.conf b/fence/agents/scsi/scsi_watchdog.conf deleted file mode 100644 index 34ecd47..0000000 --- a/fence/agents/scsi/scsi_watchdog.conf +++ /dev/null @@ -1 +0,0 @@ -test-binary = /sbin/scsi_watchdog hooks/post-receive -- Cluster Project