bk commit into 4.0 tree (1.1471)

Below is the list of changes that have just been committed into a local
4.0 repository of heikki. When heikki does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1471 03/04/24 21:51:00 heikki@xxxxxxxxxxxxxxx +1 -0
  srv0srv.c:
    Make buffer pool flush batches bigger as that may save some time if fsync 
is very inefficient

  innobase/srv/srv0srv.c
    1.40 03/04/24 21:50:40 heikki@xxxxxxxxxxxxxxx +10 -6
    Make buffer pool flush batches bigger as that may save some time if fsync 
is very inefficient

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: heikki
# Host: hundin.mysql.fi
# Root: /home/heikki/mysql-4.0

--- 1.39/innobase/srv/srv0srv.c Wed Apr 16 16:42:44 2003
+++ 1.40/innobase/srv/srv0srv.c Thu Apr 24 21:50:40 2003
@@ -2780,9 +2780,6 @@
 
        mutex_exit(&kernel_mutex);
 
-       /* We run purge and a batch of ibuf_contract every 10 seconds, even
-       if the server were active: */
-
        for (i = 0; i < 10; i++) {
                n_ios_old = log_sys->n_log_ios + buf_pool->n_pages_read
                                                + buf_pool->n_pages_written;
@@ -2867,7 +2864,7 @@
        if (n_pend_ios < 3 && (n_ios - n_ios_very_old < 200)) {
 
                srv_main_thread_op_info = (char*) "flushing buffer pool pages";
-               buf_flush_batch(BUF_FLUSH_LIST, 50, ut_dulint_max);
+               buf_flush_batch(BUF_FLUSH_LIST, 100, ut_dulint_max);
 
                srv_main_thread_op_info = (char*) "flushing log";
                log_flush_up_to(ut_dulint_max, LOG_WAIT_ONE_GROUP);
@@ -2926,7 +2923,13 @@
 
        /* Flush a few oldest pages to make the checkpoint younger */
 
-       n_pages_flushed = buf_flush_batch(BUF_FLUSH_LIST, 10, ut_dulint_max);
+       if (srv_fast_shutdown && srv_shutdown_state > 0) {
+               n_pages_flushed = buf_flush_batch(BUF_FLUSH_LIST, 100,
+                                                       ut_dulint_max);
+       } else {
+               n_pages_flushed = buf_flush_batch(BUF_FLUSH_LIST, 10,
+                                                       ut_dulint_max);
+       }
 
        srv_main_thread_op_info = (char*)"making checkpoint";
 
@@ -2993,7 +2996,8 @@
        }
        mutex_exit(&kernel_mutex);
        
-       srv_main_thread_op_info = (char*) "waiting for buffer pool flush to 
end";
+       srv_main_thread_op_info =
+                       (char*) "waiting for buffer pool flush to end";
        buf_flush_wait_batch_end(BUF_FLUSH_LIST);
 
        srv_main_thread_op_info = (char*)"making checkpoint";

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx