public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: "Marek Grác" <marx@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: STABLE2 - fence_agents: #501586 - fence agents fails with pexpect exception Date: Mon, 08 Jun 2009 12:00:00 -0000 [thread overview] Message-ID: <20090608115947.06984120197@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7b69341ac1c82feba990ccefb602726920574da4 Commit: 7b69341ac1c82feba990ccefb602726920574da4 Parent: 5c794a214d3cec756cb3d2dc539b098c96e03bd6 Author: Marek 'marx' Grac <mgrac@redhat.com> AuthorDate: Mon Jun 8 13:51:21 2009 +0200 Committer: Marek 'marx' Grac <mgrac@redhat.com> 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()
reply other threads:[~2009-06-08 12:00 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090608115947.06984120197@lists.fedorahosted.org \ --to=marx@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).