Percona XtraBackup moved to https://jira.percona.com/projects/PXB

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

  1. pxb-157-2.2
  2. Merge into 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
=== modified file 'storage/innobase/xtrabackup/test/run.sh'
--- storage/innobase/xtrabackup/test/run.sh 2014-01-16 10:46:01 +0000
+++ storage/innobase/xtrabackup/test/run.sh 2014-04-30 10:46:27 +0000
@@ -362,6 +362,19 @@
362 die "Galera initialization failed!"362 die "Galera initialization failed!"
363 fi363 fi
364364
365 if [ -n "$WSREP_READY" ]
366 then
367 if [ -f ${MYSQL_BASEDIR}/lib/libgalera_smm.so ]
368 then
369 LIBGALERA_PATH=${MYSQL_BASEDIR}/lib/libgalera_smm.so
370 elif [ -f ${MYSQL_BASEDIR}/lib/galera2/libgalera_smm.so ]
371 then
372 LIBGALERA_PATH=${MYSQL_BASEDIR}/lib/galera2/libgalera_smm.so
373 else
374 die "Cannot find libgalera_smm.so"
375 fi
376 fi
377
365 # Version-specific defaults378 # Version-specific defaults
366 DEFAULT_IBDATA_SIZE="10M"379 DEFAULT_IBDATA_SIZE="10M"
367380
@@ -429,7 +442,7 @@
429 export MYSQL_VERSION MYSQL_VERSION_COMMENT MYSQL_FLAVOR \442 export MYSQL_VERSION MYSQL_VERSION_COMMENT MYSQL_FLAVOR \
430 INNODB_VERSION XTRADB_VERSION INNODB_FLAVOR \443 INNODB_VERSION XTRADB_VERSION INNODB_FLAVOR \
431 XB_BIN IB_BIN IB_ARGS XB_ARGS MYSQLD_EXTRA_ARGS \444 XB_BIN IB_BIN IB_ARGS XB_ARGS MYSQLD_EXTRA_ARGS \
432 DEFAULT_IBDATA_SIZE WSREP_READY445 DEFAULT_IBDATA_SIZE WSREP_READY LIBGALERA_PATH
433}446}
434447
435###########################################################################448###########################################################################
436449
=== modified file 'storage/innobase/xtrabackup/test/t/bug1250375.sh'
--- storage/innobase/xtrabackup/test/t/bug1250375.sh 2014-02-27 06:25:45 +0000
+++ storage/innobase/xtrabackup/test/t/bug1250375.sh 2014-04-30 10:46:27 +0000
@@ -11,7 +11,7 @@
11log_slave_updates=ON11log_slave_updates=ON
12enforce_gtid_consistency=ON12enforce_gtid_consistency=ON
13gtid_mode=ON13gtid_mode=ON
14wsrep_provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so14wsrep_provider=$LIBGALERA_PATH
15wsrep_cluster_address=gcomm://15wsrep_cluster_address=gcomm://
16wsrep_node_address=$ADDR16wsrep_node_address=$ADDR
17"17"
1818
=== modified file 'storage/innobase/xtrabackup/test/t/bug983720_galerainfo.sh'
--- storage/innobase/xtrabackup/test/t/bug983720_galerainfo.sh 2013-11-13 08:33:06 +0000
+++ storage/innobase/xtrabackup/test/t/bug983720_galerainfo.sh 2014-04-30 10:46:27 +0000
@@ -17,7 +17,11 @@
1717
18galera_port=`get_free_port 2`18galera_port=`get_free_port 2`
1919
20start_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=$ADDR20start_server --log-bin=`hostname`-bin --binlog-format=ROW \
21 --wsrep-provider=$LIBGALERA_PATH \
22 --wsrep_cluster_address=gcomm:// $debug \
23 --wsrep_provider_options="base_port=${galera_port}${pdebug}" \
24 --wsrep_node_address=$ADDR
2125
22# take a backup with stream mode26# take a backup with stream mode
23mkdir -p $topdir/backup27mkdir -p $topdir/backup
2428
=== modified file 'storage/innobase/xtrabackup/test/t/xb_galera_info.sh'
--- storage/innobase/xtrabackup/test/t/xb_galera_info.sh 2013-11-13 08:33:06 +0000
+++ storage/innobase/xtrabackup/test/t/xb_galera_info.sh 2014-04-30 10:46:27 +0000
@@ -5,9 +5,15 @@
5ADDR=127.0.0.15ADDR=127.0.0.1
66
7if [[ -n ${WSREP_DEBUG:-} ]];then 7if [[ -n ${WSREP_DEBUG:-} ]];then
8 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=$ADDR8 start_server --log-bin=`hostname`-bin --binlog-format=ROW \
9else 9 --wsrep-provider=$LIBGALERA_PATH \
10 start_server --log-bin=`hostname`-bin --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm:// --wsrep_node_address=$ADDR10 --wsrep_cluster_address=gcomm:// \
11 --wsrep-debug=1 --wsrep_provider_options="debug=1" \
12 --wsrep_node_address=$ADDR
13else
14 start_server --log-bin=`hostname`-bin --binlog-format=ROW \
15 --wsrep-provider=$LIBGALERA_PATH \
16 --wsrep_cluster_address=gcomm:// --wsrep_node_address=$ADDR
11fi17fi
1218
1319
1420
=== modified file 'storage/innobase/xtrabackup/test/t/xb_galera_sst.sh'
--- storage/innobase/xtrabackup/test/t/xb_galera_sst.sh 2013-11-13 08:33:06 +0000
+++ storage/innobase/xtrabackup/test/t/xb_galera_sst.sh 2014-04-30 10:46:27 +0000
@@ -27,7 +27,15 @@
27listen_addr2="${ADDR}:$(get_free_port 5)"27listen_addr2="${ADDR}:$(get_free_port 5)"
2828
29vlog "Starting server $node1"29vlog "Starting server $node1"
30start_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 30start_server_with_id $node1 --innodb_file_per_table --binlog-format=ROW \
31 --wsrep-provider=$LIBGALERA_PATH \
32 --wsrep_cluster_address=gcomm:// \
33 --wsrep_sst_receive_address=$recv_addr1 \
34 --wsrep_node_incoming_address=$ADDR \
35 --wsrep_provider_options="gmcast.listen_addr=tcp://$listen_addr1${pdebug}" \
36 --wsrep_sst_method=xtrabackup \
37 --wsrep_sst_auth=$SUSER:$SSTPASS \
38 --wsrep_node_address=$ADDR $debug
3139
32load_sakila40load_sakila
3341
@@ -37,7 +45,15 @@
37EOF45EOF
3846
39vlog "Starting server $node2"47vlog "Starting server $node2"
40start_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 $debug48start_server_with_id $node2 --innodb_file_per_table --binlog-format=ROW \
49 --wsrep-provider=$LIBGALERA_PATH \
50 --wsrep_cluster_address=gcomm://$listen_addr1 \
51 --wsrep_sst_receive_address=$recv_addr2 \
52 --wsrep_node_incoming_address=$ADDR \
53 --wsrep_provider_options="gmcast.listen_addr=tcp://$listen_addr2${pdebug}" \
54 --wsrep_sst_method=xtrabackup \
55 --wsrep_sst_auth=$SUSER:$SSTPASS \
56 --wsrep_node_address=$ADDR $debug
41switch_server $node257switch_server $node2
4258
43# The password propagates through SST59# The password propagates through SST

Subscribers

People subscribed via source and target branches

to all changes: