Commit 705c73b6 authored by unknown's avatar unknown

Verbose printouts added


mysql-test/lib/mtr_process.pl:
  Printouts in mtr_ping_port, telling what port was pinged nad if it was free or not
parent 37c8042c
...@@ -629,6 +629,10 @@ sub mtr_check_stop_servers ($) { ...@@ -629,6 +629,10 @@ sub mtr_check_stop_servers ($) {
{ {
mtr_error("we could not kill or clean up all processes"); mtr_error("we could not kill or clean up all processes");
} }
else
{
mtr_verbose("All ports where free, continuing");
}
} }
} }
...@@ -736,16 +740,22 @@ sub mtr_ping_with_timeout($) { ...@@ -736,16 +740,22 @@ sub mtr_ping_with_timeout($) {
foreach my $srv ( @$spec ) foreach my $srv ( @$spec )
{ {
$res= 1; # We are optimistic $res= 1; # We are optimistic
if ( $srv->{'pid'} and if ( $srv->{'pid'} and defined $srv->{'port'} )
defined $srv->{'port'} and mtr_ping_port($srv->{'port'}) )
{ {
mtr_verbose("waiting for process $srv->{'pid'} to stop ". if ( mtr_ping_port($srv->{'port'}) )
"using port $srv->{'port'}"); {
mtr_verbose("waiting for process $srv->{'pid'} to stop ".
"using port $srv->{'port'}");
# Millisceond sleep emulated with select # Millisceond sleep emulated with select
select(undef, undef, undef, (0.1)); select(undef, undef, undef, (0.1));
$res= 0; $res= 0;
next TIME; next TIME;
}
else
{
# Process was not using port
}
} }
} }
last; # If we got here, we are done last; # If we got here, we are done
...@@ -845,6 +855,8 @@ sub stop_reap_all { ...@@ -845,6 +855,8 @@ sub stop_reap_all {
sub mtr_ping_port ($) { sub mtr_ping_port ($) {
my $port= shift; my $port= shift;
mtr_verbose("mtr_ping_port: $port");
my $remote= "localhost"; my $remote= "localhost";
my $iaddr= inet_aton($remote); my $iaddr= inet_aton($remote);
if ( ! $iaddr ) if ( ! $iaddr )
...@@ -860,10 +872,12 @@ sub mtr_ping_port ($) { ...@@ -860,10 +872,12 @@ sub mtr_ping_port ($) {
if ( connect(SOCK, $paddr) ) if ( connect(SOCK, $paddr) )
{ {
close(SOCK); # FIXME check error? close(SOCK); # FIXME check error?
mtr_verbose("USED");
return 1; return 1;
} }
else else
{ {
mtr_verbose("FREE");
return 0; return 0;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment