diff --git a/innobase/log/log0recv.c b/innobase/log/log0recv.c index f83a49d01a6..5cd5850d1a1 100644 --- a/innobase/log/log0recv.c +++ b/innobase/log/log0recv.c @@ -1019,7 +1019,8 @@ loop: if (recv_addr->state == RECV_NOT_PROCESSED) { if (!has_printed) { fprintf(stderr, -"InnoDB: Starting an apply batch of log records to the database...\n"); +"InnoDB: Starting an apply batch of log records to the database...\n" +"InnoDB: Progress in percents:"); has_printed = TRUE; } @@ -1046,6 +1047,16 @@ loop: recv_addr = HASH_GET_NEXT(addr_hash, recv_addr); } + + if (has_printed + && (i * 100) / hash_get_n_cells(recv_sys->addr_hash) + != ((i + 1) * 100) + / hash_get_n_cells(recv_sys->addr_hash)) { + + fprintf(stderr, "%lu ", + (i * 100) / hash_get_n_cells(recv_sys->addr_hash)); + + } } /* Wait until all the pages have been processed */ @@ -1059,6 +1070,11 @@ loop: mutex_enter(&(recv_sys->mutex)); } + if (has_printed) { + + fprintf(stderr, "\n"); + } + if (!allow_ibuf) { /* Flush all the file pages to disk and invalidate them in the buffer pool */ diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index 37bf59b6b9a..d77db335366 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -2417,7 +2417,19 @@ loop: background_loop: /* In this loop we run background operations when the server - is quiet */ + is quiet and we also come here about once in 10 seconds */ + + srv_main_thread_op_info = "flushing buffer pool pages"; + + /* Flush a few oldest pages to make the checkpoint younger */ + + n_pages_flushed = buf_flush_batch(BUF_FLUSH_LIST, 10, ut_dulint_max); + + srv_main_thread_op_info = "making checkpoint"; + + /* Make a new checkpoint about once in 10 seconds */ + + log_checkpoint(TRUE, FALSE); srv_main_thread_op_info = "reserving kernel mutex";