From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28716 invoked by alias); 8 Jun 2009 12:51:50 -0000 Received: (qmail 28709 invoked by alias); 8 Jun 2009 12:51:50 -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: fence-agents: master - fence_agents: #501586 - fence agents fails with pexpect exception To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: fence-agents.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 40d44a7dee64cfce418336b1257639d2c1a93a5e X-Git-Newrev: 8295703337b41907738c5b3f7aae7d741ce69a4e From: =?utf-8?q?Marek_Gr=C3=A1c?= Message-Id: <20090608125120.B8781120197@lists.fedorahosted.org> Date: Mon, 08 Jun 2009 12:51: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/msg00483.txt.bz2 Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=8295703337b41907738c5b3f7aae7d741ce69a4e Commit: 8295703337b41907738c5b3f7aae7d741ce69a4e Parent: 40d44a7dee64cfce418336b1257639d2c1a93a5e Author: Marek 'marx' Grac AuthorDate: Mon Jun 8 14:47:38 2009 +0200 Committer: Marek 'marx' Grac CommitterDate: Mon Jun 8 14:47:38 2009 +0200 fence_agents: #501586 - fence agents fails with pexpect exception try / except added to every fence agent where we try to exit using 'logout' functions. This happends after fencing was succesfull so it should not be a problem if it fails. --- fence/agents/alom/fence_alom.py | 9 +++++++-- fence/agents/bladecenter/fence_bladecenter.py | 9 +++++++-- fence/agents/drac/fence_drac5.py | 9 +++++++-- fence/agents/ldom/fence_ldom.py | 9 +++++++-- fence/agents/lpar/fence_lpar.py | 9 +++++++-- fence/agents/rsa/fence_rsa.py | 9 +++++++-- fence/agents/virsh/fence_virsh.py | 9 +++++++-- fence/agents/wti/fence_wti.py | 9 +++++++-- 8 files changed, 56 insertions(+), 16 deletions(-) diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py index e1632cc..0ad5082 100644 --- a/fence/agents/alom/fence_alom.py +++ b/fence/agents/alom/fence_alom.py @@ -64,8 +64,13 @@ def main(): fence_action(conn, options, set_power_status, get_power_status,None) # Logout from system - conn.sendline("logout") - conn.close() + try: + conn.sendline("logout") + conn.close() + except exceptions.OSError: + pass + except pexpect.ExceptionPexpect: + pass if __name__ == "__main__": main() diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index f8882a0..ae0f37a 100644 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -112,8 +112,13 @@ def main(): ## ## Logout from system ###### - conn.send("exit\r\n") - conn.close() + try: + conn.send("exit\r\n") + conn.close() + except exceptions.OSError: + pass + except pexpect.ExceptionPexpect: + pass if __name__ == "__main__": main() diff --git a/fence/agents/drac/fence_drac5.py b/fence/agents/drac/fence_drac5.py index bffd4f2..ef105d5 100755 --- a/fence/agents/drac/fence_drac5.py +++ b/fence/agents/drac/fence_drac5.py @@ -117,8 +117,13 @@ def main(): ## ## Logout from system ###### - conn.sendline("exit") - conn.close() + try: + conn.sendline("exit") + conn.close() + except exceptions.OSError: + pass + except pexpect.ExceptionPexpect: + pass if __name__ == "__main__": main() diff --git a/fence/agents/ldom/fence_ldom.py b/fence/agents/ldom/fence_ldom.py index 683e54f..4839faa 100644 --- a/fence/agents/ldom/fence_ldom.py +++ b/fence/agents/ldom/fence_ldom.py @@ -107,8 +107,13 @@ def main(): ## ## Logout from system ###### - conn.sendline("logout") - conn.close() + try: + conn.sendline("logout") + conn.close() + except exceptions.OSError: + pass + except pexpect.ExceptionPexpect: + pass if __name__ == "__main__": main() diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py index c9c9fe7..faba923 100644 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -165,8 +165,13 @@ def main(): ## ## Logout from system ###### - conn.send("quit\r\n") - conn.close() + try: + conn.send("quit\r\n") + conn.close() + except exceptions.OSError: + pass + except pexpect.ExceptionPexpect: + pass if __name__ == "__main__": main() diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py index 8683e38..d6b3d38 100644 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -64,8 +64,13 @@ def main(): ## ## Logout from system ###### - conn.sendline("exit") - conn.close() + try: + conn.sendline("exit") + conn.close() + except exceptions.OSError: + pass + except pexpect.ExceptionPexpect: + pass if __name__ == "__main__": main() diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py index 3eeb4be..bbb88ec 100644 --- a/fence/agents/virsh/fence_virsh.py +++ b/fence/agents/virsh/fence_virsh.py @@ -82,8 +82,13 @@ def main(): fence_action(conn, options, set_power_status, get_power_status, get_outlets_status) ## Logout from system - conn.sendline("quit") - conn.close() + try: + conn.sendline("quit") + conn.close() + except exceptions.OSError: + pass + except pexpect.ExceptionPexpect: + pass if __name__ == "__main__": main() diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index 7ef5868..98b1d49 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -119,8 +119,13 @@ def main(): ## ## Logout from system ###### - conn.send("/X"+"\r\n") - conn.close() + try: + conn.send("/X"+"\r\n") + conn.close() + except exceptions.OSError: + pass + except pexpect.ExceptionPexpect: + pass if __name__ == "__main__": main()