summaryrefslogtreecommitdiff
path: root/storage/innobase/srv
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-10-15 10:26:52 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-10-15 10:33:20 +0300
commitb535a7904425d730c4dff185f0f313ed99dfbb50 (patch)
tree26d920afd534403ccbb4ac2a19d5a2278fb5c6ff /storage/innobase/srv
parentfa70c1462aabd3c3a052f6383fb8cef6120a34f3 (diff)
downloadmariadb-git-b535a7904425d730c4dff185f0f313ed99dfbb50.tar.gz
MDEV-23399: Remove recv_writer_thread
Recovery works just fine without a separate thread whose only task is to tell the page cleaner thread to do its job. recv_sys_t::apply(): Flush the buffer pool at the end of each batch. Reviewed by: Vladislav Vaintroub
Diffstat (limited to 'storage/innobase/srv')
-rw-r--r--storage/innobase/srv/srv0start.cc19
1 files changed, 0 insertions, 19 deletions
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc
index 59ed743b087..9a0f9d04149 100644
--- a/storage/innobase/srv/srv0start.cc
+++ b/storage/innobase/srv/srv0start.cc
@@ -903,13 +903,6 @@ srv_shutdown_all_bg_threads()
ut_ad(!srv_read_only_mode);
/* e. Exit the i/o threads */
- if (recv_sys.flush_start != NULL) {
- os_event_set(recv_sys.flush_start);
- }
- if (recv_sys.flush_end != NULL) {
- os_event_set(recv_sys.flush_end);
- }
-
os_event_set(buf_flush_event);
}
@@ -1208,7 +1201,6 @@ dberr_t srv_start(bool create_new_db)
+ 1 /* buf_dump_thread */
+ 1 /* dict_stats_thread */
+ 1 /* fts_optimize_thread */
- + 1 /* recv_writer_thread */
+ 1 /* trx_rollback_all_recovered */
+ 128 /* added as margin, for use of
InnoDB Memcached etc. */
@@ -1336,11 +1328,6 @@ dberr_t srv_start(bool create_new_db)
if (!srv_read_only_mode) {
buf_flush_page_cleaner_init();
-
-#ifdef UNIV_LINUX
- /* Wait for the setpriority() call to finish. */
- os_event_wait(recv_sys.flush_end);
-#endif /* UNIV_LINUX */
srv_start_state_set(SRV_START_STATE_IO);
}
@@ -1679,7 +1666,6 @@ file_checked:
InnoDB files is needed. */
ut_ad(!srv_force_recovery);
ut_ad(recv_no_log_write);
- buf_flush_sync();
err = fil_write_flushed_lsn(log_get_lsn());
DBUG_ASSERT(!buf_pool.any_io_pending());
log_sys.log.close_file();
@@ -1976,11 +1962,6 @@ skip_monitors:
srv_is_being_started = false;
- if (!srv_read_only_mode) {
- /* wake main loop of page cleaner up */
- os_event_set(buf_flush_event);
- }
-
if (srv_print_verbose_log) {
ib::info() << INNODB_VERSION_STR
<< " started; log sequence number "