xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-09-06 10:18:20 +00:00
Code Issues Releases Wiki Activity

Have FPC and similar 'neverwait' in the context of reseat

Browse Source 
Back out previous attempt, as it didn't work.
This commit is contained in:
Jarrod Johnson
2017-06-13 16:50:08 -04:00
parent 82bdeae701
commit eda85df39d
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-server/lib/perl/xCAT/IPMI.pm
View File

@@ -194,7 +194,6 @@ sub login {
$self->{onlogon} = $args{callback};
$self->{onlogon_args} = $args{callback_args};
$self->{logontries} = 5;
$self->{nowait} = 1;
$self->get_channel_auth_cap();
}
@@ -344,7 +343,6 @@ sub admin_level_set {
$self->{onlogon}->($errtxt, $self->{onlogon_args});
} else {
$self->{logged} = 1;
$self->{nowait} = 0;
$self->{onlogon}->("SUCCESS", $self->{onlogon_args});
}
}
@@ -1059,7 +1057,7 @@ sub sendpayload {
#push integrity data
}
}
unless ($args{nowait} or $self->{nowait}) { #if nowait indicated, the packet will be sent regardless of maxpending
unless ($args{nowait} or $self->{nowait} or $self->{neverwait}) { #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

2
xCAT-server/lib/xcat/plugins/ipmi.pm
View File

@@ -2170,7 +2170,7 @@ sub reseat_node {
data => [ $sessdata->{slotnumber}, 2 ],
callback => \&fpc_node_reseat_complete, callback_args => $sessdata);
} else {
$sessdata->{fpcipmisession} = xCAT::IPMI->new(bmc => $mpent->{mpa}, userid => $nodeuser, password => $nodepass);
$sessdata->{fpcipmisession} = xCAT::IPMI->new(bmc => $mpent->{mpa}, userid => $nodeuser, password => $nodepass, neverwait => 1);
$fpcsessions{$mpent->{mpa}} = $sessdata->{fpcipmisession};
$sessdata->{fpcipmisession}->login(callback => \&fpc_node_reseat, callback_args => $sessdata);
}