Merge lp:~akopytov/percona-xtrabackup/bug713267-2.1 into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/14/

[Stewart Smith (stewart)]

 review approve
 merge approve
--
Stewart Smith

review: Approve

=== modified file 'src/fil_cur.c'
--- src/fil_cur.c	2012-05-25 11:38:15 +0000
+++ src/fil_cur.c	2012-05-30 09:23:28 +0000
@@ -56,34 +56,6 @@
 
 	cursor->is_system = trx_sys_sys_space(node->space->id);
 
-	/* Determine the page size */
-#ifndef INNODB_VERSION_SHORT
-	zip_size = UNIV_PAGE_SIZE;
-	page_size = UNIV_PAGE_SIZE;
-	page_size_shift = UNIV_PAGE_SIZE_SHIFT;
-#else
-	zip_size = fil_space_get_zip_size(node->space->id);
-	if (zip_size == ULINT_UNDEFINED) {
-		return(XB_FIL_CUR_SKIP);
-	} else if (zip_size) {
-		page_size = zip_size;
-		page_size_shift = get_bit_shift(page_size);
-		msg("[%02u] %s is compressed with page size = "
-		    "%lu bytes\n", thread_n, node->name, page_size);
-		if (page_size_shift < 10 || page_size_shift > 14) {
-			msg("[%02u] xtrabackup: Error: Invalid "
-			    "page size: %lu.\n", thread_n, page_size);
-			ut_error;
-		}
-	} else {
-		page_size = UNIV_PAGE_SIZE;
-		page_size_shift = UNIV_PAGE_SIZE_SHIFT;
-	}
-#endif
-	cursor->page_size = page_size;
-	cursor->page_size_shift = page_size_shift;
-	cursor->zip_size = zip_size;
-
 	/* Make the file path relative to the backup root,
 	i.e. "ibdata1" for system tablespace or database/table.ibd for
 	per-table spaces. */
@@ -133,7 +105,35 @@
 		cursor->file = node->handle;
 	}
 	posix_fadvise(cursor->file, 0, 0, POSIX_FADV_SEQUENTIAL);
-	posix_fadvise(cursor->file, 0, 0, POSIX_FADV_DONTNEED);
+
+	/* Determine the page size */
+#ifndef INNODB_VERSION_SHORT
+	zip_size = UNIV_PAGE_SIZE;
+	page_size = UNIV_PAGE_SIZE;
+	page_size_shift = UNIV_PAGE_SIZE_SHIFT;
+#else
+	zip_size = xb_get_zip_size(cursor->file);
+	if (zip_size == ULINT_UNDEFINED) {
+		os_file_close(cursor->file);
+		return(XB_FIL_CUR_SKIP);
+	} else if (zip_size) {
+		page_size = zip_size;
+		page_size_shift = get_bit_shift(page_size);
+		msg("[%02u] %s is compressed with page size = "
+		    "%lu bytes\n", thread_n, node->name, page_size);
+		if (page_size_shift < 10 || page_size_shift > 14) {
+			msg("[%02u] xtrabackup: Error: Invalid "
+			    "page size: %lu.\n", thread_n, page_size);
+			ut_error;
+		}
+	} else {
+		page_size = UNIV_PAGE_SIZE;
+		page_size_shift = UNIV_PAGE_SIZE_SHIFT;
+	}
+#endif
+	cursor->page_size = page_size;
+	cursor->page_size_shift = page_size_shift;
+	cursor->zip_size = zip_size;
 
 	/* Allocate read buffer */
 	cursor->buf_size = XB_FIL_CUR_PAGES * page_size;
@@ -246,6 +246,8 @@
 		cursor->buf_npages++;
 	}
 
+	posix_fadvise(cursor->file, 0, 0, POSIX_FADV_DONTNEED);
+
 	cursor->offset += page_size * i;
 
 	return(ret);

=== modified file 'src/xtrabackup.c'
--- src/xtrabackup.c	2012-05-25 11:38:15 +0000
+++ src/xtrabackup.c	2012-05-30 09:23:28 +0000
@@ -1626,6 +1626,37 @@
 	return(TRUE);
 }
 
+#ifdef INNODB_VERSION_SHORT
+/***********************************************************************
+Reads the space flags from a given data file and returns the compressed
+page size, or 0 if the space is not compressed. */
+ulint
+xb_get_zip_size(os_file_t file)
+{
+	byte	*buf;
+	byte	*page;
+	ulint	 zip_size = ULINT_UNDEFINED;
+	ibool	 success;
+	ulint	 space;
+
+	buf = ut_malloc(2 * UNIV_PAGE_SIZE_MAX);
+	page = ut_align(buf, UNIV_PAGE_SIZE_MAX);
+
+	success = os_file_read(file, page, 0, 0, UNIV_PAGE_SIZE_MAX);
+	if (!success) {
+		goto end;
+	}
+
+	space = mach_read_from_4(page + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID);
+	zip_size = (space == 0 ) ? 0 :
+		dict_table_flags_to_zip_size(fsp_header_get_flags(page));
+end:
+	ut_free(buf);
+
+	return(zip_size);
+}
+#endif
+
 /* TODO: We may tune the behavior (e.g. by fil_aio)*/
 
 static

=== modified file 'src/xtrabackup.h'
--- src/xtrabackup.h	2012-05-25 11:38:15 +0000
+++ src/xtrabackup.h	2012-05-30 09:23:28 +0000
@@ -38,4 +38,11 @@
 my_bool xb_write_delta_metadata(const char *filename,
 				const xb_delta_info_t *info);
 
-#endif
+#ifdef INNODB_VERSION_SHORT
+/***********************************************************************
+Reads the space flags from a given data file and returns the compressed
+page size, or 0 if the space is not compressed. */
+ulint xb_get_zip_size(os_file_t file);
+#endif /* INNODB_VERSION_SHORT */
+
+#endif /* XB_XTRABACKUP_H */