Merge lp:~akopytov/percona-server/bug785489-5.1 into lp:percona-server/5.1

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/Percona%20Server%205.1/job/percona-server-5.1-param/148/

[Stewart Smith (stewart)]

review: Approve

=== modified file 'patches/innodb_lru_dump_restore.patch'
--- patches/innodb_lru_dump_restore.patch	2011-09-25 06:42:17 +0000
+++ patches/innodb_lru_dump_restore.patch	2011-09-25 06:42:18 +0000
@@ -41,7 +41,7 @@
 +--file_exists $MYSQLD_DATADIR/ib_lru_dump;
 --- a/storage/innodb_plugin/buf/buf0lru.c
 +++ b/storage/innodb_plugin/buf/buf0lru.c
-@@ -2121,6 +2121,277 @@
+@@ -2121,6 +2121,282 @@
  	memset(&buf_LRU_stat_cur, 0, sizeof buf_LRU_stat_cur);
  }
  
@@ -201,6 +201,11 @@
 +			" InnoDB: cannot open %s\n", LRU_DUMP_FILE);
 +		goto end;
 +	}
++
++	ut_print_timestamp(stderr);
++	fprintf(stderr, " InnoDB: Restoring buffer pool pages from %s\n",
++		LRU_DUMP_FILE);
++
 +	if (size == 0 || size_high > 0 || size % 8) {
 +		fprintf(stderr, " InnoDB: broken LRU dump file\n");
 +		goto end;
@@ -302,7 +307,7 @@
 +
 +	ut_print_timestamp(stderr);
 +	fprintf(stderr,
-+		" InnoDB: reading pages based on the dumped LRU list was done."
++		" InnoDB: Completed reading buffer pool pages"
 +		" (requested: %lu, read: %lu)\n", req, reads);
 +	ret = TRUE;
 +end:
@@ -405,7 +410,25 @@
  Waits for an aio operation to complete. This function is used to write the
 --- a/storage/innodb_plugin/handler/ha_innodb.cc
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc
-@@ -11478,6 +11478,12 @@
+@@ -197,6 +197,8 @@
+ 
+ static char*	innodb_version_str = (char*) INNODB_VERSION_STR;
+ 
++static my_bool	innobase_blocking_lru_restore		= FALSE;
++
+ /** Possible values for system variable "innodb_stats_method". The values
+ are defined the same as its corresponding MyISAM system variable
+ "myisam_stats_method"(see "myisam_stats_method_names"), for better usability */
+@@ -2408,6 +2410,8 @@
+ 	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
+ 	srv_use_checksums = (ibool) innobase_use_checksums;
+ 
++	srv_blocking_lru_restore = (ibool) innobase_blocking_lru_restore;
++
+ #ifdef HAVE_LARGE_PAGES
+         if ((os_use_large_pages = (ibool) my_use_large_pages))
+ 		os_large_page_size = (ulint) opt_large_page_size;
+@@ -11478,6 +11482,18 @@
    "Limit the allocated memory for dictionary cache. (0: unlimited)",
    NULL, NULL, 0, 0, LONG_MAX, 0);
  
@@ -415,14 +438,21 @@
 +  "0 (the default) disables automatic dumps.",
 +  NULL, NULL, 0, 0, UINT_MAX32, 0);
 +
++static MYSQL_SYSVAR_BOOL(blocking_lru_restore, innobase_blocking_lru_restore,
++  PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
++  "Block XtraDB startup process until buffer pool is full restored from a "
++  "dump file (if present). Disabled by default.",
++  NULL, NULL, FALSE);
++
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11557,6 +11563,7 @@
+@@ -11557,6 +11573,8 @@
  #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
    MYSQL_SYSVAR(read_ahead_threshold),
    MYSQL_SYSVAR(io_capacity),
 +  MYSQL_SYSVAR(auto_lru_dump),
++  MYSQL_SYSVAR(blocking_lru_restore),
    MYSQL_SYSVAR(use_purge_thread),
    NULL
  };
@@ -562,17 +592,20 @@
  handler for completed requests. The aio array of pending requests is divided
 --- a/storage/innodb_plugin/include/srv0srv.h
 +++ b/storage/innodb_plugin/include/srv0srv.h
-@@ -332,6 +332,9 @@
+@@ -332,6 +332,12 @@
  reading of a disk page */
  extern ulint srv_buf_pool_reads;
  
 +/** Time in seconds between automatic buffer pool dumps */
 +extern uint srv_auto_lru_dump;
 +
++/** Whether startup should be blocked until buffer pool is fully restored */
++extern ibool srv_blocking_lru_restore;
++
  /** Status variables to be passed to MySQL */
  typedef struct export_var_struct export_struc;
  
-@@ -613,6 +616,16 @@
+@@ -613,6 +619,16 @@
  /*=====================*/
  	void*	arg);	/*!< in: a dummy parameter required by
  			os_thread_create */
@@ -591,17 +624,20 @@
  @return FALSE if not all information printed
 --- a/storage/innodb_plugin/srv/srv0srv.c
 +++ b/storage/innodb_plugin/srv/srv0srv.c
-@@ -303,6 +303,9 @@
+@@ -303,6 +303,12 @@
  reading of a disk page */
  UNIV_INTERN ulint srv_buf_pool_reads = 0;
  
 +/** Time in seconds between automatic buffer pool dumps */
 +UNIV_INTERN uint srv_auto_lru_dump = 0;
 +
++/** Whether startup should be blocked until buffer pool is fully restored */
++UNIV_INTERN ibool srv_blocking_lru_restore;
++
  /* structure to pass status variables to MySQL */
  UNIV_INTERN export_struc export_vars;
  
-@@ -2552,6 +2555,56 @@
+@@ -2552,6 +2558,58 @@
  	OS_THREAD_DUMMY_RETURN;
  }
  
@@ -626,7 +662,9 @@
 +		os_thread_pf(os_thread_get_curr_id()));
 +#endif
 +
-+	if (srv_auto_lru_dump)
++	/* If srv_blocking_lru_restore is TRUE, restore will be done
++	synchronously on startup. */
++	if (srv_auto_lru_dump && !srv_blocking_lru_restore)
 +		buf_LRU_file_restore();
 +
 +	last_dump_time = time(NULL);
@@ -660,7 +698,15 @@
  and wakes up the master thread if it is suspended (not sleeping). Used
 --- a/storage/innodb_plugin/srv/srv0start.c
 +++ b/storage/innodb_plugin/srv/srv0start.c
-@@ -126,9 +126,9 @@
+@@ -88,6 +88,7 @@
+ # include "thr0loc.h"
+ # include "os0sync.h" /* for INNODB_RW_LOCKS_USE_ATOMICS */
+ # include "zlib.h" /* for ZLIB_VERSION */
++# include "buf0lru.h" /* for buf_LRU_file_restore() */
+ 
+ /** Log sequence number immediately after startup */
+ UNIV_INTERN ib_uint64_t	srv_start_lsn;
+@@ -126,9 +127,9 @@
  static ulint		ios;
  
  /** io_handler_thread parameters for thread identification */
@@ -672,7 +718,7 @@
  
  /** We use this mutex to test the return value of pthread_mutex_trylock
     on successful locking. HP-UX does NOT return 0, though Linux et al do. */
-@@ -1706,6 +1706,10 @@
+@@ -1706,6 +1707,15 @@
  	os_thread_create(&srv_monitor_thread, NULL,
  			 thread_ids + 4 + SRV_MAX_N_IO_THREADS);
  
@@ -680,10 +726,15 @@
 +	os_thread_create(&srv_LRU_dump_restore_thread, NULL,
 +			 thread_ids + 5 + SRV_MAX_N_IO_THREADS);
 +
++	/* If srv_blocking_lru_restore is TRUE, load buffer pool contents
++	synchronously */
++	if (srv_auto_lru_dump && srv_blocking_lru_restore)
++		buf_LRU_file_restore();
++
  	srv_is_being_started = FALSE;
  
  	if (trx_doublewrite == NULL) {
-@@ -1730,13 +1734,13 @@
+@@ -1730,13 +1740,13 @@
  		ulint i;
  
  		os_thread_create(&srv_purge_thread, NULL, thread_ids
 
=== modified file 'patches/mysql-test.diff'
--- patches/mysql-test.diff	2011-09-12 12:25:39 +0000
+++ patches/mysql-test.diff	2011-09-25 06:42:18 +0000
@@ -4093,6 +4093,7 @@
 +INNODB_AUTOEXTEND_INCREMENT
 +INNODB_AUTOINC_LOCK_MODE
 +INNODB_AUTO_LRU_DUMP
++INNODB_BLOCKING_LRU_RESTORE
 +INNODB_BUFFER_POOL_SHM_CHECKSUM
 +INNODB_BUFFER_POOL_SHM_KEY
 +INNODB_BUFFER_POOL_SIZE
@@ -4441,6 +4442,7 @@
 +INNODB_AUTOEXTEND_INCREMENT
 +INNODB_AUTOINC_LOCK_MODE
 +INNODB_AUTO_LRU_DUMP
++INNODB_BLOCKING_LRU_RESTORE
 +INNODB_BUFFER_POOL_SHM_CHECKSUM
 +INNODB_BUFFER_POOL_SHM_KEY
 +INNODB_BUFFER_POOL_SIZE