From e61b6c3789fa3d77b08d3693800962c5858699db Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 3 May 2017 11:34:22 -0400 Subject: [PATCH] Implement timeout for session sharing When an ipmi session is shared, have waitforrsp have a specified timeout. --- xCAT-server/lib/perl/xCAT/IPMI.pm | 2 +- xCAT-server/lib/xcat/plugins/ipmi.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/perl/xCAT/IPMI.pm b/xCAT-server/lib/perl/xCAT/IPMI.pm index bd0b480c6..4b444ac48 100644 --- a/xCAT-server/lib/perl/xCAT/IPMI.pm +++ b/xCAT-server/lib/perl/xCAT/IPMI.pm @@ -472,7 +472,7 @@ sub subcmd { my $self = shift; my %args = @_; while ($self->{incommand}) { - $self->waitforrsp(); + $self->waitforrsp(timeout=>1); } $self->{incommand} = 1; diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm index 9bbecab53..fc10adc97 100644 --- a/xCAT-server/lib/xcat/plugins/ipmi.pm +++ b/xCAT-server/lib/xcat/plugins/ipmi.pm @@ -2326,7 +2326,7 @@ sub reseat_node { if (exists $fpcsessions{$mpent->{mpa}}) { $sessdata->{fpcipmisession} = $fpcsessions{$mpent->{mpa}}; until ($sessdata->{fpcipmisession}->{logged}) { - $sessdata->{fpcipmisession}->waitforrsp(); + $sessdata->{fpcipmisession}->waitforrsp(timeout=>1); } $sessdata->{fpcipmisession}->subcmd(netfn => 0x32, command => 0xa4, data => [ $sessdata->{slotnumber}, 2 ],