b52a9bbc4a
Lately I experienced a great problem with the MTR port calculations. Most (but not all) of the testsuite runs ended immediatelly with: | mysql-test-run: *** ERROR: MTR_BUILD_THREAD number results in a port outside 5001 - 32767 (*****) where the: | (*****) at the end is a string that contains the numbers used for the calculations. The numbers were totally off, without any good reason why the calculation work that way. I've reached MariaDB upstream and this patch was proposed in the ZULIP thread: https://mariadb.zulipchat.com/#narrow/stream/118759-general/topic/MTR.20--port-base The upstream is hesitatnt to merge it righ away, but as far as I've tested, it works well for me and what's most important, it unblocks the package builds.
71 lines
2.8 KiB
Diff
71 lines
2.8 KiB
Diff
diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl
|
|
index 594e052a16e..6a274b2d597 100755
|
|
--- a/mysql-test/mariadb-test-run.pl
|
|
+++ b/mysql-test/mariadb-test-run.pl
|
|
@@ -1491,7 +1491,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;
|
|
}
|
|
|
|
# --------------------------------------------------------------------------
|
|
@@ -1719,11 +1718,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
|
|
@@ -1734,10 +1728,14 @@ sub set_build_thread_ports($) {
|
|
|
|
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 = 15000;
|
|
+ } 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);
|
|
@@ -1754,7 +1752,7 @@ sub set_build_thread_ports($) {
|
|
}
|
|
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")
|
|
@@ -1763,7 +1761,7 @@ sub set_build_thread_ports($) {
|
|
$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",
|
|
@@ -2968,7 +2966,7 @@ sub kill_leftovers ($) {
|
|
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");
|