Merge lp:~tplavcic/percona-server/ps-bld-228-5.1 into lp:percona-server/5.1

[Tomislav Plavcic]

Debian init script (start) has hardcoded wait for 14sec and if the server is not pingable in that time it fails - which is not good in some cases.
Change has been made to wait forever and exit if server responds to ping and also after first 10 sec start to check for pid also and if it doesn't exists then we assume server died and fail.

Testing has been done for 5.5 and 5.6 using packages from main repo and just replaced with the new init script.

PS 5.5 - ubuntu 14.04
= looks ok
=====================
vagrant@t-ubuntu14:~$ sudo /etc/init.d/mysql start
 * Starting MySQL (Percona Server) database server mysqld
   ...done.
 * Checking for corrupt, not cleanly closed and upgrade needing tables.
vagrant@t-ubuntu14:~$ mysql
Welcome to the MySQL monitor. Commands end with ; or \g.
Your MySQL connection id is 37
Server version: 5.5.40-36.1 Percona Server (GPL), Release 36.1, Revision 707

Copyright (c) 2009-2014 Percona LLC and/or its affiliates
Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.

Oracle is a registered trademark of Oracle Corporation and/or its
affiliates. Other names may be trademarks of their respective
owners.

Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.

mysql> quit;
Bye
vagrant@t-ubuntu14:~$ sudo /etc/init.d/mysql stop
 * Stopping MySQL (Percona Server) mysqld
   ...done.

PS 5.5 - ubuntu 14.04 - simulated server not started by commenting mysqld_safe
= script waited 10 sec to check for pid and then failed
==============================================================================
vagrant@t-ubuntu14:~$ sudo /etc/init.d/mysql start
 * Starting MySQL (Percona Server) database server mysqld
   ...fail!
vagrant@t-ubuntu14:~$ mysql
ERROR 2002 (HY000): Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' (2)

PS 5.6 - ubuntu 14.04
= looks ok
=====================
vagrant@t-ubuntu14:~$ sudo /etc/init.d/mysql start
 * Starting MySQL (Percona Server) database server mysqld
   ...done.
 * Checking for corrupt, not cleanly closed and upgrade needing tables.
vagrant@t-ubuntu14:~$ mysql
Welcome to the MySQL monitor. Commands end with ; or \g.
Your MySQL connection id is 45
Server version: 5.6.21-70.1 Percona Server (GPL), Release 70.1, Revision 698

Copyright (c) 2009-2014 Percona LLC and/or its affiliates
Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.

Oracle is a registered trademark of Oracle Corporation and/or its
affiliates. Other names may be trademarks of their respective
owners.

Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.

mysql> quit;
Bye
vagrant@t-ubuntu14:~$ sudo /etc/init.d/mysql stop
 * Stopping MySQL (Percona Server) mysqld
   ...done.

PS 5.6 - ubuntu 14.04 - simulated server not started by commenting mysqld_safe
= script waited 10 sec to check for pid and then failed
==============================================================================
vagrant@t-ubuntu14:~$ sudo /etc/init.d/mysql start
 * Starting MySQL (Percona Server) database server mysqld
   ...fail!
vagrant@t-ubuntu14:~$ mysql
ERROR 2002 (HY000): Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' (2)

[Laurynas Biveinis (laurynas-biveinis)]

Was 5.1 tested too? The description mentions 5.5 and 5.6

review: Needs Information

[Tomislav Plavcic (tplavcic)]

Not initially, but I tested now - results look the same as for 5.5/5.6 (see below):

# normal startup (ubuntu precise)
= looks ok
vagrant@t-ubuntu1204-64:/vagrant$ sudo /etc/init.d/mysql start
 * /etc/init.d/mysql: WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz
 * Starting MySQL (Percona Server) mysqld
   ...done.
 * Checking for corrupt, not cleanly closed and upgrade needing tables.
vagrant@t-ubuntu1204-64:/vagrant$ mysql
ERROR 1045 (28000): Access denied for user 'vagrant'@'localhost' (using password: NO)
vagrant@t-ubuntu1204-64:/vagrant$ mysql -uroot
Welcome to the MySQL monitor. Commands end with ; or \g.
Your MySQL connection id is 36
Server version: 5.1.73-14.12 Percona Server (GPL), 14.12, Revision 624

Copyright (c) 2009-2013 Percona LLC and/or its affiliates
Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.

Oracle is a registered trademark of Oracle Corporation and/or its
affiliates. Other names may be trademarks of their respective
owners.

Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.

mysql> quit
Bye
vagrant@t-ubuntu1204-64:/vagrant$ sudo /etc/init.d/mysql stop
 * Stopping MySQL (Percona Server) mysqld
   ...done.

# commented mysqld_safe in the script
= script waited for 10s and then failed when no pid found
vagrant@t-ubuntu1204-64:/vagrant$ sudo /etc/init.d/mysql start
 * /etc/init.d/mysql: WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz
 * Starting MySQL (Percona Server) mysqld
   ...fail!

vagrant@t-ubuntu1204-64:/vagrant$ mysql -uroot
ERROR 2002 (HY000): Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' (2)

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'build/debian/percona-server-server-5.1.mysql.init'
--- build/debian/percona-server-server-5.1.mysql.init	2011-04-11 10:39:39 +0000
+++ build/debian/percona-server-server-5.1.mysql.init	2014-12-05 10:43:42 +0000
@@ -103,10 +103,16 @@
 	   log_end_msg 0
 	else
   	    /usr/bin/mysqld_safe > /dev/null 2>&1 &
-	    # 6s was reported in #352070 to be too few when using ndbcluster
-	    for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14; do
+	    dead_check_counter=0
+	    while true; do
                 sleep 1
 	        if mysqld_status check_alive nowarn ; then break; fi
+	        # wait 10sec before start checking if pid file created or server is dead
+	        if [ $dead_check_counter -lt 10 ]; then
+	            dead_check_counter=$(( dead_check_counter + 1 ))
+	        else
+	            if mysqld_status check_dead nowarn; then break; fi
+	        fi
 		log_progress_msg "."
 	    done
 	    if mysqld_status check_alive warn; then