Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MDEV-35208 mtr correct behaviour of --port-base #3586

Open
wants to merge 1 commit into
base: 10.5
Choose a base branch
from
Open

MDEV-35208 mtr correct behaviour of --port-base #3586

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions mysql-test/mysql-test-run.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1474,7 +1474,6 @@ sub command_line_setup {
mtr_warning ("Port base $opt_port_base rounded down to multiple of 10");
$opt_port_base-= $rem;
}
$opt_build_thread= $opt_port_base / 10 - 1000;
}

# --------------------------------------------------------------------------
Expand Down Expand Up @@ -1702,11 +1701,6 @@ sub command_line_setup {
# an environment variable can be used to control all ports. A small
# number is to be used, 0 - 16 or similar.
#
# Note the MASTER_MYPORT has to be set the same in all 4.x and 5.x
# versions of this script, else a 4.0 test run might conflict with a
# 5.1 test run, even if different MTR_BUILD_THREAD is used. This means
# all port numbers might not be used in this version of the script.
#
# Also note the limitation of ports we are allowed to hand out. This
# differs between operating systems and configuration, see
# http://www.ncftp.com/ncftpd/doc/misc/ephemeral_ports.html
Expand All @@ -1717,10 +1711,14 @@ ($)

if ( lc($opt_build_thread) eq 'auto' ) {
my $found_free = 0;
$build_thread = 300; # Start attempts from here
my $build_thread_upper = $build_thread + ($opt_parallel > 1500
? 3000
: 2 * $opt_parallel) + 300;
if ($opt_port_base eq "auto") {
$build_thread = 16000;
} else {
$build_thread = $opt_port_base;
}
$build_thread += ($thread - 1) * $opt_port_group_size;
my $build_thread_upper = $build_thread + $opt_parallel * 2;

while (! $found_free)
{
$build_thread= mtr_get_unique_id($build_thread, $build_thread_upper);
Expand All @@ -1737,7 +1735,7 @@ ($)
}
else
{
$build_thread = $opt_build_thread + $thread - 1;
$build_thread = $opt_port_base + $thread - 1;
if (! check_ports_free($build_thread)) {
# Some port was not free(which one has already been printed)
mtr_error("Some port(s) was not free")
Expand All @@ -1746,7 +1744,7 @@ ($)
$ENV{MTR_BUILD_THREAD}= $build_thread;

# Calculate baseport
$baseport= $build_thread * $opt_port_group_size + 10000;
$baseport= $build_thread;
if ( $baseport < 5001 or $baseport + $opt_port_group_size >= 32767 )
{
mtr_error("MTR_BUILD_THREAD number results in a port",
Expand Down Expand Up @@ -2943,7 +2941,7 @@ ($)
sub check_ports_free ($)
{
my $bthread= shift;
my $portbase = $bthread * $opt_port_group_size + 10000;
my $portbase = $bthread;
for ($portbase..$portbase+($opt_port_group_size-1)){
if (mtr_ping_port($_)){
mtr_report(" - 'localhost:$_' was not free");
Expand Down