Merge lp:~sergei.glushchenko/percona-xtrabackup/2.1-xb-bug1326224 into lp:percona-xtrabackup/2.1

[Sergei Glushchenko]

Introduce better synchronization for kill_long_selects test based on querying SHOW PROCESSLIST to determine that queries started executed as needed.

http://jenkins.percona.com/view/PXB%202.1/job/percona-xtrabackup-2.1-param/580/

[Alexey Kopytov (akopytov)]

Do we really need a busy loop in wait_for_connection_count(), i.e. spinning the query without any delays? Also, can we also have some timeout, so we abort the test when it expires?

Both shouldn't be a problem under normal conditions, but could potentially create problems on Jenkins slaves when something goes wrong.

review: Needs Information

[Sergei Glushchenko (sergei.glushchenko)]

Jenkins build is just started
http://jenkins.percona.com/view/PXB%202.1/job/percona-xtrabackup-2.1-param/581/

[Sergei Glushchenko (sergei.glushchenko)]

Limit maximum processlist querying by 1 minute.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'test/t/kill_long_selects.sh'
--- test/t/kill_long_selects.sh	2013-10-21 10:32:46 +0000
+++ test/t/kill_long_selects.sh	2014-06-27 14:00:29 +0000
@@ -79,6 +79,16 @@
   rm -f $MYSQLD_TMPDIR/killall.sql
 }
 
+function wait_for_connection_count()
+{
+  n=$(($1 + 1))
+  for i in {1..200} ; do
+    count=`${MYSQL} ${MYSQL_ARGS} -N -e "SHOW PROCESSLIST" test | wc -l`
+    [ $count != $n ] || break
+    sleep 0.3
+  done
+}
+
 start_server --innodb_file_per_table
 
 run_cmd $MYSQL $MYSQL_ARGS test <<EOF
@@ -91,11 +101,9 @@
 # ==============================================================
 vlog "===================== case 1 ====================="
 bg_run bg_select_pid "mysql_select 3"
-bg_run bg_update_pid "sleep 1" "mysql_update 3"
-
-sleep 8
-
-innobackupex $topdir/full --kill-long-queries-timeout=10 \
+bg_run bg_update_pid "mysql_update 3"
+
+innobackupex $topdir/full --kill-long-queries-timeout=50 \
                           --kill-long-query-type=all
 
 bg_wait_ok $bg_select_pid
@@ -111,7 +119,8 @@
 #    it. then it may be still alive by the time of kill_all_queries
 vlog "===================== case 2 ====================="
 bg_run bg_select_pid "mysql_select 200"
-bg_run bg_update_pid "sleep 1" "mysql_update 5"
+bg_run bg_update_pid "mysql_update 5"
+wait_for_connection_count 2
 
 innobackupex $topdir/full --kill-long-queries-timeout=3 \
                           --kill-long-query-type=select
@@ -125,6 +134,7 @@
 vlog "===================== case 3 ====================="
 bg_run bg_select_pid "mysql_select 200"
 bg_run bg_update_pid "mysql_update 200"
+wait_for_connection_count 2
 
 innobackupex $topdir/full --kill-long-queries-timeout=3 \
                           --kill-long-query-type=all
@@ -138,8 +148,7 @@
 vlog "===================== case 4 ====================="
 bg_run bg_select_pid "mysql_select 200"
 bg_run bg_update_pid "mysql_update 200"
-
-sleep 1
+wait_for_connection_count 2
 
 run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} $topdir/full \
                           --lock-wait-timeout=3 \
@@ -157,8 +166,7 @@
 vlog "===================== case 5 ====================="
 bg_run bg_select_pid "mysql_select 200"
 bg_run bg_update_pid "mysql_update 200"
-
-sleep 2
+wait_for_connection_count 2
 
 run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} $topdir/full \
                           --lock-wait-timeout=3 \
@@ -175,9 +183,9 @@
 # ==============================================================
 vlog "===================== case 6 ====================="
 bg_run bg_update_pid "mysql_update 5"
-bg_run bg_select_pid "sleep 1" "mysql_select 200"
-
-sleep 2
+wait_for_connection_count 1
+bg_run bg_select_pid "mysql_select 200"
+wait_for_connection_count 2
 
 innobackupex $topdir/full \
                           --lock-wait-timeout=6 \