Merge lp:~laurynas-biveinis/percona-xtrabackup/bug1043762-2.1 into lp:percona-xtrabackup/2.1

[Laurynas Biveinis]

Merge fix for bug 1043762 from 2.0.

Jenkins: http://jenkins.percona.com/job/percona-xtrabackup-2.1-param/42/

Unmerged revisions

431. By Laurynas Biveinis on 2012-09-05

Merge fix for bug 1043762 from 2.0.

430. By Laurynas Biveinis on 2012-09-05

Automerge prerequisite lp:~laurynas-biveinis/percona-xtrabackup/bug1044398-2.1

=== modified file 'src/write_filt.c'
--- src/write_filt.c	2012-09-07 10:50:24 +0000
+++ src/write_filt.c	2012-09-07 10:50:24 +0000
@@ -32,21 +32,6 @@
 #include "xtrabackup.h"
 
 /************************************************************************
-The common tablespace-offset-based page filter.  This is a subroutine for all
-other filters that will select additional pages to be written by their
-tablespace position, regardless of the main filter logic.
-
-@return TRUE if the page with given id should be selected, FALSE otherwise. */
-static my_bool wf_common_filter(ulint offset) {
-	/* We always copy the 1st FIL_IBD_INITIAL_SIZE *
-	UNIV_PAGE_SIZE bytes of any tablespace.  These pages are
-	guaranteed to be flushed upon tablespace create and they are
-	needed so that we have a good minimal tablespace image before
-	doing anything further with it.  */
-	return (offset < FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE);
-}
-
-/************************************************************************
 Write-through page write filter. */
 static my_bool wf_wt_init(xb_write_filt_ctxt_t *ctxt, char *dst_name,
 			  xb_fil_cur_t *cursor);
@@ -153,8 +138,7 @@
 	for (i = 0, page = cursor->buf; i < cursor->buf_npages;
 	     i++, page += page_size) {
 		if (ut_dulint_cmp(incremental_lsn,
-				  MACH_READ_64(page + FIL_PAGE_LSN)) >= 0
-		    && !wf_common_filter(cursor->buf_offset + i * page_size)) {
+				  MACH_READ_64(page + FIL_PAGE_LSN)) >= 0) {
 			continue;
 		}
 

=== modified file 'src/xtrabackup.c'
--- src/xtrabackup.c	2012-09-07 10:50:24 +0000
+++ src/xtrabackup.c	2012-09-07 10:50:24 +0000
@@ -3835,13 +3835,107 @@
 	return TRUE;
 }
 
+/****************************************************************//**
+Create a new tablespace on disk and return the handle to its opened
+file. Code adopted from fil_create_new_single_table_tablespace with
+the main difference that only disk file is created without updating
+the InnoDB in-memory dictionary data structures.
+
+@return TRUE on success, FALSE on error.  */
+static
+ibool
+xb_delta_create_space_file(
+/*=======================*/
+	const char*	path,		/*!<in: path to tablespace */
+	ulint		space_id,	/*!<in: space id */
+	ulint		flags __attribute__((unused)),/*!<in: tablespace
+					flags */
+	os_file_t*	file)		/*!<out: file handle */
+{
+	ibool		ret;
+	byte*		buf;
+	byte*		page;
+
+	*file = xb_file_create_no_error_handling(path, OS_FILE_CREATE,
+						 OS_FILE_READ_WRITE, &ret);
+	if (!ret) {
+		msg("xtrabackup: cannot create file %s\n", path);
+		return ret;
+	}
+
+	ret = os_file_set_size(path, *file,
+			       FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE, 0);
+	if (!ret) {
+		msg("xtrabackup: cannot set size for file %s\n", path);
+		os_file_close(*file);
+		os_file_delete(path);
+		return ret;
+	}
+
+	buf = ut_malloc(3 * UNIV_PAGE_SIZE);
+	/* Align the memory for file i/o if we might have O_DIRECT set */
+	page = ut_align(buf, UNIV_PAGE_SIZE);
+
+	memset(page, '\0', UNIV_PAGE_SIZE);
+
+#ifdef INNODB_VERSION_SHORT
+	fsp_header_init_fields(page, space_id, flags);
+	mach_write_to_4(page + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID, space_id);
+
+	if (!(flags & DICT_TF_ZSSIZE_MASK)) {
+		buf_flush_init_for_writing(page, NULL, 0);
+
+		ret = os_file_write(path, *file, page, 0, 0, UNIV_PAGE_SIZE);
+	}
+	else {
+		page_zip_des_t	page_zip;
+		ulint		zip_size;
+
+		zip_size = (PAGE_ZIP_MIN_SIZE >> 1)
+			<< ((flags & DICT_TF_ZSSIZE_MASK)
+			    >> DICT_TF_ZSSIZE_SHIFT);
+		page_zip_set_size(&page_zip, zip_size);
+		page_zip.data = page + UNIV_PAGE_SIZE;
+		fprintf(stderr, "zip_size = %lu\n", zip_size);
+
+#ifdef UNIV_DEBUG
+		page_zip.m_start =
+#endif /* UNIV_DEBUG */
+			page_zip.m_end = page_zip.m_nonempty =
+			page_zip.n_blobs = 0;
+
+		buf_flush_init_for_writing(page, &page_zip, 0);
+
+		ret = os_file_write(path, *file, page_zip.data, 0, 0,
+				    zip_size);
+	}
+#else
+	fsp_header_write_space_id(page, space_id);
+
+	buf_flush_init_for_writing(page, ut_dulint_zero, space_id, 0);
+
+	ret = os_file_write(path, *file, page, 0, 0, UNIV_PAGE_SIZE);
+#endif
+
+	ut_free(buf);
+
+	if (!ret) {
+		msg("xtrabackup: could not write the first page to %s\n",
+		    path);
+		os_file_close(*file);
+		os_file_delete(path);
+		return ret;
+	}
+
+	return TRUE;
+}
 
 /***********************************************************************
 Searches for matching tablespace file for given .delta file and space_id
 in given directory. When matching tablespace found, renames it to match the
 name of .delta file. If there was a tablespace with matching name and
 mismatching ID, renames it to xtrabackup_tmp_#ID.ibd. If there was no
-matching file, creates a placeholder for the new tablespace.
+matching file, creates a new tablespace.
 @return file handle of matched or created file */
 static
 os_file_t
@@ -3942,12 +4036,7 @@
 		goto found;
 	}
 
-	/* No matching space found. create the new one.  Note that this is not
-	a full-fledged tablespace create, as done by
-	fil_create_new_single_table_tablespace(): the minumum tablespace size
-	is not ensured and the 1st page fields are not set.  We rely on backup
-	delta to contain the 1st FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE
-	to ensure the correct tablespace image.  */
+	/* No matching space found. create the new one.  */
 
 #ifdef INNODB_VERSION_SHORT
 	/* Calculate correct tablespace flags for compressed tablespaces.  Do
@@ -3977,15 +4066,8 @@
 		goto exit;
 	}
 
-	file = xb_file_create_no_error_handling(real_name, OS_FILE_CREATE,
-					    OS_FILE_READ_WRITE,
-					    &ok);
-
-	if (ok) {
-		*success = TRUE;
-	} else {
-		msg("xtrabackup: Cannot open file %s\n", real_name);
-	}
+	*success = xb_delta_create_space_file(real_name, space_id,
+					      tablespace_flags, &file);
 
 	goto exit;