From 5b3f37205611698633ffc5e88a59e2e4eae7d4dd Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Sun, 16 Sep 2012 03:56:48 +0000
Subject: [PATCH] Eliminate instances of recursive timedouts really ruining our
 day in IPMI

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@13818 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/perl/xCAT/IPMI.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/perl/xCAT/IPMI.pm b/xCAT-server/lib/perl/xCAT/IPMI.pm
index 974181c0d..e86a60481 100644
--- a/xCAT-server/lib/perl/xCAT/IPMI.pm
+++ b/xCAT-server/lib/perl/xCAT/IPMI.pm
@@ -427,12 +427,14 @@ sub waitforrsp {
 
 sub timedout {
     my $self = shift;
+    $self->{nowait}=1;
     $self->{timeout} = $self->{timeout}*2;
     if ($self->{timeout} > 7) { #giveup, really
         $self->{timeout}=$initialtimeout;
         my $rsp={};
         $rsp->{error} = "timeout";
         $self->{ipmicallback}->($rsp,$self->{ipmicallback_args});
+    	$self->{nowait}=0;
         return;
     }
     if ($self->{sessionestablishmentcontext} == STATE_OPENSESSION) { #in this particular case, we want to craft a new rmcp session request with a new client side session id, to aid in distinguishing retry from new
@@ -444,6 +446,7 @@ sub timedout {
     } else {
     	$self->sendpayload(%{$self->{pendingargs}},nowait=>1); #do not induce the xmit to wait for packets, just spit it out.  timedout is in a wait-for-packets loop already, so it's fine
     }
+   $self->{nowait}=0;
 }
 sub route_ipmiresponse {
     my $sockaddr=shift;
@@ -878,7 +881,7 @@ sub sendpayload {
             #push integrity data
             }
     }
-    unless ($args{nowait}) { #if nowait indicated, the packet will be sent regardless of maxpending
+    unless ($args{nowait} or $self->{nowait}) { #if nowait indicated, the packet will be sent regardless of maxpending
     			     #primary use case would be retries that should represent no delta to pending sessions in aggregate and therefore couldn't exceed maxpending anywy
 			     #if we did do this on timedout, waitforrsp may recurse, which is a complicated issue.  Theoretically, if waitforrsp protected itself, it 
 			     #would act the same, but best be explicit about nowait if practice does not match theory