List:Commits« Previous MessageNext Message »
From:ingo Date:December 29 2005 10:02am
Subject:bk commit into 5.1 tree (ingo:1.2008)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of mydev. When mydev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2008 05/12/29 11:02:07 ingo@stripped +2 -0
  Merge mysql.com:/home/mydev/mysql-5.0-bug15591
  into  mysql.com:/home/mydev/mysql-5.1-bug15591

  sql/mysqld.cc
    1.509 05/12/29 11:02:03 ingo@stripped +2 -3
    Bug#15591 - Occasional test suite abort due to port in use
    Manual merge.

  mysql-test/mysql-test-run.sh
    1.284 05/12/29 10:55:03 ingo@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-bug15591/RESYNC

--- 1.283/mysql-test/mysql-test-run.sh	2005-12-22 05:10:56 +01:00
+++ 1.284/mysql-test/mysql-test-run.sh	2005-12-29 10:55:03 +01:00
@@ -1273,6 +1273,7 @@
   	    --server-id=$id  \
           --basedir=$MY_BASEDIR \
           --port=$this_master_myport \
+          --port-open-timeout=380 \
           --local-infile \
           --exit-info=256 \
           --core \
@@ -1298,6 +1299,7 @@
           --server-id=$id --rpl-recovery-rank=1 \
           --basedir=$MY_BASEDIR --init-rpl-role=master \
           --port=$this_master_myport \
+          --port-open-timeout=380 \
           --local-infile \
           --datadir=$MASTER_MYDDIR$1 \
           --pid-file=$MASTER_MYPID$1 \
@@ -1431,6 +1433,7 @@
           --datadir=$slave_datadir \
           --pid-file=$slave_pid \
           --port=$slave_port \
+          --port-open-timeout=380 \
           --socket=$slave_sock \
           --character-sets-dir=$CHARSETSDIR \
           --default-character-set=$CHARACTER_SET \

--- 1.508/sql/mysqld.cc	2005-12-28 03:55:55 +01:00
+++ 1.509/sql/mysqld.cc	2005-12-29 11:02:03 +01:00
@@ -472,6 +472,7 @@
 static bool calling_initgroups= FALSE; /* Used in SIGSEGV handler. */
 #endif
 uint mysqld_port, test_flags, select_errors, dropping_tables, ha_open_options;
+uint mysqld_port_timeout;
 uint delay_key_write_options, protocol_version;
 uint lower_case_table_names;
 uint tc_heuristic_recover= 0;
@@ -1445,7 +1446,12 @@
   struct sockaddr_un	UNIXaddr;
 #endif
   int	arg=1;
+  int   ret;
+  uint  waited;
+  uint  this_wait;
+  uint  retry;
   DBUG_ENTER("network_init");
+  LINT_INIT(ret);
 
   set_ports();
 
@@ -1471,8 +1477,26 @@
     */
     (void) setsockopt(ip_sock,SOL_SOCKET,SO_REUSEADDR,(char*)&arg,sizeof(arg));
 #endif /* __WIN__ */
-    if (bind(ip_sock, my_reinterpret_cast(struct sockaddr *) (&IPaddr),
-	     sizeof(IPaddr)) < 0)
+    /*
+      Sometimes the port is not released fast enough when stopping and
+      restarting the server. This happens quite often with the test suite
+      on busy Linux systems. Retry to bind the address at these intervals:
+      Sleep intervals: 1, 2, 4,  6,  9, 13, 17, 22, ...
+      Retry at second: 1, 3, 7, 13, 22, 35, 52, 74, ...
+      Limit the sequence by mysqld_port_timeout (set --port-open-timeout=#).
+    */
+    for (waited= 0, retry= 1; ; retry++, waited+= this_wait)
+    {
+      if (((ret= bind(ip_sock, my_reinterpret_cast(struct sockaddr *) (&IPaddr),
+                      sizeof(IPaddr))) >= 0) ||
+          (socket_errno != EADDRINUSE) ||
+          (waited >= mysqld_port_timeout))
+        break;
+      sql_print_information("Retrying bind on TCP/IP port %u", mysqld_port);
+      this_wait= retry * retry / 3 + 1;
+      sleep(this_wait);
+    }
+    if (ret < 0)
     {
       DBUG_PRINT("error",("Got error: %d from bind",socket_errno));
       sql_perror("Can't start server: Bind on TCP/IP port");
@@ -4721,7 +4745,8 @@
   OPT_OLD_STYLE_USER_LIMITS,
   OPT_LOG_SLOW_ADMIN_STATEMENTS,
   OPT_TABLE_LOCK_WAIT_TIMEOUT,
-  OPT_PLUGIN_DIR
+  OPT_PLUGIN_DIR,
+  OPT_PORT_OPEN_TIMEOUT
 };
 
 
@@ -5334,6 +5359,10 @@
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"port", 'P', "Port number to use for connection.", (gptr*) &mysqld_port,
    (gptr*) &mysqld_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"port-open-timeout", OPT_PORT_OPEN_TIMEOUT,
+   "Maximum time in seconds to wait for the port to become free. "
+   "(Default: no wait)", (gptr*) &mysqld_port_timeout,
+   (gptr*) &mysqld_port_timeout, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"relay-log", OPT_RELAY_LOG,
    "The location and name to use for relay logs.",
    (gptr*) &opt_relay_logname, (gptr*) &opt_relay_logname, 0,
Thread
bk commit into 5.1 tree (ingo:1.2008)ingo29 Dec