cluster: STABLE3 - fence_lpar: #504705 - fence_lpar: lssyscfg command on HMC can take longer than SHELL_TIMEOUT

["Marek Grác" <marx@fedoraproject.org>]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=171e56f34f11082b852490392efa471591320195
Commit:        171e56f34f11082b852490392efa471591320195
Parent:        a9ac1e635c559b46512cf4251fe71c015bb6d70f
Author:        Marek 'marx' Grac <mgrac@redhat.com>
AuthorDate:    Fri Jun 12 12:23:55 2009 +0200
Committer:     Marek 'marx' Grac <mgrac@redhat.com>
CommitterDate: Fri Jun 12 12:25:57 2009 +0200

fence_lpar: #504705 - fence_lpar: lssyscfg command on HMC can take longer than SHELL_TIMEOUT

The lssyscfg command issued to the HMC by fence_lpar to get the status of the
LPAR can take longer than SHELL_TIMEOUT, 3 seconds.  This results in fencing
failures which could be avoided if fence_lpar waited longer for the HMC to
respond to the command.
---
 fence/agents/lpar/fence_lpar.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py
index 0ac96c1..b0086d8 100644
--- a/fence/agents/lpar/fence_lpar.py
+++ b/fence/agents/lpar/fence_lpar.py
@@ -24,7 +24,7 @@ def get_power_status(conn, options):
 	if options["-H"] == "3":
 		try:
 			conn.send("lssyscfg -r lpar -m " + options["-s"] + " -n " + options["-n"] + " -F name,state\n")
-			conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
+			conn.log_expect(options, options["-c"], POWER_TIMEOUT)
 		except pexpect.EOF:
 			fail(EC_CONNECTION_LOST)
 		except pexpect.TIMEOUT:
@@ -37,7 +37,7 @@ def get_power_status(conn, options):
 	elif options["-H"] == "4":
 		try:
 			conn.send("lssyscfg -r lpar -m "+ options["-s"] +" --filter 'lpar_names=" + options["-n"] + "'\n")
-			conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
+			conn.log_expect(options, options["-c"], POWER_TIMEOUT)
 		except pexpect.EOF:
 			fail(EC_CONNECTION_LOST)
 		except pexpect.TIMEOUT: