cluster: RHEL5 - fence_ipmi: Increased number of retries to action

cluster: RHEL5 - fence_ipmi: Increased number of retries to action

[Jan Friesse]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0b4e73be76b08553f4d22b6ba044e2d5f7c8bfae
Commit:        0b4e73be76b08553f4d22b6ba044e2d5f7c8bfae
Parent:        2a217af6683e519769dd96ff81d84c09fc09d499
Author:        Jan Friesse <jfriesse@redhat.com>
AuthorDate:    Wed Feb 11 10:47:24 2009 +0100
Committer:     Jan Friesse <jfriesse@redhat.com>
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);