mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
WL#4189 mtr, hang if worker fails before connected to server
This commit is contained in:
@ -612,6 +612,16 @@ sub run_worker ($) {
|
|||||||
|
|
||||||
$SIG{INT}= sub { exit(1); };
|
$SIG{INT}= sub { exit(1); };
|
||||||
|
|
||||||
|
# Connect to server
|
||||||
|
my $server = new IO::Socket::INET
|
||||||
|
(
|
||||||
|
PeerAddr => 'localhost',
|
||||||
|
PeerPort => $server_port,
|
||||||
|
Proto => 'tcp'
|
||||||
|
);
|
||||||
|
mtr_error("Could not connect to server at port $server_port: $!")
|
||||||
|
unless $server;
|
||||||
|
|
||||||
# --------------------------------------------------------------------------
|
# --------------------------------------------------------------------------
|
||||||
# Set worker name
|
# Set worker name
|
||||||
# --------------------------------------------------------------------------
|
# --------------------------------------------------------------------------
|
||||||
@ -634,16 +644,6 @@ sub run_worker ($) {
|
|||||||
|
|
||||||
environment_setup();
|
environment_setup();
|
||||||
|
|
||||||
# Connect to server
|
|
||||||
my $server = new IO::Socket::INET
|
|
||||||
(
|
|
||||||
PeerAddr => 'localhost',
|
|
||||||
PeerPort => $server_port,
|
|
||||||
Proto => 'tcp'
|
|
||||||
);
|
|
||||||
mtr_error("Could not connect to server at port $server_port: $!")
|
|
||||||
unless $server;
|
|
||||||
|
|
||||||
# Read hello from server which it will send when shared
|
# Read hello from server which it will send when shared
|
||||||
# resources have been setup
|
# resources have been setup
|
||||||
my $hello= <$server>;
|
my $hello= <$server>;
|
||||||
|
Reference in New Issue
Block a user