Merge lp:~akopytov/percona-xtrabackup/bug977652-2.0 into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.0-param/212/

[Stewart Smith (stewart)]

review: Approve

=== modified file 'src/compress.c'
--- src/compress.c	2012-02-10 20:05:56 +0000
+++ src/compress.c	2012-06-14 12:35:31 +0000
@@ -489,3 +489,14 @@
 
 	return NULL;
 }
+
+/* Return a target datasink for the specified compress datasink */
+ds_ctxt_t *
+compress_get_dest_ctxt(ds_ctxt_t *ctxt)
+{
+	ds_compress_ctxt_t *comp_ctxt;
+
+	comp_ctxt = (ds_compress_ctxt_t *) ctxt->ptr;
+
+	return comp_ctxt->dest_ctxt;
+}

=== modified file 'src/compress.h'
--- src/compress.h	2012-02-10 20:05:56 +0000
+++ src/compress.h	2012-06-14 12:35:31 +0000
@@ -25,4 +25,7 @@
 
 extern datasink_t datasink_compress;
 
+/* Return a target datasink for the specified compress datasink */
+ds_ctxt_t *compress_get_dest_ctxt(ds_ctxt_t *);
+
 #endif

=== modified file 'src/xtrabackup.c'
--- src/xtrabackup.c	2012-05-28 16:44:13 +0000
+++ src/xtrabackup.c	2012-06-14 12:35:31 +0000
@@ -3903,6 +3903,7 @@
 	char logfile_temp_path[FN_REFLEN];
 	datasink_t		*ds;
 	ds_ctxt_t		*ds_ctxt = NULL;
+	ds_ctxt_t		*meta_ds_ctxt;
 
 #ifdef USE_POSIX_FADVISE
 	msg("xtrabackup: uses posix_fadvise().\n");
@@ -4496,10 +4497,14 @@
 	metadata_to_lsn = latest_cp;
 	metadata_last_lsn = log_copy_scanned_lsn;
 
-	if (!xtrabackup_stream_metadata(ds_ctxt))
-		msg("xtrabackup: error: "
-		    "xtrabackup_stream_metadata() failed.\n"
-		    );
+	/* Write xtrabackup_checkpoint without compression, if it was used for
+	backup. */
+	meta_ds_ctxt = xtrabackup_compress ?
+		compress_get_dest_ctxt(ds_ctxt) : ds_ctxt;
+	if (!xtrabackup_stream_metadata(meta_ds_ctxt))
+		msg("xtrabackup: error:"
+		    "xtrabackup_stream_metadata() failed.\n");
+
 	if (xtrabackup_extra_lsndir) {
 		char	filename[FN_REFLEN];
 

=== added file 'test/t/bug977652.sh'
--- test/t/bug977652.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug977652.sh	2012-06-14 12:35:31 +0000
@@ -0,0 +1,22 @@
+#############################################################################
+# Bug #977652: Compressed/Uncompressed incremental backup fails on compressed
+#              full backup in Xtrabackup 2.0.0
+#############################################################################
+
+if ! which qpress > /dev/null 2>&1 ; then
+  echo "Requires qpress to be installed" > $SKIPPED_REASON
+  exit $SKIPPED_EXIT_CODE
+fi
+
+. inc/common.sh
+
+start_server --innodb_file_per_table
+
+load_sakila
+
+# Take a full compressed backup
+innobackupex --compress --no-timestamp $topdir/full
+
+# Test that incremental backups work without uncompressing the full one
+innobackupex --compress --no-timestamp --incremental \
+    --incremental-basedir=$topdir/full $topdir/incremental