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

[Raghavendra D Prabhu]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.0-param/452/

[Alexey Kopytov (akopytov)]

As discussed on IRC, "sleep 10" is redundant. And the "Server supports wsrep" check should be done after reserving the ports with get_free_port.

review: Needs Fixing

[Raghavendra D Prabhu (raghavendra-prabhu)]

Pushed to lp and is being built on jenkins.

[Raghavendra D Prabhu (raghavendra-prabhu)]

Jenkins links for builds:

http://jenkins.percona.com/job/percona-xtrabackup-2.0-param/479/
http://jenkins.percona.com/job/percona-xtrabackup-2.1-param/371/

The galera55 have passed.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'test/inc/common.sh'
--- test/inc/common.sh	2013-06-28 15:21:38 +0000
+++ test/inc/common.sh	2013-07-09 09:43:24 +0000
@@ -286,7 +286,13 @@
     then
 	vlog "Creating server data directory: $MYSQLD_DATADIR"
 	mkdir -p "$MYSQLD_DATADIR"
-	call_mysql_install_db
+
+	# Reserve 900 series for SST nodes
+        if [[ $id -lt 900 ]];then
+            call_mysql_install_db
+        else 
+            vlog "Skiping mysql_install_db of node $id for SST"
+        fi
     fi
 
     # Start the server

=== added file 'test/t/xb_galera_sst.sh'
--- test/t/xb_galera_sst.sh	1970-01-01 00:00:00 +0000
+++ test/t/xb_galera_sst.sh	2013-07-09 09:43:24 +0000
@@ -0,0 +1,63 @@
+############################################################################
+# Bug #1182995: Add SST testing to PXC test framework.
+############################################################################
+
+. inc/common.sh
+
+node1=1
+# node2 will be getting SST
+node2=901
+ADDR=127.0.0.1
+SSTPASS="password"
+
+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
+        echo "Requires WSREP enabled" > $SKIPPED_REASON
+        exit $SKIPPED_EXIT_CODE
+fi
+set -e
+
+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
+
+load_sakila
+
+vlog "Setting password to 'password'"
+run_cmd ${MYSQL} ${MYSQL_ARGS} <<EOF
+ SET PASSWORD FOR 'root'@'localhost' = PASSWORD('password');
+EOF
+
+vlog "Starting server $node2"
+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 
+switch_server $node2
+
+# The password propagates through SST
+MYSQL_ARGS="${MYSQL_ARGS} -ppassword"
+
+
+if [[ "`${MYSQL} ${MYSQL_ARGS} -Ns -e 'SHOW STATUS LIKE "wsrep_local_state_uuid"'|awk {'print $2'}`" == "`sed  -re 's/:.+$//' $MYSQLD_DATADIR/xtrabackup_galera_info`" && "`${MYSQL} ${MYSQL_ARGS} -Ns -e 'SHOW STATUS LIKE "wsrep_last_committed"'|awk {'print $2'}`" == "`sed  -re 's/^.+://' $MYSQLD_DATADIR/xtrabackup_galera_info`" ]]
+then
+	vlog "SST successful"
+else
+	vlog "SST failed"
+	exit 1
+fi
+
+stop_server_with_id $node2
+stop_server_with_id $node1
+
+
+free_reserved_port ${listen_addr1}
+free_reserved_port ${listen_addr2}
+free_reserved_port ${recv_addr1}
+free_reserved_port ${recv_addr2}