Merge lp:~percona-core/percona-xtradb-cluster/bug-1402166-5.5 into lp:percona-xtradb-cluster/5.5

[Raghavendra D Prabhu]

[Alexey Kopytov (akopytov)]

Same question as in https://code.launchpad.net/~percona-core/percona-xtradb-cluster/bug-1402166/+merge/245518

review: Needs Information

[lp:~percona-core/percona-xtradb-cluster/bug-1402166-5.5]

840. By Raghavendra D Prabhu on 2015-01-27

Refactored the code for more clarity

Unmerged revisions

840. By Raghavendra D Prabhu on 2015-01-27

Refactored the code for more clarity

=== modified file 'percona-xtradb-cluster-tests/t/xb_galera_sst_advanced-v2.sh'
--- percona-xtradb-cluster-tests/t/xb_galera_sst_advanced-v2.sh	2013-11-28 09:31:22 +0000
+++ percona-xtradb-cluster-tests/t/xb_galera_sst_advanced-v2.sh	2015-01-27 11:31:37 +0000
@@ -12,6 +12,7 @@
 SUSER="root"
 SMDSUM="d35d212fdfe9452e711704e3dc3e93cf"
 EXTRAFILE=${CONF:-}
+ADDNLOP=${ADDNLOP:-""}
 
 
 if [[ -n ${EXTRAFILE:-} ]];then 
@@ -33,7 +34,7 @@
 
 vlog "Starting server $node1"
 MYSQLD_EXTRA_MY_CNF_OPTS="!include $EXTRAFILE1"
-start_server_with_id $node1 --innodb_flush_method=O_DIRECT --innodb_autoinc_lock_mode=2  --innodb_locks_unsafe_for_binlog=1 --wsrep-slave-threads=2 --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-v2 --wsrep_sst_auth=$SUSER:$SSTPASS  --wsrep_node_address=$ADDR $debug 
+start_server_with_id $node1 --innodb_flush_method=O_DIRECT --innodb_autoinc_lock_mode=2  --innodb_locks_unsafe_for_binlog=1 --wsrep-slave-threads=2 --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-v2 --wsrep_sst_auth=$SUSER:$SSTPASS  --wsrep_node_address=$ADDR $debug $ADDNLOP
 
 vlog "Sleeping before loading data"
 sleep 8
@@ -48,7 +49,7 @@
 
 vlog "Starting server $node2"
 MYSQLD_EXTRA_MY_CNF_OPTS="!include $EXTRAFILE2"
-start_server_with_id $node2   --innodb_flush_method=O_DIRECT --innodb_autoinc_lock_mode=2  --innodb_locks_unsafe_for_binlog=1 --wsrep-slave-threads=2 --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-v2 --wsrep_sst_auth=$SUSER:$SSTPASS  --wsrep_node_address=$ADDR $debug
+start_server_with_id $node2   --innodb_flush_method=O_DIRECT --innodb_autoinc_lock_mode=2  --innodb_locks_unsafe_for_binlog=1 --wsrep-slave-threads=2 --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-v2 --wsrep_sst_auth=$SUSER:$SSTPASS  --wsrep_node_address=$ADDR $debug $ADDNLOP
 switch_server $node2
 
 # The password propagates through SST

=== modified file 'sql/wsrep_sst.cc'
--- sql/wsrep_sst.cc	2015-01-09 18:57:00 +0000
+++ sql/wsrep_sst.cc	2015-01-27 11:31:37 +0000
@@ -380,10 +380,13 @@
     proc.wait();
     err= EINVAL;
 
-    if (!tmp)
+    if (!tmp || proc.error())
     {
       WSREP_ERROR("Failed to read uuid:seqno from joiner script.");
-      if (proc.error()) err = proc.error();
+      if ((err=proc.error()))
+      {
+        WSREP_ERROR("SST script aborted with error %d (%s)", err, strerror(err));
+      }
     }
     else
     {