arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-Fix problem where blade and ipmi could at scale drop output and prematurely disconnect from client

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1360 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2008-05-12 23:36:47 +00:00
parent dd3e24ec7b
commit a96297af14
2 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xCAT-server-2.0/lib/xcat/plugins/blade.pm
View File

@ -207,6 +207,18 @@ sub resetmp {
#}
}
sub waitforack {
my $sock = shift;
my $select = new IO::Select;
$select->add($sock);
my $str;
if ($select->can_read(10)) { # Continue after 10 seconds, even if not acked...
if ($str = <$sock>) {
} else {
$select->remove($sock); #Block until parent acks data
}
}
}
sub walkelog {
my $session = shift;
my $oid = shift;
@ -1501,7 +1513,7 @@ sub process_request {
$children++;
my $cfd;
my $pfd;
pipe $cfd, $pfd;
socketpair($pfd, $cfd,AF_UNIX,SOCK_STREAM,PF_UNSPEC) or die "socketpair: $!";
$cfd->autoflush(1);
$pfd->autoflush(1);
my $cpid = xCAT::Utils->xfork;
@ -1515,7 +1527,7 @@ sub process_request {
close ($pfd);
$sub_fds->add($cfd);
}
while ($children > 0) {
while ($sub_fds->count > 0 or $children > 0) {
forward_data($callback,$sub_fds);
}
while (forward_data($callback,$sub_fds)) {}
@ -1901,6 +1913,7 @@ sub forward_data {
while ($data !~ /ENDOFFREEZE6sK4ci/) {
$data .= <$rfh>;
}
print $rfh "ACK\n";
my $responses=thaw($data);
foreach (@$responses) {
$callback->($_);
@ -1944,6 +1957,7 @@ sub dompa {
print $out freeze([\%err]);
print $out "\nENDOFFREEZE6sK4ci\n";
yield;
waitforack($out);
return 1,"General error establishing SNMP communication";
}
my $tmp = $session->get([$mmprimoid.".1"]);
@ -1985,6 +1999,8 @@ sub dompa {
}
print $out freeze([\%output]);
print $out "\nENDOFFREEZE6sK4ci\n";
yield;
waitforack($out);
}
yield;
}

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

@ -298,6 +298,18 @@ struct FRU => {
value => '$',
};
sub waitforack {
my $sock = shift;
my $select = new IO::Select;
$select->add($sock);
my $str;
if ($select->can_read(10)) { # Continue after 10 seconds, even if not acked...
if ($str = <$sock>) {
} else {
$select->remove($sock); #Block until parent acks data
}
}
}
sub translate_sensor {
my $reading = shift;
my $sdr = shift;
@ -4655,8 +4667,10 @@ sub process_request {
$children++;
my $cfd;
my $pfd;
pipe $cfd, $pfd;
my $child = xCAT::Utils->xfork();
socketpair($pfd, $cfd,AF_UNIX,SOCK_STREAM,PF_UNSPEC) or die "socketpair: $!";
$cfd->autoflush(1);
$pfd->autoflush(1);
my $child = xCAT::Utils->xfork();
unless (defined $child) { die "Fork failed" };
if ($child == 0) {
close($cfd);
@ -4668,7 +4682,7 @@ sub process_request {
close ($pfd);
$sub_fds->add($cfd)
}
while ($children > 0) {
while ($sub_fds->count > 0 and $children > 0) {
forward_data($callback,$sub_fds);
}
while (forward_data($callback,$sub_fds)) {} #Make sure they get drained, this probably is overkill but shouldn't hurt
@ -4685,6 +4699,7 @@ sub forward_data { #unserialize data from pipe, chunk at a time, use magic to de
while ($data !~ /ENDOFFREEZE6sK4ci/) {
$data .= <$rfh>;
}
print $rfh "ACK\n";
my $responses=thaw($data);
foreach (@$responses) {
$callback->($_);
@ -4735,6 +4750,8 @@ sub donode {
#push @outhashes,\%output; #Save everything for the end, don't know how to be slicker with Storable and a pipe
print $outfd freeze([\%output]);
print $outfd "\nENDOFFREEZE6sK4ci\n";
yield;
waitforack($outfd);
}
yield;
#my $msgtoparent=freeze(\@outhashes);