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

[Laurynas Biveinis]

Fix bug 1043762 (Incremental backups may take up to 5x more space
after the fix for bug #1022562).

Fix for bug 1022562 unconditionally copied first 64K of every
tablespace for incremental backups. In case of many tablespaces, that
creates huge deltas even in the absence of any changes.

Fixed by not requiring to copy the first 64K, but rather by creating
any missing tablespaces from scratch. Introduce new function
xb_delta_create_space_file() that is adopted from
fil_create_new_single_table_tablespace().

Non-functional change, no testsuite changes necessary.

Jenkins: http://jenkins.percona.com/job/percona-xtrabackup-2.0-param/254/

Unmerged revisions

466. By Laurynas Biveinis on 2012-09-05

Fix bug 1043762 (Incremental backups may take up to 5x more space
after the fix for bug #1022562).

Fix for bug 1022562 unconditionally copied first 64K of every
tablespace for incremental backups. In case of many tablespaces, that
creates huge deltas even in the absence of any changes.

Fixed by not requiring to copy the first 64K, but rather by creating
any missing tablespaces from scratch. Introduce new function
xb_delta_create_space_file() that is adopted from
fil_create_new_single_table_tablespace().

Non-functional change, no testsuite changes necessary.

465. By Laurynas Biveinis on 2012-09-05

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

=== modified file 'src/xtrabackup.c'
--- src/xtrabackup.c	2012-09-07 10:46:35 +0000
+++ src/xtrabackup.c	2012-09-07 10:46:35 +0000
@@ -3423,18 +3423,11 @@
 		if (xtrabackup_incremental) {
 			for (chunk_offset = 0; chunk_offset < chunk; chunk_offset += page_size) {
 				/* newer page */
-				/* This condition may be OK for header, ibuf and fsp
-				We always copy the 1st
-				FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE
-				bytes of any tablespace, regardless of the LSNs
-				of the pages there.  These pages are guaranteed
-				to be flushed upon tablespace create and they
-				are required for InnoDB to recognize the
-				tablespace. */
+				/* This condition may be OK for header, ibuf
+				and fsp. */
 				if (ut_dulint_cmp(incremental_lsn,
-					MACH_READ_64(page + chunk_offset + FIL_PAGE_LSN)) < 0
-				    || (offset + chunk_offset
-					< FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE)) {
+					MACH_READ_64(page + chunk_offset
+						     + FIL_PAGE_LSN)) < 0) {
 	/* ========================================= */
 	IB_INT64 offset_on_page;
 
@@ -5657,12 +5650,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
@@ -5763,12 +5851,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
@@ -5798,15 +5881,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;