Merge lp:~vlad-lesin/percona-server/5.6-xtrabackup-apply-logs-fixes into lp:percona-server/5.6

[Vlad Lesin]

See commit comments and related bug description.

[Laurynas Biveinis (laurynas-biveinis)]

Is there a Jenkins run? (this is not a review)

review: Needs Information

[Alexey Kopytov (akopytov)]

Hi Laurynas,

On Thu, 25 Apr 2013 23:58:23 -0000, Laurynas Biveinis wrote:
> Review: Needs Information
>
> Is there a Jenkins run? (this is not a review)
>

Well, this is not a real MP either :) Was created for preview purposes
for me to take a look.

[Alexey Kopytov (akopytov)]

I think a more correct fix would be to do:

max_flushed_lsn = log_get_lsn();
fil_write_flushed_lsn_to_data_files(max_flushed_lsn, 0);
fil_flush_file_spaces(FIL_TABLESPACE);

before calling create_log_files_rename() in case the log files are being resized.

Other calls of create_log_files_rename() don't need that, so doing it unconditionally inside create_log_files_rename() does not look right.

I'd also add a comment in that code explaining that create_log_files() can increase system LSN, so we have to update FIL_PAGE_FILE_FLUSH_LSN in data files.

Please also add the bug # reference and fix typos in revision comments before resubmitting.

review: Needs Fixing

[Vlad Lesin (vlad-lesin)]

> Other calls of create_log_files_rename() don't need that, so doing it
> unconditionally inside create_log_files_rename() does not look right.
>
> I'd also add a comment in that code explaining that create_log_files() can
> increase system LSN, so we have to update FIL_PAGE_FILE_FLUSH_LSN in data
> files.
>
> Please also add the bug # reference and fix typos in revision comments before
> resubmitting.

Done. Waiting for jenkins testing results.

[Vlad Lesin (vlad-lesin)]

> Is there a Jenkins run? (this is not a review)
Yes. I have seen failed tests and they don't have any concern to my fixes.

http://jenkins.percona.com/view/PS 5.6/job/percona-server-5.6-param/82

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'Percona-Server/mysql-test/suite/innodb/t/innodb-log-file-size.test'
--- Percona-Server/mysql-test/suite/innodb/t/innodb-log-file-size.test	2012-10-01 07:34:50 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/innodb-log-file-size.test	2013-05-05 01:52:27 +0000
@@ -94,7 +94,7 @@
 --exec $MYSQLD_CMD $args --innodb-read-only
 let SEARCH_PATTERN= InnoDB: Recovery skipped, --innodb-read-only set!;
 --source include/search_pattern_in_file.inc
-let SEARCH_PATTERN= InnoDB: Can.t initiate database recovery, running in read-only-mode;
+let SEARCH_PATTERN= InnoDB: Cannot resize log files in read-only mode;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 

=== modified file 'Percona-Server/storage/innobase/srv/srv0start.cc'
--- Percona-Server/storage/innobase/srv/srv0start.cc	2013-03-31 06:08:39 +0000
+++ Percona-Server/storage/innobase/srv/srv0start.cc	2013-05-05 01:52:27 +0000
@@ -2422,8 +2422,14 @@
 				return(err);
 			}
 
+			/* create_log_files() can increase system lsn that is
+			why FIL_PAGE_FILE_FLUSH_LSN have to be updated */
+			min_flushed_lsn = max_flushed_lsn = log_get_lsn();
+			fil_write_flushed_lsn_to_data_files(min_flushed_lsn, 0);
+			fil_flush_file_spaces(FIL_TABLESPACE);
+
 			create_log_files_rename(logfilename, dirnamelen,
-						max_flushed_lsn, logfile0);
+						log_get_lsn(), logfile0);
 		}
 
 		srv_startup_is_before_trx_rollback_phase = FALSE;