From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23998 invoked by alias); 8 Jun 2009 12:00:17 -0000 Received: (qmail 23991 invoked by alias); 8 Jun 2009 12:00:17 -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: cluster: STABLE2 - fence_agents: #501586 - fence agents fails with pexpect exception To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE2 X-Git-Reftype: branch X-Git-Oldrev: 5c794a214d3cec756cb3d2dc539b098c96e03bd6 X-Git-Newrev: 7b69341ac1c82feba990ccefb602726920574da4 From: =?utf-8?q?Marek_Gr=C3=A1c?= Message-Id: <20090608115947.06984120197@lists.fedorahosted.org> Date: Mon, 08 Jun 2009 12:00: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/msg00479.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7b69341ac1c82feba990ccefb602726920574da4 Commit: 7b69341ac1c82feba990ccefb602726920574da4 Parent: 5c794a214d3cec756cb3d2dc539b098c96e03bd6 Author: Marek 'marx' Grac AuthorDate: Mon Jun 8 13:51:21 2009 +0200 Committer: Marek 'marx' Grac CommitterDate: Mon Jun 8 13:56:42 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 b1d8dcc..baf9ace 100644 --- a/fence/agents/alom/fence_alom.py +++ b/fence/agents/alom/fence_alom.py @@ -62,8 +62,13 @@ def main(): fence_action(conn, options, set_power_status, get_power_status) # 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 4144b63..2d9a661 100644 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -82,8 +82,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 50482b1..a8b1add 100644 --- a/fence/agents/drac/fence_drac5.py +++ b/fence/agents/drac/fence_drac5.py @@ -92,8 +92,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 8b2c210..44c2f63 100644 --- a/fence/agents/ldom/fence_ldom.py +++ b/fence/agents/ldom/fence_ldom.py @@ -94,8 +94,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 a7ad68a..64ff9be 100755 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -115,8 +115,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 ca36eff..af2a780 100644 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -63,8 +63,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 7387d11..9a10e9d 100644 --- a/fence/agents/virsh/fence_virsh.py +++ b/fence/agents/virsh/fence_virsh.py @@ -79,8 +79,13 @@ def main(): fence_action(conn, options, set_power_status, get_power_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 baf637a..569867f 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -109,8 +109,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()