From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17291 invoked by alias); 21 May 2009 08:56:28 -0000 Received: (qmail 17284 invoked by alias); 21 May 2009 08:56:27 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.1 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: RHEL4 - fence_apc: #501890 - fence_apc fails with pexpect exception To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL4 X-Git-Reftype: branch X-Git-Oldrev: e4a4744a154a6acaf41579f99c0b04be447b8182 X-Git-Newrev: 874205aa70b58a069d3f25b344bb4b7b7a644232 From: =?utf-8?q?Marek_Gr=C3=A1c?= Message-Id: <20090521085602.079C712035F@lists.fedorahosted.org> Date: Thu, 21 May 2009 08:56: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/msg00349.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=874205aa70b58a069d3f25b344bb4b7b7a644232 Commit: 874205aa70b58a069d3f25b344bb4b7b7a644232 Parent: e4a4744a154a6acaf41579f99c0b04be447b8182 Author: Marek 'marx' Grac AuthorDate: Thu May 21 10:52:51 2009 +0200 Committer: Marek 'marx' Grac CommitterDate: Thu May 21 10:52:51 2009 +0200 fence_apc: #501890 - fence_apc fails with pexpect exception --- fence/agents/apc/fence_apc.py | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index 6d91996..b0cbfcc 100755 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -199,11 +199,20 @@ def main(): conn = fence_login(options) fence_action(conn, options, set_power_status, get_power_status) - ## - ## Logout from system - ###### - conn.sendline("4") - conn.close() + ## + ## Logout from system + ## + ## In some special unspecified cases it is possible that + ## connection will be closed before we run close(). This is not + ## a problem because everything is checked before. + ###### + try: + conn.sendline("4") + conn.close() + except exceptions.OSError: + pass + except pexpect.ExceptionPexpect: + pass if __name__ == "__main__": main()