Merge lp:~akopytov/percona-xtrabackup/pxb-157-2.2 into lp:percona-xtrabackup/2.2

Proposed by Alexey Kopytov
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 4965
Proposed branch: lp:~akopytov/percona-xtrabackup/pxb-157-2.2
Merge into: lp:percona-xtrabackup/2.2
Diff against target: 123 lines (+47/-8)
5 files modified
storage/innobase/xtrabackup/test/run.sh (+14/-1)
storage/innobase/xtrabackup/test/t/bug1250375.sh (+1/-1)
storage/innobase/xtrabackup/test/t/bug983720_galerainfo.sh (+5/-1)
storage/innobase/xtrabackup/test/t/xb_galera_info.sh (+9/-3)
storage/innobase/xtrabackup/test/t/xb_galera_sst.sh (+18/-2)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/pxb-157-2.2
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+217741@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'storage/innobase/xtrabackup/test/run.sh'
2--- storage/innobase/xtrabackup/test/run.sh 2014-01-16 10:46:01 +0000
3+++ storage/innobase/xtrabackup/test/run.sh 2014-04-30 10:46:27 +0000
4@@ -362,6 +362,19 @@
5 die "Galera initialization failed!"
6 fi
7
8+ if [ -n "$WSREP_READY" ]
9+ then
10+ if [ -f ${MYSQL_BASEDIR}/lib/libgalera_smm.so ]
11+ then
12+ LIBGALERA_PATH=${MYSQL_BASEDIR}/lib/libgalera_smm.so
13+ elif [ -f ${MYSQL_BASEDIR}/lib/galera2/libgalera_smm.so ]
14+ then
15+ LIBGALERA_PATH=${MYSQL_BASEDIR}/lib/galera2/libgalera_smm.so
16+ else
17+ die "Cannot find libgalera_smm.so"
18+ fi
19+ fi
20+
21 # Version-specific defaults
22 DEFAULT_IBDATA_SIZE="10M"
23
24@@ -429,7 +442,7 @@
25 export MYSQL_VERSION MYSQL_VERSION_COMMENT MYSQL_FLAVOR \
26 INNODB_VERSION XTRADB_VERSION INNODB_FLAVOR \
27 XB_BIN IB_BIN IB_ARGS XB_ARGS MYSQLD_EXTRA_ARGS \
28- DEFAULT_IBDATA_SIZE WSREP_READY
29+ DEFAULT_IBDATA_SIZE WSREP_READY LIBGALERA_PATH
30 }
31
32 ###########################################################################
33
34=== modified file 'storage/innobase/xtrabackup/test/t/bug1250375.sh'
35--- storage/innobase/xtrabackup/test/t/bug1250375.sh 2014-02-27 06:25:45 +0000
36+++ storage/innobase/xtrabackup/test/t/bug1250375.sh 2014-04-30 10:46:27 +0000
37@@ -11,7 +11,7 @@
38 log_slave_updates=ON
39 enforce_gtid_consistency=ON
40 gtid_mode=ON
41-wsrep_provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so
42+wsrep_provider=$LIBGALERA_PATH
43 wsrep_cluster_address=gcomm://
44 wsrep_node_address=$ADDR
45 "
46
47=== modified file 'storage/innobase/xtrabackup/test/t/bug983720_galerainfo.sh'
48--- storage/innobase/xtrabackup/test/t/bug983720_galerainfo.sh 2013-11-13 08:33:06 +0000
49+++ storage/innobase/xtrabackup/test/t/bug983720_galerainfo.sh 2014-04-30 10:46:27 +0000
50@@ -17,7 +17,11 @@
51
52 galera_port=`get_free_port 2`
53
54-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
55+start_server --log-bin=`hostname`-bin --binlog-format=ROW \
56+ --wsrep-provider=$LIBGALERA_PATH \
57+ --wsrep_cluster_address=gcomm:// $debug \
58+ --wsrep_provider_options="base_port=${galera_port}${pdebug}" \
59+ --wsrep_node_address=$ADDR
60
61 # take a backup with stream mode
62 mkdir -p $topdir/backup
63
64=== modified file 'storage/innobase/xtrabackup/test/t/xb_galera_info.sh'
65--- storage/innobase/xtrabackup/test/t/xb_galera_info.sh 2013-11-13 08:33:06 +0000
66+++ storage/innobase/xtrabackup/test/t/xb_galera_info.sh 2014-04-30 10:46:27 +0000
67@@ -5,9 +5,15 @@
68 ADDR=127.0.0.1
69
70 if [[ -n ${WSREP_DEBUG:-} ]];then
71- 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
72-else
73- 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
74+ start_server --log-bin=`hostname`-bin --binlog-format=ROW \
75+ --wsrep-provider=$LIBGALERA_PATH \
76+ --wsrep_cluster_address=gcomm:// \
77+ --wsrep-debug=1 --wsrep_provider_options="debug=1" \
78+ --wsrep_node_address=$ADDR
79+else
80+ start_server --log-bin=`hostname`-bin --binlog-format=ROW \
81+ --wsrep-provider=$LIBGALERA_PATH \
82+ --wsrep_cluster_address=gcomm:// --wsrep_node_address=$ADDR
83 fi
84
85
86
87=== modified file 'storage/innobase/xtrabackup/test/t/xb_galera_sst.sh'
88--- storage/innobase/xtrabackup/test/t/xb_galera_sst.sh 2013-11-13 08:33:06 +0000
89+++ storage/innobase/xtrabackup/test/t/xb_galera_sst.sh 2014-04-30 10:46:27 +0000
90@@ -27,7 +27,15 @@
91 listen_addr2="${ADDR}:$(get_free_port 5)"
92
93 vlog "Starting server $node1"
94-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
95+start_server_with_id $node1 --innodb_file_per_table --binlog-format=ROW \
96+ --wsrep-provider=$LIBGALERA_PATH \
97+ --wsrep_cluster_address=gcomm:// \
98+ --wsrep_sst_receive_address=$recv_addr1 \
99+ --wsrep_node_incoming_address=$ADDR \
100+ --wsrep_provider_options="gmcast.listen_addr=tcp://$listen_addr1${pdebug}" \
101+ --wsrep_sst_method=xtrabackup \
102+ --wsrep_sst_auth=$SUSER:$SSTPASS \
103+ --wsrep_node_address=$ADDR $debug
104
105 load_sakila
106
107@@ -37,7 +45,15 @@
108 EOF
109
110 vlog "Starting server $node2"
111-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
112+start_server_with_id $node2 --innodb_file_per_table --binlog-format=ROW \
113+ --wsrep-provider=$LIBGALERA_PATH \
114+ --wsrep_cluster_address=gcomm://$listen_addr1 \
115+ --wsrep_sst_receive_address=$recv_addr2 \
116+ --wsrep_node_incoming_address=$ADDR \
117+ --wsrep_provider_options="gmcast.listen_addr=tcp://$listen_addr2${pdebug}" \
118+ --wsrep_sst_method=xtrabackup \
119+ --wsrep_sst_auth=$SUSER:$SSTPASS \
120+ --wsrep_node_address=$ADDR $debug
121 switch_server $node2
122
123 # The password propagates through SST

Subscribers

People subscribed via source and target branches

to all changes: