Merge lp:~gl-az/percona-server/5.5-lru_dump_load_work into lp:percona-server/5.5

[George Ormond Lorch III]

- Launchpad Bug #686392 : Buffer pool dump may result in incomplete dump file.
  - Dump will save to a temporary file first and rename it to the
    actual lru file on success.
  - Added dump file structure sanity checks on restore which were pulled
    from external sources.
- Launchpad Bug #712055 : Loading LRU dump prevents shutdown
  - Merged outside patch noted in lp bug and also implemented same logic
    when shutdown comes while performing actual dump.
- Launchpad Bug #713481 : Clean up messaging for LRU dump
  - Added verbiage to the 'missing file' message to make it not so scary.

jenkins result http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/373/

[Alexey Kopytov (akopytov)]

Looks good, thank you!

review: Approve

=== modified file 'Percona-Server/storage/innobase/buf/buf0lru.c'
--- Percona-Server/storage/innobase/buf/buf0lru.c	2012-05-02 07:37:27 +0000
+++ Percona-Server/storage/innobase/buf/buf0lru.c	2012-05-18 15:36:27 +0000
@@ -48,6 +48,7 @@
 #include "page0zip.h"
 #include "log0recv.h"
 #include "srv0srv.h"
+#include "srv0start.h"
 
 /** The number of blocks from the LRU_old pointer onward, including
 the block pointed to, must be buf_pool->LRU_old_ratio/BUF_LRU_OLD_RATIO_DIV
@@ -2506,6 +2507,7 @@
 /********************************************************************//**
 Dump the LRU page list to the specific file. */
 #define LRU_DUMP_FILE "ib_lru_dump"
+#define LRU_DUMP_TEMP_FILE "ib_lru_dump.tmp"
 
 UNIV_INTERN
 ibool
@@ -2540,8 +2542,10 @@
 		goto end;
 	}
 
-	dump_file = os_file_create(innodb_file_temp_key, LRU_DUMP_FILE, OS_FILE_OVERWRITE,
-				OS_FILE_NORMAL, OS_DATA_FILE, &success);
+	dump_file = os_file_create(innodb_file_temp_key, LRU_DUMP_TEMP_FILE,
+			OS_FILE_OVERWRITE, OS_FILE_NORMAL, OS_DATA_FILE,
+			&success);
+
 	if (!success) {
 		os_file_get_last_error(TRUE);
 		fprintf(stderr,
@@ -2570,6 +2574,13 @@
 			offset++;
 
 			if (offset == UNIV_PAGE_SIZE/4) {
+				if (srv_shutdown_state != SRV_SHUTDOWN_NONE) {
+					success = 0;
+					fprintf(stderr,
+						" InnoDB: stopped dumping lru"
+						" pages because of server"
+						" shutdown.\n");
+				}
 				success = os_file_write(LRU_DUMP_FILE, dump_file, buffer,
 						(buffers << UNIV_PAGE_SIZE_SHIFT) & 0xFFFFFFFFUL,
 						(buffers >> (32 - UNIV_PAGE_SIZE_SHIFT)),
@@ -2609,8 +2620,16 @@
 
 	ret = TRUE;
 end:
-	if (dump_file != -1)
+	if (dump_file != -1) {
+		if (success) {
+			success = os_file_flush(dump_file, TRUE);
+		}
 		os_file_close(dump_file);
+	}
+	if (success) {
+		success = os_file_rename(innodb_file_temp_key,
+			LRU_DUMP_TEMP_FILE, LRU_DUMP_FILE);
+	}
 	if (buffer_base)
 		ut_free(buffer_base);
 
@@ -2656,6 +2675,7 @@
 	dump_record_t*	records = NULL;
 	ulint		size;
 	ulint		size_high;
+	ulint		recsize = sizeof(dump_record_t);
 	ulint		length;
 
 	dump_file = os_file_create_simple_no_error_handling(innodb_file_temp_key,
@@ -2663,7 +2683,14 @@
 	if (!success || !os_file_get_size(dump_file, &size, &size_high)) {
 		os_file_get_last_error(TRUE);
 		fprintf(stderr,
-			" InnoDB: cannot open %s\n", LRU_DUMP_FILE);
+			" InnoDB: cannot open %s, "
+			" buffer pool preload not done.\n", LRU_DUMP_FILE);
+		goto end;
+	}
+
+	if (size == 0 || size_high > 0 || size % recsize) {
+		fprintf(stderr, " InnoDB: broken LRU dump file,"
+			" buffer pool preload not done\n");
 		goto end;
 	}
 
@@ -2747,6 +2774,14 @@
 		if (offset % 16 == 15) {
 			os_aio_simulated_wake_handler_threads();
 			buf_flush_free_margins(FALSE);
+			/* skip loading of the rest of the file if we are
+ 			   terminating anyway */
+			if(srv_shutdown_state != SRV_SHUTDOWN_NONE) {
+				fprintf(stderr,
+					" InnoDB: stopped loading lru pages"
+					" because of server shutdown\n");
+				break;
+			}
 		}
 
 		zip_size = fil_space_get_zip_size(space_id);