Merge lp:~akopytov/percona-xtrabackup/bug1261877-2.2 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

Manual merge from 2.1.

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/96/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/fil/fil0fil.cc'
--- storage/innobase/fil/fil0fil.cc	2014-01-09 11:48:43 +0000
+++ storage/innobase/fil/fil0fil.cc	2014-01-17 17:25:10 +0000
@@ -148,10 +148,11 @@
 
 /** Determine if user has explicitly disabled fsync(). */
 #ifndef __WIN__
-# define fil_buffering_disabled(s)	\
-	((s)->purpose == FIL_TABLESPACE	\
-	 && srv_unix_file_flush_method	\
-	 == SRV_UNIX_O_DIRECT_NO_FSYNC)
+# define fil_buffering_disabled(s)					\
+	(((s)->purpose == FIL_TABLESPACE				\
+	    && srv_unix_file_flush_method == SRV_UNIX_O_DIRECT_NO_FSYNC)\
+	  || ((s)->purpose == FIL_LOG					\
+	    && srv_unix_file_flush_method == SRV_UNIX_ALL_O_DIRECT))
 #else /* __WIN__ */
 # define fil_buffering_disabled(s)	(0)
 #endif /* __WIN__ */
 
=== modified file 'storage/innobase/include/srv0srv.h'
--- storage/innobase/include/srv0srv.h	2013-11-26 10:44:44 +0000
+++ storage/innobase/include/srv0srv.h	2014-01-17 17:25:10 +0000
@@ -505,13 +505,17 @@
 				the reason for which is that some FS
 				do not flush meta-data when
 				unbuffered IO happens */
-	SRV_UNIX_O_DIRECT_NO_FSYNC
+	SRV_UNIX_O_DIRECT_NO_FSYNC,
 				/*!< do not use fsync() when using
 				direct IO i.e.: it can be set to avoid
 				the fsync() call that we make when
 				using SRV_UNIX_O_DIRECT. However, in
 				this case user/DBA should be sure about
 				the integrity of the meta-data */
+	SRV_UNIX_ALL_O_DIRECT   /*!< similar to O_DIRECT, invokes
+				os_file_set_nocache() on data and log files.
+				This implies using non-buffered IO but still
+				using fsync for data but not log files. */
 };
 
 /** Alternatives for file i/o in Windows */
 
=== modified file 'storage/innobase/log/log0log.cc'
--- storage/innobase/log/log0log.cc	2014-01-09 11:48:43 +0000
+++ storage/innobase/log/log0log.cc	2014-01-17 17:25:10 +0000
@@ -1183,6 +1183,7 @@
 		group = (log_group_t*)((ulint) group - 1);
 
 		if (srv_unix_file_flush_method != SRV_UNIX_O_DSYNC
+		    && srv_unix_file_flush_method != SRV_UNIX_ALL_O_DIRECT
 		    && srv_unix_file_flush_method != SRV_UNIX_NOSYNC) {
 
 			fil_flush(group->space_id);
@@ -1204,6 +1205,7 @@
 			logs and cannot end up here! */
 
 	if (srv_unix_file_flush_method != SRV_UNIX_O_DSYNC
+	    && srv_unix_file_flush_method != SRV_UNIX_ALL_O_DIRECT
 	    && srv_unix_file_flush_method != SRV_UNIX_NOSYNC
 	    && srv_flush_log_at_trx_commit != 2) {
 
@@ -1605,9 +1607,11 @@
 
 	mutex_exit(&(log_sys->mutex));
 
-	if (srv_unix_file_flush_method == SRV_UNIX_O_DSYNC) {
-		/* O_DSYNC means the OS did not buffer the log file at all:
-		so we have also flushed to disk what we have written */
+	if (srv_unix_file_flush_method == SRV_UNIX_O_DSYNC ||
+	    srv_unix_file_flush_method != SRV_UNIX_ALL_O_DIRECT) {
+		/* O_DSYNC or SRV_UNIX_ALL_O_DIRECT means the OS did not buffer
+		the log file at all: so we have also flushed to disk what we
+		have written */
 
 		log_sys->flushed_to_disk_lsn = log_sys->write_lsn;
 
@@ -2090,7 +2094,8 @@
 		recv_apply_hashed_log_recs(TRUE);
 	}
 
-	if (srv_unix_file_flush_method != SRV_UNIX_NOSYNC) {
+	if (srv_unix_file_flush_method != SRV_UNIX_NOSYNC
+	    && srv_unix_file_flush_method != SRV_UNIX_ALL_O_DIRECT) {
 		fil_flush_file_spaces(FIL_TABLESPACE);
 	}
 
 
=== modified file 'storage/innobase/log/log0recv.cc'
--- storage/innobase/log/log0recv.cc	2013-11-27 08:36:11 +0000
+++ storage/innobase/log/log0recv.cc	2014-01-17 17:25:10 +0000
@@ -3103,9 +3103,13 @@
 	lsn_t		archived_lsn;
 #endif /* UNIV_LOG_ARCHIVE */
 	byte*		buf;
-	byte		log_hdr_buf[LOG_FILE_HDR_SIZE];
+	byte*		log_hdr_buf;
+	byte		log_hdr_buf_base[LOG_FILE_HDR_SIZE + OS_FILE_LOG_BLOCK_SIZE];
 	dberr_t		err;
 
+	log_hdr_buf = static_cast<byte *>
+		(ut_align(log_hdr_buf_base, OS_FILE_LOG_BLOCK_SIZE));
+
 #ifdef UNIV_LOG_ARCHIVE
 	ut_ad(type != LOG_CHECKPOINT || limit_lsn == LSN_MAX);
 /** TRUE when recovering from a checkpoint */
 
=== modified file 'storage/innobase/os/os0file.cc'
--- storage/innobase/os/os0file.cc	2014-01-09 11:48:43 +0000
+++ storage/innobase/os/os0file.cc	2014-01-17 17:25:10 +0000
@@ -1750,8 +1750,6 @@
 
 	} while (retry);
 
-	/* We disable OS caching (O_DIRECT) only on data files */
-
 	if (!srv_read_only_mode
 	    && *success
 	    && type != OS_LOG_FILE
@@ -1759,6 +1757,11 @@
 		|| srv_unix_file_flush_method == SRV_UNIX_O_DIRECT_NO_FSYNC)) {
 
 		os_file_set_nocache(file, name, mode_str);
+	} else if (!srv_read_only_mode
+	    && *success
+	    && srv_unix_file_flush_method == SRV_UNIX_ALL_O_DIRECT) {
+
+		os_file_set_nocache(file, name, mode_str);
 	}
 
 #ifdef USE_FILE_LOCK
 
=== modified file 'storage/innobase/srv/srv0start.cc'
--- storage/innobase/srv/srv0start.cc	2014-01-09 11:48:43 +0000
+++ storage/innobase/srv/srv0start.cc	2014-01-17 17:25:10 +0000
@@ -1709,6 +1709,9 @@
 	} else if (0 == ut_strcmp(srv_file_flush_method_str, "O_DIRECT")) {
 		srv_unix_file_flush_method = SRV_UNIX_O_DIRECT;
 
+	} else if (0 == ut_strcmp(srv_file_flush_method_str, "ALL_O_DIRECT")) {
+		srv_unix_file_flush_method = SRV_UNIX_ALL_O_DIRECT;
+
 	} else if (0 == ut_strcmp(srv_file_flush_method_str, "O_DIRECT_NO_FSYNC")) {
 		srv_unix_file_flush_method = SRV_UNIX_O_DIRECT_NO_FSYNC;
 
 
=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
--- storage/innobase/xtrabackup/src/xtrabackup.cc	2014-01-12 12:50:44 +0000
+++ storage/innobase/xtrabackup/src/xtrabackup.cc	2014-01-17 17:25:10 +0000
@@ -2928,9 +2928,8 @@
 	} else if (0 == ut_strcmp(srv_file_flush_method_str, "nosync")) {
 	  	srv_unix_file_flush_method = SRV_UNIX_NOSYNC;
 	} else if (0 == ut_strcmp(srv_file_flush_method_str, "ALL_O_DIRECT")) {
-		/* ALL_O_DIRECT is currently accepted, but ignored by
-		XtraBackup */
-		msg("xtrabackup: ignoring innodb_flush_method=ALL_O_DIRECT\n");
+		srv_unix_file_flush_method = SRV_UNIX_ALL_O_DIRECT;
+		msg("xtrabackup: using ALL_O_DIRECT\n");
 	} else if (0 == ut_strcmp(srv_file_flush_method_str,
 				  "O_DIRECT_NO_FSYNC")) {
 		srv_unix_file_flush_method = SRV_UNIX_O_DIRECT_NO_FSYNC;
 
=== modified file 'storage/innobase/xtrabackup/test/t/bug759225.sh'
--- storage/innobase/xtrabackup/test/t/bug759225.sh	2013-11-26 10:44:44 +0000
+++ storage/innobase/xtrabackup/test/t/bug759225.sh	2014-01-17 17:25:10 +0000
@@ -12,9 +12,6 @@
 
 require_xtradb
 
-# ALL_O_DIRECT is not supported in XtraDB 5.6 ATM.
-require_server_version_lower_than 5.6.1
-
 MYSQLD_EXTRA_MY_CNF_OPTS="
 innodb_flush_method=ALL_O_DIRECT
 "