From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5203 invoked by alias); 11 Feb 2009 09:48:15 -0000 Received: (qmail 5197 invoked by alias); 11 Feb 2009 09:48:15 -0000 X-SWARE-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.5 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 bastion.fedora.phx.redhat.com Subject: cluster: RHEL5 - fence_ipmi: Increased number of retries to action To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: 2a217af6683e519769dd96ff81d84c09fc09d499 X-Git-Newrev: 0b4e73be76b08553f4d22b6ba044e2d5f7c8bfae From: Jan Friesse Message-Id: <20090211094747.831BD120198@lists.fedorahosted.org> Date: Wed, 11 Feb 2009 09:48: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-q1/txt/msg00407.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0b4e73be76b08553f4d22b6ba044e2d5f7c8bfae Commit: 0b4e73be76b08553f4d22b6ba044e2d5f7c8bfae Parent: 2a217af6683e519769dd96ff81d84c09fc09d499 Author: Jan Friesse AuthorDate: Wed Feb 11 10:47:24 2009 +0100 Committer: Jan Friesse CommitterDate: Wed Feb 11 10:47:24 2009 +0100 fence_ipmi: Increased number of retries to action This patch is originally provided by Kris Lindgren. It increases number of retries to 7 and make time between operation and status shorter. It makes more calls, if IPMI seems not to react. rhbz#276541 --- fence/agents/ipmilan/ipmilan.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/fence/agents/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c index cbacf08..2beb15a 100644 --- a/fence/agents/ipmilan/ipmilan.c +++ b/fence/agents/ipmilan/ipmilan.c @@ -380,7 +380,7 @@ ipmi_op(struct ipmi *ipmi, int op, struct Etoken *toklist) static int ipmi_off(struct ipmi *ipmi) { - int ret, retries = 5; + int ret, retries = 7; ret = ipmi_op(ipmi, ST_STATUS, power_status); switch(ret) { @@ -392,12 +392,12 @@ ipmi_off(struct ipmi *ipmi) return ret; } - ret = ipmi_op(ipmi, ST_POWEROFF, power_off_complete); - if (ret != 0) - return ret; - while (retries>=0) { - sleep(5); + ret = ipmi_op(ipmi, ST_POWEROFF, power_off_complete); + if (ret != 0) + return ret; + + sleep(2); --retries; ret = ipmi_op(ipmi, ST_STATUS, power_status); @@ -422,7 +422,7 @@ ipmi_off(struct ipmi *ipmi) static int ipmi_on(struct ipmi *ipmi) { - int ret, retries = 5; + int ret, retries = 7; ret = ipmi_op(ipmi, ST_STATUS, power_status); switch(ret) { @@ -434,12 +434,12 @@ ipmi_on(struct ipmi *ipmi) return ret; } - ret = ipmi_op(ipmi, ST_POWERON, power_on_complete); - if (ret != 0) - return ret; - while (retries>=0) { - sleep(5); + ret = ipmi_op(ipmi, ST_POWERON, power_on_complete); + if (ret != 0) + return ret; + + sleep(2); --retries; ret = ipmi_op(ipmi, ST_STATUS, power_status);