Merge lp:~raghavendra-prabhu/percona-xtrabackup/Bug-1182995 into lp:percona-xtrabackup/2.1

[Raghavendra D Prabhu]

[George Ormond Lorch III (gl-az)]

raghu,
This needs to be first implemented in the XB 2.0 suite, then merged into the 2.1 suite, then one branch merge proposal for each version. For example:
in xb-2.0-bug1182995:
bzr commit -m "..."
bzr push ~raghavendra-prabhu/percona-xtrabackup/2.0-bug1182995

Then in xb-2.1-bug1182995:
bzr merge ../xb-2.0-bug1182995
test here and maybe do a bzr diff to make sure everything looks good, if not, do a bzr revert, make changes manually, then
bzr push ~raghavendra-prabhu/percona-xtrabackup/2.1-bug1182995

Then make merge proposal for each of the branches.

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

Raghu,

Also you might want to use get_free_port function instead of hardcoded port numbers (as done in bug983720_galerainfo.sh). Fixed port numbers will cause port conflicts in Jenkins which will lead to failures. Also, there should be a Jenkins build for this merge proposal, both for 2.0 and 2.1.

[Stewart Smith (stewart)]

- We cannot use hard coded port numbers, it will cause failures.
- the following line looks suspicious, will it actually work on 32bit?
  grep -q lib64 && GPREFIX="${MYSQL_BASEDIR}/lib64/libgalera_smm.so"
- the existing code for galera things I think should be adequate for finding libs in the right places? So we should be able to just reuse that code.
- why is sbin needed for this test and no others?

review: Needs Fixing

[Raghavendra D Prabhu (raghavendra-prabhu)]

@George,

Yes, will do.

@Sergei,

Ack, that should help. I will use that.

@Stewart,

a)
On 32 bit, I presume it is /usr/lib/libgalera_smm.so? The default
is /usr/lib/libgalera_smm.so. The default failed for me on
64 bit CentOS6 - How was the other test - xb_galera_info - running before? - it would have failed.

b)
Is it /usr/lib32 on 32 bit systems?

c)
sbin is not specific to this test. The tests in
percona-xtrabackup-test package fail since the basedir is /usr
and the find_program looks for mysqld in /usr/bin and
/usr/libexec but not /usr/sbin.

I will file a separate bug for this.

[Raghavendra D Prabhu (raghavendra-prabhu)]

I will file a separate bug for "grep -q lib64 && GPREFIX="${MYSQL_BASEDIR}/lib64/libgalera_smm.so" part" since I see other tests where prefix is wrong.

[Raghavendra D Prabhu (raghavendra-prabhu)]

Filed

https://bugs.launchpad.net/percona-xtrabackup/+bug/1183323

and

https://bugs.launchpad.net/percona-xtrabackup/+bug/1183325

for other bugs.

[Raghavendra D Prabhu (raghavendra-prabhu)]

The 2.0 and 2.1 branches are not consistent with each other: http://paste.wnohang.net/94f2c9?diff

[Raghavendra D Prabhu (raghavendra-prabhu)]

Resubmitted here https://code.launchpad.net/~raghavendra-prabhu/percona-xtrabackup/2.0-Bug1182995/+merge/165442 and https://code.launchpad.net/~raghavendra-prabhu/percona-xtrabackup/2.1-Bug1182995/+merge/165441

[Alexey Kopytov (akopytov)]

Closing as the patch will be handled in other MPs.

Unmerged revisions

608. By Raghavendra D Prabhu on 2013-05-22

Bug#1182995: Testcase for Xtrabackup for PXC SST.

This commit adds a test case for Xtrabackup involving SST Basically, .
it starts two servers, does a Xtrabackup SST between them and finally .
checks for galera co-ordinates in the xtrabackup_galera_info file and .
matches it with that in the server .

Few other things fixed include:

a) Correct prefix for galera library.

b) Added a special condition to common.sh to avoid mysql_install_db.

607. By Raghavendra D Prabhu on 2013-05-22

Fix testrun.sh to include for /usr BASEDIR and mysqld in /usr/sbin/

606. By <email address hidden> on 2013-05-22

Merge lp:~hrvojem/percona-xtrabackup/rn-2.1.3

=== modified file 'test/inc/common.sh'
--- test/inc/common.sh	2013-05-07 13:32:47 +0000
+++ test/inc/common.sh	2013-05-22 17:31:28 +0000
@@ -290,7 +290,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 for SST"
+        fi
     fi
 
     # Start the server

=== 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-05-22 17:31:28 +0000
@@ -1,5 +1,8 @@
 . inc/common.sh
 
+GPREFIX="${MYSQL_BASEDIR}/lib/libgalera_smm.so"
+mysql_config --libs | grep -q lib64 && GPREFIX="${MYSQL_BASEDIR}/lib64/libgalera_smm.so"
+
 set +e
 ${MYSQLD} --basedir=$MYSQL_BASEDIR --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
 probe_result=$?

=== 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-05-22 17:31:28 +0000
@@ -0,0 +1,54 @@
+. inc/common.sh
+
+node1=1
+node2=901
+PORT1=4000
+PORT2=5000
+ADDR=127.0.0.1
+SSTPASS="password"
+GPREFIX="${MYSQL_BASEDIR}/lib/libgalera_smm.so"
+
+mysql_config --libs | grep -q lib64 && GPREFIX="${MYSQL_BASEDIR}/lib64/libgalera_smm.so"
+
+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
+
+vlog "Starting server $node1"
+start_server_with_id $node1 --port=$(( PORT1+5 ))  --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib64/libgalera_smm.so --wsrep_cluster_address=gcomm:// --wsrep_sst_receive_address=$ADDR:$PORT1 --wsrep_node_incoming_address=$ADDR --wsrep_provider_options="gmcast.listen_addr=tcp://$ADDR:$(( PORT1+10 ))" --wsrep_sst_method=xtrabackup --wsrep_sst_auth=$USER:$SSTPASS
+
+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 --port=$(( PORT2+5 ))  --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib64/libgalera_smm.so --wsrep_cluster_address=gcomm://$ADDR:$(( PORT1+10 )) --wsrep_sst_receive_address=$ADDR:$PORT2 --wsrep_node_incoming_address=$ADDR --wsrep_provider_options="gmcast.listen_addr=tcp://$ADDR:$(( PORT2+10 ))" --wsrep_sst_auth=$USER:$SSTPASS --wsrep_sst_method=xtrabackup
+
+vlog "Sleeping while SST for 10 seconds"
+sleep 10
+
+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

=== modified file 'test/testrun.sh'
--- test/testrun.sh	2013-05-17 11:07:26 +0000
+++ test/testrun.sh	2013-05-22 17:31:28 +0000
@@ -67,7 +67,7 @@
 
     find_program MYSQL_INSTALL_DB mysql_install_db $MYSQL_BASEDIR/bin \
 	$MYSQL_BASEDIR/scripts
-    find_program MYSQLD mysqld $MYSQL_BASEDIR/bin/ $MYSQL_BASEDIR/libexec
+    find_program MYSQLD mysqld $MYSQL_BASEDIR/bin/ $MYSQL_BASEDIR/libexec $MYSQL_BASEDIR/sbin
     find_program MYSQL mysql $MYSQL_BASEDIR/bin
     find_program MYSQLADMIN mysqladmin $MYSQL_BASEDIR/bin
     find_program MYSQLDUMP mysqldump $MYSQL_BASEDIR/bin