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

[Laurynas Biveinis]

Merge bug 1049174, bug 1044398, bug 1043762 fixes from 2.0.

Differences from 2.0 version:
- xb_delta_create_space_file() is named xb_space_create_file() and put
  into innodb_int.[hc].
- dict_table_flags_to_zip_size() definition provided for pre-InnoDB
  plugin configurations, to remove #ifndef INNODB_VERSION_SHORT in
  xb_delta_open_matching_space().
- The compression flag constants are defined in innodb_int.h instead
  of xtrabackup.c.
- Define fil_space_create() wrapper xb_fil_space_create() in
  innodb_int.h that accepts but ignores zip_size arg on pre-InnoDB
  plugin configurations.
- Moved SRV_SHUTDOWN_NONE definition to the main compatibility #define
  section in innodb_int.h.
- The suboptimal fix for bug 1022562 is reverted by removing
  wf_common_filter() function and updating its caller.

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

Issue #16274

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'src/innodb_int.c'
--- src/innodb_int.c	2012-07-11 07:55:58 +0000
+++ src/innodb_int.c	2012-09-14 13:04:19 +0000
@@ -200,8 +200,124 @@
 	return(space);
 }
 
+/****************************************************************//**
+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.  */
+ibool
+xb_space_create_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;
+}
+
+
 #ifndef INNODB_VERSION_SHORT
 
+/********************************************************************//**
+Extract the compressed page size from table flags.
+@return	compressed page size, or 0 if not compressed */
+ulint
+dict_table_flags_to_zip_size(
+/*=========================*/
+	ulint	flags)	/*!< in: flags */
+{
+	ulint	zip_size = flags & DICT_TF_ZSSIZE_MASK;
+
+	if (UNIV_UNLIKELY(zip_size)) {
+		zip_size = ((PAGE_ZIP_MIN_SIZE >> 1)
+			    << (zip_size >> DICT_TF_ZSSIZE_SHIFT));
+
+		ut_ad(zip_size <= UNIV_PAGE_SIZE);
+	}
+
+	return(zip_size);
+}
+
+
 /*******************************************************************//**
 Free all spaces in space_list. */
 void
 
=== modified file 'src/innodb_int.h'
--- src/innodb_int.h	2012-07-11 07:55:58 +0000
+++ src/innodb_int.h	2012-09-14 13:04:19 +0000
@@ -42,6 +42,15 @@
 #  define MACH_WRITE_64 mach_write_to_8
 #  define OS_MUTEX_CREATE() os_mutex_create(NULL)
 #  define xb_buf_page_is_corrupted(page, zip_size) buf_page_is_corrupted(page)
+#  define xb_fil_space_create(name, space_id, zip_size, purpose) \
+	fil_space_create(name, space_id, purpose)
+#  define PAGE_ZIP_MIN_SIZE_SHIFT	10
+#  define PAGE_ZIP_MIN_SIZE	(1 << PAGE_ZIP_MIN_SIZE_SHIFT)
+#  define DICT_TF_ZSSIZE_SHIFT	1
+#  define DICT_TF_ZSSIZE_MASK		(15 << DICT_TF_ZSSIZE_SHIFT)
+#  define DICT_TF_FORMAT_ZIP	1
+#  define DICT_TF_FORMAT_SHIFT		5
+#  define SRV_SHUTDOWN_NONE	0
 #else
 #  define IB_INT64 ib_int64_t
 #  define LSN64 ib_uint64_t
@@ -56,6 +65,8 @@
 #  endif
 #  define xb_buf_page_is_corrupted(page, zip_size)	\
 	buf_page_is_corrupted(page, zip_size)
+#  define xb_fil_space_create(name, space_id, zip_size, purpose) \
+	fil_space_create(name, space_id, zip_size, purpose)
 #  define ut_dulint_zero 0
 #  define ut_dulint_cmp(A, B) (A > B ? 1 : (A == B ? 0 : -1))
 #  define ut_dulint_add(A, B) (A + B)
@@ -598,9 +609,32 @@
 /*==================*/
 	const char*	name);	/*!< in: space name */
 
+/****************************************************************//**
+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.  */
+ibool
+xb_space_create_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 */
+
 #ifndef INNODB_VERSION_SHORT
 
-#define SRV_SHUTDOWN_NONE 0
+/********************************************************************//**
+Extract the compressed page size from table flags.
+@return	compressed page size, or 0 if not compressed */
+ulint
+dict_table_flags_to_zip_size(
+/*=========================*/
+	ulint	flags);	/*!< in: flags */
+
 
 /*******************************************************************//**
 Free all spaces in space_list. */
 
=== modified file 'src/write_filt.c'
--- src/write_filt.c	2012-08-01 10:10:44 +0000
+++ src/write_filt.c	2012-09-14 13:04:19 +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);
@@ -118,6 +103,7 @@
 	snprintf(meta_name, sizeof(meta_name), "%s%s", dst_name,
 		 XB_DELTA_INFO_SUFFIX);
 	info.page_size = cursor->page_size;
+	info.zip_size = cursor->zip_size;
 	info.space_id = cursor->space_id;
 	if (!xb_write_delta_metadata(meta_name, &info)) {
 		msg("[%02lu] xtrabackup: Error: "
@@ -152,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-05 08:35:45 +0000
+++ src/xtrabackup.c	2012-09-14 13:04:19 +0000
@@ -1506,6 +1506,7 @@
 
 	/* set defaults */
 	info->page_size = ULINT_UNDEFINED;
+	info->zip_size = ULINT_UNDEFINED;
 	info->space_id = ULINT_UNDEFINED;
 
 	fp = fopen(filepath, "r");
@@ -1518,6 +1519,8 @@
 		if (fscanf(fp, "%50s = %50s\n", key, value) == 2) {
 			if (strcmp(key, "page_size") == 0) {
 				info->page_size = strtoul(value, NULL, 10);
+			} else if (strcmp(key, "zip_size") == 0) {
+				info->zip_size = strtoul(value, NULL, 10);
 			} else if (strcmp(key, "space_id") == 0) {
 				info->space_id = strtoul(value, NULL, 10);
 			}
@@ -1552,8 +1555,10 @@
 	MY_STAT		mystat;
 
 	snprintf(buf, sizeof(buf),
-		 "page_size = %lu\nspace_id = %lu\n",
-		 info->page_size, info->space_id);
+		 "page_size = %lu\n"
+		 "zip_size = %lu\n"
+		 "space_id = %lu\n",
+		 info->page_size, info->zip_size, info->space_id);
 	len = strlen(buf);
 
 	mystat.st_size = len;
@@ -3836,7 +3841,7 @@
 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
@@ -3937,19 +3942,17 @@
 		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.  */
-
-#ifdef INNODB_VERSION_SHORT
-	/* Calculate correct tablespace flags for compressed tablespaces.  Do
-	not bother to set all flags correctly, just enough for
-	fil_space_create() to work.  The full flags will be restored from the
-	delta later.  */
-	if (!zip_size) {
+	/* No matching space found. create the new one.  */
+
+	if (!xb_fil_space_create(dest_space_name, space_id, 0,
+				 FIL_TABLESPACE)) {
+		msg("xtrabackup: Cannot create tablespace %s\n",
+			dest_space_name);
+		goto exit;
+	}
+
+	/* Calculate correct tablespace flags for compressed tablespaces.  */
+	if (!zip_size || zip_size == ULINT_UNDEFINED) {
 		tablespace_flags = 0;
 	}
 	else {
@@ -3959,29 +3962,11 @@
 			   << DICT_TF_ZSSIZE_SHIFT)
 			| DICT_TF_COMPACT
 			| (DICT_TF_FORMAT_ZIP << DICT_TF_FORMAT_SHIFT);
-	}
-	ut_a(dict_table_flags_to_zip_size(tablespace_flags) == zip_size);
-	if (!fil_space_create(dest_space_name, space_id, tablespace_flags,
-			      FIL_TABLESPACE)) {
-#else
-	if (!fil_space_create(dest_space_name, space_id,
-		FIL_TABLESPACE)) {
-#endif
-		msg("xtrabackup: Cannot create tablespace %s\n",
-			dest_space_name);
-		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);
-	}
-
+		ut_a(dict_table_flags_to_zip_size(tablespace_flags)
+		     == zip_size);
+	}
+	*success = xb_space_create_file(real_name, space_id, tablespace_flags,
+					&file);
 	goto exit;
 
 found:
@@ -4088,8 +4073,7 @@
 	xb_file_set_nocache(src_file, src_path, "OPEN");
 
 	dst_file = xb_delta_open_matching_space(
-			dbname, space_name, info.space_id,
-			info.page_size == UNIV_PAGE_SIZE ? 0 : info.page_size,
+			dbname, space_name, info.space_id, info.zip_size,
 			dst_path, sizeof(dst_path), &success);
 	if (!success) {
 		msg("xtrabackup: error: cannot open %s\n", dst_path);
 
=== modified file 'src/xtrabackup.h'
--- src/xtrabackup.h	2012-07-11 07:55:58 +0000
+++ src/xtrabackup.h	2012-09-14 13:04:19 +0000
@@ -22,8 +22,9 @@
 #define XB_XTRABACKUP_H
 
 typedef struct {
-    ulint	page_size;
- 	ulint	space_id;
+	ulint	page_size;
+	ulint	zip_size;
+	ulint	space_id;
 } xb_delta_info_t;
 
 typedef enum {