From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29469 invoked by alias); 24 Jun 2009 17:58:01 -0000 Received: (qmail 29463 invoked by alias); 24 Jun 2009 17:58:00 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: RHEL4 - fence_apc_snmp.py: fence_apc_snmp time wait 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: 4ca1c6629655cd0b468fbc0e63b1f80729001f28 X-Git-Newrev: e92d478d1d309c329e628997f746e7cda65fd1e6 From: =?utf-8?q?Marek_Gr=C3=A1c?= Message-Id: <20090624175732.E12C7120263@lists.fedorahosted.org> Date: Wed, 24 Jun 2009 17:58: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: 2009-q2/txt/msg00754.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e92d478d1d309c329e628997f746e7cda65fd1e6 Commit: e92d478d1d309c329e628997f746e7cda65fd1e6 Parent: 4ca1c6629655cd0b468fbc0e63b1f80729001f28 Author: Marek 'marx' Grac AuthorDate: Wed Jun 24 19:51:59 2009 +0200 Committer: Marek 'marx' Grac CommitterDate: Wed Jun 24 19:51:59 2009 +0200 fence_apc_snmp.py: fence_apc_snmp time wait Patch from Alexandros Soumplis adds time before check for change of power state is validated. It is similar to POWER_TIMEOUT used in fencing library. bz #494587 --- fence/agents/apc_snmp/fence_apc_snmp.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py index ec9353a..9069461 100755 --- a/fence/agents/apc_snmp/fence_apc_snmp.py +++ b/fence/agents/apc_snmp/fence_apc_snmp.py @@ -23,6 +23,7 @@ import getopt, sys import os import datetime +import time import select import signal from glob import glob @@ -382,17 +383,21 @@ def main2(): agent.status())) elif params['option'] == 'on': agent.power_on() + time.sleep(5) if agent.status() != 'on': raise Exception, 'Error turning outlet on' elif params['option'] == 'off': agent.power_off() + time.sleep(5) if agent.status() != 'off': raise Exception, 'Error turning outlet off' elif params['option'] == 'reboot': agent.power_off() + time.sleep(5) if agent.status() != 'off': raise Exception, 'Error turning outlet off' agent.power_on() + time.sleep(5) if agent.status() != 'on': raise Exception, 'Error turning outlet on' else: