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

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

[Marek Grác]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6309092d9f07832d9a2713be70ff4a7c0857fb45
Commit:        6309092d9f07832d9a2713be70ff4a7c0857fb45
Parent:        8b890f7fa7da3143c132d514ce83fafff30b69b1
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:27:09 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 91c3d6a..6e0d848 100755
--- a/fence/agents/lpar/fence_lpar.py
+++ b/fence/agents/lpar/fence_lpar.py
@@ -25,7 +25,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:
@@ -38,7 +38,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: