Merge lp:~raghavendra-prabhu/percona-xtrabackup/2.0-bug1201686 into lp:percona-xtrabackup/2.1

[Raghavendra D Prabhu]

[Raghavendra D Prabhu (raghavendra-prabhu)]

The conflict below has been fixed later on: https://code.launchpad.net/~raghavendra-prabhu/percona-xtrabackup/2.0-bug1201686/+merge/176660

[Raghavendra D Prabhu (raghavendra-prabhu)]

Jenkins url: http://jenkins.percona.com/job/percona-xtrabackup-2.0-param/487/

[Alexey Kopytov (akopytov)]

This should be MPed into 2.0 rather 2.1. Will re-MP.

review: Needs Resubmitting

=== modified file 'test/t/bug983720_galerainfo.sh'
--- test/t/bug983720_galerainfo.sh	2012-11-12 05:06:16 +0000
+++ test/t/bug983720_galerainfo.sh	2013-07-24 11:38:31 +0000
@@ -4,6 +4,7 @@
 
 . inc/common.sh
 
+ADDR=127.0.0.1
 set +e
 ${MYSQLD} --basedir=$MYSQL_BASEDIR --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
 probe_result=$?
@@ -16,9 +17,16 @@
 fi
 set -e
 
+debug=""
+pdebug=""
+if [[ -n ${WSREP_DEBUG:-} ]];then 
+    debug="--wsrep-debug=1"
+    pdebug=";debug=1"
+fi
+
 galera_port=`get_free_port 2`
 
-start_server --log-bin=`hostname`-bin --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm:// --wsrep_provider_options="base_port=${galera_port}"
+start_server --log-bin=`hostname`-bin --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm:// $debug --wsrep_provider_options="base_port=${galera_port}${pdebug}" --wsrep_node_address=$ADDR
 
 # take a backup with stream mode
 mkdir -p $topdir/backup

=== modified file 'test/t/xb_galera_info.sh'
--- test/t/xb_galera_info.sh	2012-09-21 00:43:03 +0000
+++ test/t/xb_galera_info.sh	2013-07-24 11:38:31 +0000
@@ -1,5 +1,6 @@
 . inc/common.sh
 
+ADDR=127.0.0.1
 set +e
 ${MYSQLD} --basedir=$MYSQL_BASEDIR --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
 probe_result=$?
@@ -12,7 +13,12 @@
 fi
 set -e
 
-start_server --log-bin=`hostname`-bin --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm://
+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
+else 
+    start_server --log-bin=`hostname`-bin --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm:// --wsrep_node_address=$ADDR
+fi
+
 
 innobackupex --no-timestamp --galera-info $topdir/backup 
 backup_dir=$topdir/backup

=== modified file 'test/t/xb_galera_sst.sh'
--- test/t/xb_galera_sst.sh	2013-07-09 09:49:17 +0000
+++ test/t/xb_galera_sst.sh	2013-07-24 11:38:31 +0000
@@ -9,9 +9,11 @@
 node2=901
 ADDR=127.0.0.1
 SSTPASS="password"
+SUSER="root"
+SMDSUM="9f6f3edb78f9a5957ecaf8f99953b5af"
 
 set +e
-${MYSQLD} --basedir=$MYSQL_BASEDIR  --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
+${MYSQLD} --basedir=$MYSQL_BASEDIR  --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
 probe_result=$?
 if [[ "$probe_result" == "0" ]]
     then
@@ -22,13 +24,20 @@
 fi
 set -e
 
+debug=""
+pdebug=""
+if [[ -n ${WSREP_DEBUG:-} ]];then 
+    debug="--wsrep-debug=1"
+    pdebug=";debug=1"
+fi
+
 recv_addr1="${ADDR}:$(get_free_port 2)"
 recv_addr2="${ADDR}:$(get_free_port 3)"
 listen_addr1="${ADDR}:$(get_free_port 4)"
 listen_addr2="${ADDR}:$(get_free_port 5)"
 
 vlog "Starting server $node1"
-start_server_with_id $node1 --innodb_file_per_table  --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm:// --wsrep_sst_receive_address=$recv_addr1 --wsrep_node_incoming_address=$ADDR --wsrep_provider_options="gmcast.listen_addr=tcp://$listen_addr1" --wsrep_sst_method=xtrabackup --wsrep_sst_auth=$USER:$SSTPASS
+start_server_with_id $node1 --innodb_file_per_table  --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm:// --wsrep_sst_receive_address=$recv_addr1 --wsrep_node_incoming_address=$ADDR --wsrep_provider_options="gmcast.listen_addr=tcp://$listen_addr1${pdebug}" --wsrep_sst_method=xtrabackup --wsrep_sst_auth=$SUSER:$SSTPASS  --wsrep_node_address=$ADDR $debug 
 
 load_sakila
 
@@ -38,8 +47,12 @@
 EOF
 
 vlog "Starting server $node2"
+<<<<<<< TREE
 start_server_with_id $node2 --innodb_file_per_table --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm://$listen_addr1 --wsrep_sst_receive_address=$recv_addr2 --wsrep_node_incoming_address=$ADDR --wsrep_provider_options="gmcast.listen_addr=tcp://$listen_addr2" --wsrep_sst_method=xtrabackup --wsrep_sst_auth=$USER:$SSTPASS 
 
+=======
+start_server_with_id $node2 --innodb_file_per_table --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm://$listen_addr1 --wsrep_sst_receive_address=$recv_addr2 --wsrep_node_incoming_address=$ADDR --wsrep_provider_options="gmcast.listen_addr=tcp://$listen_addr2${pdebug}" --wsrep_sst_method=xtrabackup --wsrep_sst_auth=$SUSER:$SSTPASS  --wsrep_node_address=$ADDR $debug
+>>>>>>> MERGE-SOURCE
 switch_server $node2
 
 # The password propagates through SST
@@ -54,6 +67,14 @@
 	exit 1
 fi
 
+# Lightweight verification till lp:1199656 is fixed
+mdsum=$(${MYSQL} ${MYSQL_ARGS} -e 'select * from sakila.actor;' | md5sum | cut -d" " -f1)
+
+if [[ $mdsum != $SMDSUM ]];then 
+    vlog "Integrity verification failed: found: $mdsum expected: $SMDSUM"
+    exit 1
+fi
+
 stop_server_with_id $node2
 stop_server_with_id $node1