Commit df524dc0 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-31308 InnoDB monitor trx_rseg_history_len was accidentally disabled by default

innodb_counter_info[]: Revert a change that was accidentally made in
commit 204e7225
parent f2c17cc9
set global innodb_monitor_disable = All;
select name, if(enabled,'enabled','disabled') status select name, if(enabled,'enabled','disabled') status
from information_schema.innodb_metrics; from information_schema.innodb_metrics;
name status name status
metadata_table_handles_opened disabled metadata_table_handles_opened disabled
lock_deadlocks disabled lock_deadlocks enabled
lock_timeouts disabled lock_timeouts enabled
lock_rec_lock_waits disabled lock_rec_lock_waits disabled
lock_table_lock_waits disabled lock_table_lock_waits disabled
lock_rec_lock_requests disabled lock_rec_lock_requests disabled
...@@ -14,32 +13,32 @@ lock_rec_locks disabled ...@@ -14,32 +13,32 @@ lock_rec_locks disabled
lock_table_lock_created disabled lock_table_lock_created disabled
lock_table_lock_removed disabled lock_table_lock_removed disabled
lock_table_locks disabled lock_table_locks disabled
lock_row_lock_current_waits disabled lock_row_lock_current_waits enabled
lock_row_lock_time disabled lock_row_lock_time enabled
lock_row_lock_time_max disabled lock_row_lock_time_max enabled
lock_row_lock_waits disabled lock_row_lock_waits enabled
lock_row_lock_time_avg disabled lock_row_lock_time_avg enabled
buffer_pool_size disabled buffer_pool_size enabled
buffer_pool_reads disabled buffer_pool_reads enabled
buffer_pool_read_requests disabled buffer_pool_read_requests enabled
buffer_pool_write_requests disabled buffer_pool_write_requests enabled
buffer_pool_wait_free disabled buffer_pool_wait_free enabled
buffer_pool_read_ahead disabled buffer_pool_read_ahead enabled
buffer_pool_read_ahead_evicted disabled buffer_pool_read_ahead_evicted enabled
buffer_pool_pages_total disabled buffer_pool_pages_total enabled
buffer_pool_pages_misc disabled buffer_pool_pages_misc enabled
buffer_pool_pages_data disabled buffer_pool_pages_data enabled
buffer_pool_bytes_data disabled buffer_pool_bytes_data enabled
buffer_pool_pages_dirty disabled buffer_pool_pages_dirty enabled
buffer_pool_bytes_dirty disabled buffer_pool_bytes_dirty enabled
buffer_pool_pages_free disabled buffer_pool_pages_free enabled
buffer_pages_created disabled buffer_pages_created enabled
buffer_pages_written disabled buffer_pages_written enabled
buffer_pages_read disabled buffer_pages_read enabled
buffer_index_sec_rec_cluster_reads disabled buffer_index_sec_rec_cluster_reads enabled
buffer_index_sec_rec_cluster_reads_avoided disabled buffer_index_sec_rec_cluster_reads_avoided enabled
buffer_data_reads disabled buffer_data_reads enabled
buffer_data_written disabled buffer_data_written enabled
buffer_flush_batch_scanned disabled buffer_flush_batch_scanned disabled
buffer_flush_batch_num_scan disabled buffer_flush_batch_num_scan disabled
buffer_flush_batch_scanned_per_call disabled buffer_flush_batch_scanned_per_call disabled
...@@ -72,8 +71,8 @@ buffer_flush_background_pages disabled ...@@ -72,8 +71,8 @@ buffer_flush_background_pages disabled
buffer_LRU_batch_scanned disabled buffer_LRU_batch_scanned disabled
buffer_LRU_batch_num_scan disabled buffer_LRU_batch_num_scan disabled
buffer_LRU_batch_scanned_per_call disabled buffer_LRU_batch_scanned_per_call disabled
buffer_LRU_batch_flush_total_pages disabled buffer_LRU_batch_flush_total_pages enabled
buffer_LRU_batch_evict_total_pages disabled buffer_LRU_batch_evict_total_pages enabled
buffer_LRU_single_flush_failure_count disabled buffer_LRU_single_flush_failure_count disabled
buffer_LRU_get_free_search disabled buffer_LRU_get_free_search disabled
buffer_LRU_search_scanned disabled buffer_LRU_search_scanned disabled
...@@ -114,24 +113,24 @@ buffer_page_written_blob disabled ...@@ -114,24 +113,24 @@ buffer_page_written_blob disabled
buffer_page_written_zblob disabled buffer_page_written_zblob disabled
buffer_page_written_zblob2 disabled buffer_page_written_zblob2 disabled
buffer_page_written_other disabled buffer_page_written_other disabled
os_data_reads disabled os_data_reads enabled
os_data_writes disabled os_data_writes enabled
os_data_fsyncs disabled os_data_fsyncs enabled
os_pending_reads disabled os_pending_reads enabled
os_pending_writes disabled os_pending_writes enabled
os_log_bytes_written disabled os_log_bytes_written enabled
os_log_fsyncs disabled os_log_fsyncs enabled
os_log_pending_fsyncs disabled os_log_pending_fsyncs enabled
os_log_pending_writes disabled os_log_pending_writes enabled
trx_rw_commits disabled trx_rw_commits disabled
trx_ro_commits disabled trx_ro_commits disabled
trx_nl_ro_commits disabled trx_nl_ro_commits disabled
trx_commits_insert_update disabled trx_commits_insert_update disabled
trx_rollbacks disabled trx_rollbacks disabled
trx_rollbacks_savepoint disabled trx_rollbacks_savepoint disabled
trx_rseg_history_len disabled trx_rseg_history_len enabled
trx_undo_slots_used disabled trx_undo_slots_used disabled
trx_undo_slots_cached disabled trx_undo_slots_cached enabled
trx_rseg_current_size disabled trx_rseg_current_size disabled
purge_del_mark_records disabled purge_del_mark_records disabled
purge_upd_exist_or_extern_records disabled purge_upd_exist_or_extern_records disabled
...@@ -150,10 +149,10 @@ log_max_modified_age_async disabled ...@@ -150,10 +149,10 @@ log_max_modified_age_async disabled
log_pending_log_flushes disabled log_pending_log_flushes disabled
log_pending_checkpoint_writes disabled log_pending_checkpoint_writes disabled
log_num_log_io disabled log_num_log_io disabled
log_waits disabled log_waits enabled
log_write_requests disabled log_write_requests enabled
log_writes disabled log_writes enabled
log_padded disabled log_padded enabled
compress_pages_compressed disabled compress_pages_compressed disabled
compress_pages_decompressed disabled compress_pages_decompressed disabled
compression_pad_increments disabled compression_pad_increments disabled
...@@ -171,42 +170,42 @@ index_page_merge_successful disabled ...@@ -171,42 +170,42 @@ index_page_merge_successful disabled
index_page_reorg_attempts disabled index_page_reorg_attempts disabled
index_page_reorg_successful disabled index_page_reorg_successful disabled
index_page_discards disabled index_page_discards disabled
adaptive_hash_searches disabled adaptive_hash_searches enabled
adaptive_hash_searches_btree disabled adaptive_hash_searches_btree enabled
adaptive_hash_pages_added disabled adaptive_hash_pages_added disabled
adaptive_hash_pages_removed disabled adaptive_hash_pages_removed disabled
adaptive_hash_rows_added disabled adaptive_hash_rows_added disabled
adaptive_hash_rows_removed disabled adaptive_hash_rows_removed disabled
adaptive_hash_rows_deleted_no_hash_entry disabled adaptive_hash_rows_deleted_no_hash_entry disabled
adaptive_hash_rows_updated disabled adaptive_hash_rows_updated disabled
file_num_open_files disabled file_num_open_files enabled
ibuf_merges_insert disabled ibuf_merges_insert enabled
ibuf_merges_delete_mark disabled ibuf_merges_delete_mark enabled
ibuf_merges_delete disabled ibuf_merges_delete enabled
ibuf_merges_discard_insert disabled ibuf_merges_discard_insert enabled
ibuf_merges_discard_delete_mark disabled ibuf_merges_discard_delete_mark enabled
ibuf_merges_discard_delete disabled ibuf_merges_discard_delete enabled
ibuf_merges disabled ibuf_merges enabled
ibuf_size disabled ibuf_size enabled
innodb_master_thread_sleeps disabled innodb_master_thread_sleeps disabled
innodb_activity_count disabled innodb_activity_count enabled
innodb_master_active_loops disabled innodb_master_active_loops disabled
innodb_master_idle_loops disabled innodb_master_idle_loops disabled
innodb_log_flush_usec disabled innodb_log_flush_usec disabled
innodb_dict_lru_usec disabled innodb_dict_lru_usec disabled
innodb_dict_lru_count_active disabled innodb_dict_lru_count_active disabled
innodb_dict_lru_count_idle disabled innodb_dict_lru_count_idle disabled
innodb_dblwr_writes disabled innodb_dblwr_writes enabled
innodb_dblwr_pages_written disabled innodb_dblwr_pages_written enabled
innodb_page_size disabled innodb_page_size enabled
dml_reads disabled dml_reads disabled
dml_inserts disabled dml_inserts enabled
dml_deletes disabled dml_deletes enabled
dml_updates disabled dml_updates enabled
dml_system_reads disabled dml_system_reads enabled
dml_system_inserts disabled dml_system_inserts enabled
dml_system_deletes disabled dml_system_deletes enabled
dml_system_updates disabled dml_system_updates enabled
ddl_background_drop_indexes disabled ddl_background_drop_indexes disabled
ddl_online_create_index disabled ddl_online_create_index disabled
ddl_pending_alter_table disabled ddl_pending_alter_table disabled
...@@ -216,6 +215,9 @@ icp_attempts disabled ...@@ -216,6 +215,9 @@ icp_attempts disabled
icp_no_match disabled icp_no_match disabled
icp_out_of_range disabled icp_out_of_range disabled
icp_match disabled icp_match disabled
set global innodb_monitor_disable = All;
select name from information_schema.innodb_metrics where enabled;
name
set global innodb_monitor_enable = all; set global innodb_monitor_enable = all;
select name from information_schema.innodb_metrics where not enabled; select name from information_schema.innodb_metrics where not enabled;
name name
......
...@@ -5,12 +5,14 @@ ...@@ -5,12 +5,14 @@
# sys_vars.innodb_monitor_enable_basic # sys_vars.innodb_monitor_enable_basic
--source include/have_innodb.inc --source include/have_innodb.inc
set global innodb_monitor_disable = All;
# Test turn on/off the monitor counter with "all" option # Test turn on/off the monitor counter with "all" option
# By default, they will be off. # By default, they will be off.
select name, if(enabled,'enabled','disabled') status select name, if(enabled,'enabled','disabled') status
from information_schema.innodb_metrics; from information_schema.innodb_metrics;
set global innodb_monitor_disable = All;
select name from information_schema.innodb_metrics where enabled;
# Turn on all monitor counters # Turn on all monitor counters
set global innodb_monitor_enable = all; set global innodb_monitor_enable = all;
......
...@@ -704,7 +704,7 @@ static monitor_info_t innodb_counter_info[] = ...@@ -704,7 +704,7 @@ static monitor_info_t innodb_counter_info[] =
{"trx_rseg_history_len", "transaction", {"trx_rseg_history_len", "transaction",
"Length of the TRX_RSEG_HISTORY list", "Length of the TRX_RSEG_HISTORY list",
static_cast<monitor_type_t>( static_cast<monitor_type_t>(
MONITOR_EXISTING | MONITOR_DISPLAY_CURRENT), MONITOR_EXISTING | MONITOR_DISPLAY_CURRENT | MONITOR_DEFAULT_ON),
MONITOR_DEFAULT_START, MONITOR_RSEG_HISTORY_LEN}, MONITOR_DEFAULT_START, MONITOR_RSEG_HISTORY_LEN},
{"trx_undo_slots_used", "transaction", "Number of undo slots used", {"trx_undo_slots_used", "transaction", "Number of undo slots used",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment