diff options
| author | Eugene Kosov <claprix@yandex.ru> | 2019-04-26 14:54:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-06 16:00:15 +0300 |
| commit | c83f83705309e34e5d5f35b34be79f2143af2e61 (patch) | |
| tree | 42264b31444acf3b1eae67347063981c3c1d3dd4 /storage/xtradb/log | |
| parent | 8dc670a5e8d322d8e1871b8c2ae8695a8779f739 (diff) | |
| download | mariadb-git-c83f83705309e34e5d5f35b34be79f2143af2e61.tar.gz | |
MDEV-18214 remove some duplicated MONITOR counters
MONITOR_PENDING_LOG_WRITE
MONITOR_PENDING_CHECKPOINT_WRITE
MONITOR_LOG_IO: read values from log_t members instead of updating own
monitor variables
Diffstat (limited to 'storage/xtradb/log')
| -rw-r--r-- | storage/xtradb/log/log0log.cc | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/storage/xtradb/log/log0log.cc b/storage/xtradb/log/log0log.cc index 19b4ac3732a..a89ad531871 100644 --- a/storage/xtradb/log/log0log.cc +++ b/storage/xtradb/log/log0log.cc @@ -1305,7 +1305,6 @@ log_io_complete( group->n_pending_writes--; log_sys->n_pending_writes--; - MONITOR_DEC(MONITOR_PENDING_LOG_WRITE); unlock = log_group_check_flush_completion(group); unlock = unlock | log_sys_check_flush_completion(); @@ -1357,8 +1356,6 @@ log_group_file_header_flush( if (log_do_write) { log_sys->n_log_ios++; - MONITOR_INC(MONITOR_LOG_IO); - srv_stats.os_log_pending_writes.inc(); fil_io(OS_FILE_WRITE | OS_FILE_LOG, true, group->space_id, 0, @@ -1483,8 +1480,6 @@ loop: if (log_do_write) { log_sys->n_log_ios++; - MONITOR_INC(MONITOR_LOG_IO); - srv_stats.os_log_pending_writes.inc(); ut_a(next_offset / UNIV_PAGE_SIZE <= ULINT_MAX); @@ -1632,7 +1627,6 @@ loop: } #endif /* UNIV_DEBUG */ log_sys->n_pending_writes++; - MONITOR_INC(MONITOR_PENDING_LOG_WRITE); group = UT_LIST_GET_FIRST(log_sys->log_groups); group->n_pending_writes++; /*!< We assume here that we have only @@ -1724,7 +1718,6 @@ loop: group->n_pending_writes--; log_sys->n_pending_writes--; - MONITOR_DEC(MONITOR_PENDING_LOG_WRITE); unlock = log_group_check_flush_completion(group); unlock = unlock | log_sys_check_flush_completion(); @@ -1939,7 +1932,6 @@ log_io_complete_checkpoint(void) ut_ad(log_sys->n_pending_checkpoint_writes > 0); log_sys->n_pending_checkpoint_writes--; - MONITOR_DEC(MONITOR_PENDING_CHECKPOINT_WRITE); if (log_sys->n_pending_checkpoint_writes == 0) { log_complete_checkpoint(); @@ -2086,12 +2078,9 @@ log_group_checkpoint( } log_sys->n_pending_checkpoint_writes++; - MONITOR_INC(MONITOR_PENDING_CHECKPOINT_WRITE); log_sys->n_log_ios++; - MONITOR_INC(MONITOR_LOG_IO); - /* We send as the last parameter the group machine address added with 1, as we want to distinguish between a normal log file write and a checkpoint field write */ @@ -2178,8 +2167,6 @@ log_group_read_checkpoint_info( log_sys->n_log_ios++; - MONITOR_INC(MONITOR_LOG_IO); - fil_io(OS_FILE_READ | OS_FILE_LOG, true, group->space_id, 0, field / UNIV_PAGE_SIZE, field % UNIV_PAGE_SIZE, OS_FILE_LOG_BLOCK_SIZE, log_sys->checkpoint_buf, NULL, 0); @@ -2564,8 +2551,6 @@ loop: log_sys->n_log_ios++; - MONITOR_INC(MONITOR_LOG_IO); - ut_a(source_offset / UNIV_PAGE_SIZE <= ULINT_MAX); if (release_mutex) { @@ -2727,8 +2712,6 @@ log_group_archive_file_header_write( log_sys->n_log_ios++; - MONITOR_INC(MONITOR_LOG_IO); - fil_io(OS_FILE_WRITE | OS_FILE_LOG, true, group->archive_space_id, 0, dest_offset / UNIV_PAGE_SIZE, @@ -2763,8 +2746,6 @@ log_group_archive_completed_header_write( log_sys->n_log_ios++; - MONITOR_INC(MONITOR_LOG_IO); - fil_io(OS_FILE_WRITE | OS_FILE_LOG, true, group->archive_space_id, 0, dest_offset / UNIV_PAGE_SIZE, @@ -2895,8 +2876,6 @@ loop: log_sys->n_log_ios++; - MONITOR_INC(MONITOR_LOG_IO); - //TODO (jonaso): This must be dead code?? log_encrypt_before_write(log_sys->next_checkpoint_no, buf, start_lsn, len); |