Merge lp:~gl-az/percona-server/port_ALL_O_DIRECT_to_5.6 into lp:percona-server/5.6

[George Ormond Lorch III]

Reviewed 5.5 ALL_O_DIRECT and fixes for 1131949. Ported a few lines of code and additional test from 5.5 track changed pages.

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/299/

[Laurynas Biveinis (laurynas-biveinis)]

    - 5.6 refactored fil_flush() and there is a new #define in
      fil0fil.cc fil_buffering_disabled() to check whether fsync() is
      disabled for a given tablespace. Since ALL_O_DIRECT disables
      fsync() for log tablespaces (see bug 1229583), it is probably a
      good idea to extend fil_buffering_disabled() to become aware of
      it too. This will have an effect of skipping some code paths
      such as unflushed_spaces list maintenance.
    - Consider adding ... || != SRV_UNIX_ALL_O_DIRECT check for
      fil_flush_file_spaces() call in log_checkpoint(). Without the
      previous fil_buffering_disabled() change,
      fil_flush_file_spaces() would still acquire the file system
      mutex, loop through file spaces, find the log ones, attempt to
      flush them with file system mutex acquired again, discovering it
      should be a no-op and returning. With the above change this is
      reduced to the initial mutex acquisition and loop through the
      spaces. And if we just skip fil_flush_file_spaces() call in
      log_checkpoint(), we avoid that too.
    - The new if statement in os_file_create_func() should be merged
      with the previous one to become else if.
    - Please remove the comment preceding that first if: "We disable
      OS caching (O_DIRECT) only on data files */
    - The SRV_UNIX_ALL_O_DIRECT comment in srv0srv.h could be
      replaced with something more descriptive along the lines of
      SRV_UNIX_O_DIRECT comment.
    - The "O_DSYNC means ... " comment in log_write_to() should
      become "O_DSYNC or ALL_O_DIRECT means ... "

review: Needs Fixing

[George Ormond Lorch III (gl-az)]

new jenkins based on suggestions:
http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/303/

[Laurynas Biveinis (laurynas-biveinis)]

    - In fil_buffering_disabled, please explicitly check for purpose
      == FIL_LOG. This will future-proof the code a bit in the case
      a new tablespcae type is added.

review: Needs Fixing

[George Ormond Lorch III (gl-az)]

After IRC discussion and a bit of a revelation in ALL_O_DIRECT/fsync behavior, changed comment on ALL_O_DIRECT to correctly reflect actual behavior and changed fil_buffering_disabled() to test (s)->purpose == FIL_LOG.

Jenkins run on raw 5.6 rev 430 (trunk) to see what is actually currently failing http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/308

JEnkins run on merged feature and fixes http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/311

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_flush.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_flush.result	2013-05-09 19:43:37 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_flush.result	2013-09-26 04:59:04 +0000
@@ -17,5 +17,11 @@
 ib_modified_log_2
 ib_modified_log_3
 ib_modified_log_4
+INSERT INTO t1 VALUES (4, REPEAT("e", 20000));
+ib_modified_log_1
+ib_modified_log_2
+ib_modified_log_3
+ib_modified_log_4
+ib_modified_log_5
 RESET CHANGED_PAGE_BITMAPS;
 DROP TABLE t1;

=== modified file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_flush.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_flush.test	2013-05-27 17:45:26 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_flush.test	2013-09-26 04:59:04 +0000
@@ -63,6 +63,21 @@
 
 INSERT INTO t1 VALUES (3, REPEAT("c", 20000));
 
+# Test innodb_flush_method=ALL_O_DIRECT
+# Check that the previous test produced bitmap data while the server is down.
+#
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+file_exists $BITMAP_FILE;
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+--enable_reconnect
+--exec echo "restart:--innodb-track-changed-pages=1 --innodb-flush-method=ALL_O_DIRECT" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+INSERT INTO t1 VALUES (4, REPEAT("d", 20000));
+
 #
 # Test innodb_flush_method=O_DIRECT_NO_FSYNC
 # Check that the previous test produced bitmap data while the server is down.
@@ -77,7 +92,7 @@
 --exec echo "restart:--innodb-track-changed-pages=1 --innodb-flush-method=O_DIRECT_NO_FSYNC" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --source include/wait_until_connected_again.inc
 
-INSERT INTO t1 VALUES (4, REPEAT("d", 20000));
+INSERT INTO t1 VALUES (4, REPEAT("e", 20000));
 
 #
 # Restart the server with default options

=== modified file 'Percona-Server/storage/innobase/fil/fil0fil.cc'
--- Percona-Server/storage/innobase/fil/fil0fil.cc	2013-09-09 14:20:25 +0000
+++ Percona-Server/storage/innobase/fil/fil0fil.cc	2013-09-26 04:59:04 +0000
@@ -321,10 +321,12 @@
 
 /** 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 'Percona-Server/storage/innobase/include/srv0srv.h'
--- Percona-Server/storage/innobase/include/srv0srv.h	2013-08-06 15:16:34 +0000
+++ Percona-Server/storage/innobase/include/srv0srv.h	2013-09-26 04:59:04 +0000
@@ -557,13 +557,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 'Percona-Server/storage/innobase/log/log0log.cc'
--- Percona-Server/storage/innobase/log/log0log.cc	2013-06-25 13:13:06 +0000
+++ Percona-Server/storage/innobase/log/log0log.cc	2013-09-26 04:59:04 +0000
@@ -1154,6 +1154,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);
@@ -1175,6 +1176,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
 	    && thd_flush_log_at_trx_commit(NULL) != 2) {
 
@@ -1574,9 +1576,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 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;
 
@@ -2059,7 +2063,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 'Percona-Server/storage/innobase/os/os0file.cc'
--- Percona-Server/storage/innobase/os/os0file.cc	2013-08-29 17:46:30 +0000
+++ Percona-Server/storage/innobase/os/os0file.cc	2013-09-26 04:59:04 +0000
@@ -1790,8 +1790,6 @@
 
 	} while (retry);
 
-	/* We disable OS caching (O_DIRECT) only on data files */
-
 	if (!srv_read_only_mode
 	    && *success
 	    && type != OS_LOG_FILE
@@ -1799,6 +1797,10 @@
 		|| 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 'Percona-Server/storage/innobase/srv/srv0start.cc'
--- Percona-Server/storage/innobase/srv/srv0start.cc	2013-08-14 03:57:21 +0000
+++ Percona-Server/storage/innobase/srv/srv0start.cc	2013-09-26 04:59:04 +0000
@@ -1703,6 +1703,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;