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

Proposed by Raghavendra D Prabhu on 2015-01-04
Status: Work in progress
Proposed branch: lp:~percona-core/percona-xtradb-cluster/bug-1402166-5.5
Merge into: lp:percona-xtradb-cluster/5.5
Diff against target: 49 lines (+8/-4)
2 files modified
percona-xtradb-cluster-tests/t/xb_galera_sst_advanced-v2.sh (+3/-2)
sql/wsrep_sst.cc (+5/-2)
To merge this branch: bzr merge lp:~percona-core/percona-xtradb-cluster/bug-1402166-5.5
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2015-01-04 Needs Information on 2015-01-05
Review via email: mp+245524@code.launchpad.net
To post a comment you must log in.
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'percona-xtradb-cluster-tests/t/xb_galera_sst_advanced-v2.sh'
2--- percona-xtradb-cluster-tests/t/xb_galera_sst_advanced-v2.sh 2013-11-28 09:31:22 +0000
3+++ percona-xtradb-cluster-tests/t/xb_galera_sst_advanced-v2.sh 2015-01-27 11:31:37 +0000
4@@ -12,6 +12,7 @@
5 SUSER="root"
6 SMDSUM="d35d212fdfe9452e711704e3dc3e93cf"
7 EXTRAFILE=${CONF:-}
8+ADDNLOP=${ADDNLOP:-""}
9
10
11 if [[ -n ${EXTRAFILE:-} ]];then
12@@ -33,7 +34,7 @@
13
14 vlog "Starting server $node1"
15 MYSQLD_EXTRA_MY_CNF_OPTS="!include $EXTRAFILE1"
16-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
17+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
18
19 vlog "Sleeping before loading data"
20 sleep 8
21@@ -48,7 +49,7 @@
22
23 vlog "Starting server $node2"
24 MYSQLD_EXTRA_MY_CNF_OPTS="!include $EXTRAFILE2"
25-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
26+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
27 switch_server $node2
28
29 # The password propagates through SST
30
31=== modified file 'sql/wsrep_sst.cc'
32--- sql/wsrep_sst.cc 2015-01-09 18:57:00 +0000
33+++ sql/wsrep_sst.cc 2015-01-27 11:31:37 +0000
34@@ -380,10 +380,13 @@
35 proc.wait();
36 err= EINVAL;
37
38- if (!tmp)
39+ if (!tmp || proc.error())
40 {
41 WSREP_ERROR("Failed to read uuid:seqno from joiner script.");
42- if (proc.error()) err = proc.error();
43+ if ((err=proc.error()))
44+ {
45+ WSREP_ERROR("SST script aborted with error %d (%s)", err, strerror(err));
46+ }
47 }
48 else
49 {

Subscribers

People subscribed via source and target branches

to all changes: