diff options
Diffstat (limited to 'storage/innobase/srv')
| -rw-r--r-- | storage/innobase/srv/srv0srv.cc | 9 | ||||
| -rw-r--r-- | storage/innobase/srv/srv0start.cc | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index 7e1cd5145c2..7ce1ebf145c 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -1454,7 +1454,7 @@ static void srv_sync_log_buffer_in_background() srv_main_thread_op_info = "flushing log"; if (difftime(current_time, srv_last_log_flush_time) >= srv_flush_log_at_timeout) { - log_buffer_flush_to_disk(); + log_buffer_flush_to_disk_async(); srv_last_log_flush_time = current_time; srv_log_writes_and_flush++; } @@ -1566,15 +1566,14 @@ void srv_master_callback(void*) if (!purge_state.m_running) srv_wake_purge_thread_if_not_active(); ulonglong counter_time= microsecond_interval_timer(); - srv_sync_log_buffer_in_background(); - MONITOR_INC_TIME_IN_MICRO_SECS(MONITOR_SRV_LOG_FLUSH_MICROSECOND, - counter_time); - if (srv_check_activity(&old_activity_count)) srv_master_do_active_tasks(counter_time); else srv_master_do_idle_tasks(counter_time); + srv_sync_log_buffer_in_background(); + MONITOR_INC_TIME_IN_MICRO_SECS(MONITOR_SRV_LOG_FLUSH_MICROSECOND, + counter_time); srv_main_thread_op_info= "sleeping"; } diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index 40ae4f3a3e7..12baa8e8b39 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -203,7 +203,7 @@ static dberr_t create_log_file(bool create_new_db, lsn_t lsn) os_file_t file{ os_file_create_func(logfile0.c_str(), OS_FILE_CREATE | OS_FILE_ON_ERROR_NO_EXIT, - OS_FILE_NORMAL, OS_LOG_FILE, false, &ret) + OS_FILE_AIO, OS_LOG_FILE, false, &ret) }; if (!ret) { @@ -524,7 +524,7 @@ srv_check_undo_redo_logs_exists() fh = os_file_create_func(logfilename.c_str(), OS_FILE_OPEN_RETRY | OS_FILE_ON_ERROR_NO_EXIT | OS_FILE_ON_ERROR_SILENT, - OS_FILE_NORMAL, OS_LOG_FILE, + OS_FILE_AIO, OS_LOG_FILE, srv_read_only_mode, &ret); if (ret) { |