HailDB

Merge lp:~linuxjedi/haildb/trunk-bug-578644 into lp:haildb

  1. trunk-bug-578644
  2. Merge into trunk
Proposed by Andrew Hutchings
Status: Merged
Approved by: Stewart Smith
Approved revision: 71
Merged at revision: 71
Proposed branch: lp:~linuxjedi/haildb/trunk-bug-578644
Merge into: lp:haildb
Diff against target: 73 lines (+12/-4)
3 files modified
api/api0cfg.c (+2/-2)
include/srv0srv.h (+2/-0)
srv/srv0srv.c (+8/-2)
To merge this branch: bzr merge lp:~linuxjedi/haildb/trunk-bug-578644
Reviewer Review Type Date Requested Status
Stewart Smith Pending
Review via email: mp+45701@code.launchpad.net

Description of the change

Store normalized log_buffer_size and log_file_size for display instead of showing the number of blocks.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'api/api0cfg.c'
--- api/api0cfg.c 2010-09-22 02:57:57 +0000
+++ api/api0cfg.c 2011-01-10 14:52:53 +0000
@@ -823,7 +823,7 @@
823 STRUCT_FLD(validate, ib_cfg_var_validate_numeric),823 STRUCT_FLD(validate, ib_cfg_var_validate_numeric),
824 STRUCT_FLD(set, ib_cfg_var_set_generic),824 STRUCT_FLD(set, ib_cfg_var_set_generic),
825 STRUCT_FLD(get, ib_cfg_var_get_generic),825 STRUCT_FLD(get, ib_cfg_var_get_generic),
826 STRUCT_FLD(tank, &srv_log_buffer_size)},826 STRUCT_FLD(tank, &srv_log_buffer_curr_size)},
827827
828 {STRUCT_FLD(name, "log_file_size"),828 {STRUCT_FLD(name, "log_file_size"),
829 STRUCT_FLD(type, IB_CFG_ULINT),829 STRUCT_FLD(type, IB_CFG_ULINT),
@@ -833,7 +833,7 @@
833 STRUCT_FLD(validate, ib_cfg_var_validate_numeric),833 STRUCT_FLD(validate, ib_cfg_var_validate_numeric),
834 STRUCT_FLD(set, ib_cfg_var_set_generic),834 STRUCT_FLD(set, ib_cfg_var_set_generic),
835 STRUCT_FLD(get, ib_cfg_var_get_generic),835 STRUCT_FLD(get, ib_cfg_var_get_generic),
836 STRUCT_FLD(tank, &srv_log_file_size)},836 STRUCT_FLD(tank, &srv_log_file_curr_size)},
837837
838 {STRUCT_FLD(name, "log_files_in_group"),838 {STRUCT_FLD(name, "log_files_in_group"),
839 STRUCT_FLD(type, IB_CFG_ULINT),839 STRUCT_FLD(type, IB_CFG_ULINT),
840840
=== modified file 'include/srv0srv.h'
--- include/srv0srv.h 2010-12-16 00:54:57 +0000
+++ include/srv0srv.h 2011-01-10 14:52:53 +0000
@@ -101,7 +101,9 @@
101101
102extern ulint srv_n_log_files;102extern ulint srv_n_log_files;
103extern ulint srv_log_file_size;103extern ulint srv_log_file_size;
104extern ulint srv_log_file_curr_size;
104extern ulint srv_log_buffer_size;105extern ulint srv_log_buffer_size;
106extern ulint srv_log_buffer_curr_size;
105extern ulong srv_flush_log_at_trx_commit;107extern ulong srv_flush_log_at_trx_commit;
106extern ibool srv_adaptive_flushing;108extern ibool srv_adaptive_flushing;
107109
108110
=== modified file 'srv/srv0srv.c'
--- srv/srv0srv.c 2010-10-01 05:27:36 +0000
+++ srv/srv0srv.c 2011-01-10 14:52:53 +0000
@@ -163,8 +163,10 @@
163UNIV_INTERN ulint srv_n_log_files = ULINT_MAX;163UNIV_INTERN ulint srv_n_log_files = ULINT_MAX;
164/** Size in database pages */164/** Size in database pages */
165UNIV_INTERN ulint srv_log_file_size = ULINT_MAX;165UNIV_INTERN ulint srv_log_file_size = ULINT_MAX;
166UNIV_INTERN ulint srv_log_file_curr_size = ULINT_MAX;
166/** Size in database pages */167/** Size in database pages */
167UNIV_INTERN ulint srv_log_buffer_size = ULINT_MAX;168UNIV_INTERN ulint srv_log_buffer_size = ULINT_MAX;
169UNIV_INTERN ulint srv_log_buffer_curr_size = ULINT_MAX;
168UNIV_INTERN ulong srv_flush_log_at_trx_commit = 1;170UNIV_INTERN ulong srv_flush_log_at_trx_commit = 1;
169171
170/** Try to flush dirty pages so as to avoid IO bursts at172/** Try to flush dirty pages so as to avoid IO bursts at
@@ -693,7 +695,9 @@
693695
694 srv_n_log_files = ULINT_MAX;696 srv_n_log_files = ULINT_MAX;
695 srv_log_file_size = ULINT_MAX;697 srv_log_file_size = ULINT_MAX;
698 srv_log_file_curr_size = ULINT_MAX;
696 srv_log_buffer_size = ULINT_MAX;699 srv_log_buffer_size = ULINT_MAX;
700 srv_log_buffer_curr_size = ULINT_MAX;
697 srv_flush_log_at_trx_commit = 1;701 srv_flush_log_at_trx_commit = 1;
698702
699 srv_buf_pool_size = ULINT_MAX;703 srv_buf_pool_size = ULINT_MAX;
@@ -1138,9 +1142,11 @@
1138 srv_last_file_size_max = srv_last_file_size_max1142 srv_last_file_size_max = srv_last_file_size_max
1139 * ((1024 * 1024) / UNIV_PAGE_SIZE);1143 * ((1024 * 1024) / UNIV_PAGE_SIZE);
11401144
1141 srv_log_file_size = srv_log_file_size / UNIV_PAGE_SIZE;1145 srv_log_file_size = srv_log_file_curr_size / UNIV_PAGE_SIZE;
1146 srv_log_file_curr_size = srv_log_file_size * UNIV_PAGE_SIZE;
11421147
1143 srv_log_buffer_size = srv_log_buffer_size / UNIV_PAGE_SIZE;1148 srv_log_buffer_size = srv_log_buffer_curr_size / UNIV_PAGE_SIZE;
1149 srv_log_buffer_curr_size = srv_log_buffer_size * UNIV_PAGE_SIZE;
11441150
1145 srv_lock_table_size = 5 * (srv_buf_pool_size / UNIV_PAGE_SIZE);1151 srv_lock_table_size = 5 * (srv_buf_pool_size / UNIV_PAGE_SIZE);
11461152

Subscribers

People subscribed via source and target branches