Merge lp:~akopytov/percona-xtrabackup/bug1250738-2.2 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

    Bug #1250738: Galera tests are skipped on some Jenkins slaves with
                  galera55 configuration

    The problem was that Galera tests checked for Galera support by starting
    temporary mysqld instances without specifying a configuration file. On
    some Jenkins slaves (e.g. Ubuntu ones in our cluster) there was a
    default configuration file at /etc/mysql/my.cnf which had query_cache
    enabled. Since query_cache is not supported by Galera, the server
    refused to start, so Galera support checks in tests assumed it there is
    no support and skipped the tests.

    Fixed by changing the way Galera support is being detected by the test
    suite. Instead of each tests having to roll its own check with a
    temporary mysqld instance, run.sh performs this check on startup by
    checking the wsrep_ready status variable (along with other
    version-specific variables). The value of that variable is then
    exported to subshells, so it is available to tests. As an extra safety,
    run.sh will also abort with an error, if Galera testing was explicitly
    requested via -c galera55.

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.2-param/41/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'xtrabackup/test/inc/common.sh'
--- xtrabackup/test/inc/common.sh	2013-11-07 12:23:43 +0000
+++ xtrabackup/test/inc/common.sh	2013-11-13 09:16:46 +0000
@@ -713,6 +713,22 @@
 }
 
 ########################################################################
+# Return 0 if the server has Galera support
+########################################################################
+function is_galera()
+{
+    [ -n "$WSREP_READY" ]
+}
+
+########################################################################
+# Skip the test if not running against a Galera-enabled server
+########################################################################
+function require_galera()
+{
+    is_galera || skip_test "Requires Galera support"
+}
+
+########################################################################
 # Skip the test if qpress binary is not available
 ########################################################################
 function require_qpress()

=== modified file 'xtrabackup/test/run.sh'
--- xtrabackup/test/run.sh	2013-09-23 05:21:56 +0000
+++ xtrabackup/test/run.sh	2013-11-13 09:16:46 +0000
@@ -379,6 +379,15 @@
     INNODB_VERSION=${INNODB_VERSION#"innodb_version	"}
     XTRADB_VERSION="`echo $INNODB_VERSION  | sed 's/[0-9]\.[0-9]\.[0-9][0-9]*\(-[0-9][0-9]*\.[0-9][0-9]*\)*$/\1/'`"
 
+    WSREP_READY=`$MYSQL ${MYSQL_ARGS} -Nsf -e "SHOW STATUS LIKE 'wsrep_ready'"`
+    WSREP_READY=${WSREP_READY#"wsrep_ready	"}
+
+    if [ "$XB_BUILD" = "galera55" -a -z "$WSREP_READY" ]
+    then
+        die "Galera configuration is enabled via -c galera55, but the server \
+doesn't have Galera support."
+    fi
+
     # Version-specific defaults
     DEFAULT_IBDATA_SIZE="10M"
 
@@ -455,7 +464,7 @@
     export MYSQL_VERSION MYSQL_VERSION_COMMENT MYSQL_FLAVOR \
 	INNODB_VERSION XTRADB_VERSION INNODB_FLAVOR \
 	XB_BIN IB_BIN IB_ARGS XB_ARGS MYSQLD_EXTRA_ARGS \
-        DEFAULT_IBDATA_SIZE XB_BUILD
+        DEFAULT_IBDATA_SIZE XB_BUILD WSREP_READY
 }
 
 ###########################################################################

=== modified file 'xtrabackup/test/t/bug1192347.sh'
--- xtrabackup/test/t/bug1192347.sh	2013-07-25 15:04:49 +0000
+++ xtrabackup/test/t/bug1192347.sh	2013-11-13 09:16:46 +0000
@@ -5,14 +5,7 @@
 
 . inc/common.sh
 
-set +e
-${MYSQLD} --basedir=$MYSQL_BASEDIR --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
-probe_result=$?
-if [[ "$probe_result" == "0" ]]
-then
-        skip_test "Server supports wsrep"
-fi
-set -e
+is_galera && skip_test "Requires a server without Galera support"
 
 start_server
 

=== modified file 'xtrabackup/test/t/bug983720_galerainfo.sh'
--- xtrabackup/test/t/bug983720_galerainfo.sh	2013-08-28 11:52:26 +0000
+++ xtrabackup/test/t/bug983720_galerainfo.sh	2013-11-13 09:16:46 +0000
@@ -4,17 +4,9 @@
 
 . inc/common.sh
 
+require_galera
+
 ADDR=127.0.0.1
-set +e
-${MYSQLD} --basedir=$MYSQL_BASEDIR --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
-probe_result=$?
-if [[ "$probe_result" == "0" ]]
-    then
-        vlog "Server supports wsrep"
-    else
-        skip_test "Requires WSREP enabled"
-fi
-set -e
 
 debug=""
 pdebug=""

=== modified file 'xtrabackup/test/t/xb_galera_info.sh'
--- xtrabackup/test/t/xb_galera_info.sh	2013-08-28 11:52:26 +0000
+++ xtrabackup/test/t/xb_galera_info.sh	2013-11-13 09:16:46 +0000
@@ -1,16 +1,8 @@
 . inc/common.sh
 
+require_galera
+
 ADDR=127.0.0.1
-set +e
-${MYSQLD} --basedir=$MYSQL_BASEDIR --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
-probe_result=$?
-if [[ "$probe_result" == "0" ]]
-    then
-        vlog "Server supports wsrep"
-    else
-        skip_test "Requires WSREP enabled"
-fi
-set -e
 
 if [[ -n ${WSREP_DEBUG:-} ]];then 
     start_server --log-bin=`hostname`-bin --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm:// --wsrep-debug=1 --wsrep_provider_options="debug=1" --wsrep_node_address=$ADDR

=== modified file 'xtrabackup/test/t/xb_galera_sst.sh'
--- xtrabackup/test/t/xb_galera_sst.sh	2013-08-28 11:52:26 +0000
+++ xtrabackup/test/t/xb_galera_sst.sh	2013-11-13 09:16:46 +0000
@@ -4,6 +4,8 @@
 
 . inc/common.sh
 
+require_galera
+
 node1=1
 # node2 will be getting SST
 node2=901
@@ -12,17 +14,6 @@
 SUSER="root"
 SMDSUM="9f6f3edb78f9a5957ecaf8f99953b5af"
 
-set +e
-${MYSQLD} --basedir=$MYSQL_BASEDIR  --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
-probe_result=$?
-if [[ "$probe_result" == "0" ]]
-    then
-        vlog "Server supports wsrep"
-    else
-        skip_test "Requires WSREP enabled"
-fi
-set -e
-
 debug=""
 pdebug=""
 if [[ -n ${WSREP_DEBUG:-} ]];then