Merge lp:~akopytov/percona-xtrabackup/bug1418584-2.2 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/288/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/src/wsrep.cc'
--- storage/innobase/xtrabackup/src/wsrep.cc	2014-09-04 16:53:33 +0000
+++ storage/innobase/xtrabackup/src/wsrep.cc	2015-02-12 12:18:10 +0000
@@ -56,6 +56,9 @@
 /*! undefined seqno */
 #define WSREP_SEQNO_UNDEFINED (-1)
 
+/*! Name of file where Galera info is stored on recovery */
+#define XB_GALERA_INFO_FILENAME "xtrabackup_galera_info"
+
 /* Galera UUID type - for all unique IDs */
 typedef struct wsrep_uuid {
     uint8_t data[16];
@@ -165,6 +168,14 @@
 	XID		xid;
 	char		uuid_str[40];
 	wsrep_seqno_t	seqno;
+	MY_STAT		statinfo;
+
+	/* Do not overwrite existing an existing file to be compatible with
+	servers with older server versions */
+	if (my_stat(XB_GALERA_INFO_FILENAME, &statinfo, MYF(0)) != NULL) {
+
+		return;
+	}
 
 	memset(&xid, 0, sizeof(xid));
 	xid.formatID = -1;
@@ -179,11 +190,11 @@
 		return;
 	}
 
-	fp = fopen("xtrabackup_galera_info", "w");
+	fp = fopen(XB_GALERA_INFO_FILENAME, "w");
 	if (fp == NULL) {
 
 		msg("xtrabackup: error: "
-		    "could not create xtrabackup_galera_info, errno = %d\n",
+		    "could not create "XB_GALERA_INFO_FILENAME", errno = %d\n",
 		    errno);
 		exit(EXIT_FAILURE);
 	}
@@ -196,7 +207,7 @@
 	if (fprintf(fp, "%s:%lld", uuid_str, (long long) seqno) < 0) {
 
 		msg("xtrabackup: error: "
-		    "could not write to xtrabackup_galera_info, errno = %d\n",
+		    "could not write to "XB_GALERA_INFO_FILENAME", errno = %d\n",
 		    errno);
 		exit(EXIT_FAILURE);
 	}

=== added file 'storage/innobase/xtrabackup/test/t/bug1418584.sh'
--- storage/innobase/xtrabackup/test/t/bug1418584.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1418584.sh	2015-02-12 12:18:10 +0000
@@ -0,0 +1,40 @@
+###############################################################################
+# Bug #1418584: Do not overwrite xtrabackup_galera_info when using autorecovery
+###############################################################################
+
+require_galera
+
+ADDR=127.0.0.1
+
+if [[ -n ${WSREP_DEBUG:-} ]];then
+    start_server --log-bin=`hostname`-bin --binlog-format=ROW \
+                 --wsrep-provider=$LIBGALERA_PATH \
+                 --wsrep_cluster_address=gcomm:// \
+                 --wsrep-debug=1 --wsrep_provider_options="debug=1" \
+                 --wsrep_node_address=$ADDR
+else
+    start_server --log-bin=`hostname`-bin --binlog-format=ROW \
+                 --wsrep-provider=$LIBGALERA_PATH \
+                 --wsrep_cluster_address=gcomm:// --wsrep_node_address=$ADDR
+fi
+
+has_backup_locks && skip_test "Requires server without backup locks support"
+
+backup_dir=$topdir/backup
+
+backup_dir=$topdir/backup
+
+innobackupex --no-timestamp --galera-info $backup_dir
+
+test -f $backup_dir/xtrabackup_galera_info ||
+  die "xtrabackup_galera_info was not created"
+
+echo "test" > $backup_dir/xtrabackup_galera_info
+
+cp $backup_dir/xtrabackup_galera_info $backup_dir/xtrabackup_galera_info_copy
+
+innobackupex --apply-log $backup_dir
+
+# Test that xtrabackup_galera_info has not been overwritten on --apply-log
+diff -u $backup_dir/xtrabackup_galera_info \
+     $backup_dir/xtrabackup_galera_info_copy