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
1=== modified file 'api/api0cfg.c'
2--- api/api0cfg.c 2010-09-22 02:57:57 +0000
3+++ api/api0cfg.c 2011-01-10 14:52:53 +0000
4@@ -823,7 +823,7 @@
5 STRUCT_FLD(validate, ib_cfg_var_validate_numeric),
6 STRUCT_FLD(set, ib_cfg_var_set_generic),
7 STRUCT_FLD(get, ib_cfg_var_get_generic),
8- STRUCT_FLD(tank, &srv_log_buffer_size)},
9+ STRUCT_FLD(tank, &srv_log_buffer_curr_size)},
10
11 {STRUCT_FLD(name, "log_file_size"),
12 STRUCT_FLD(type, IB_CFG_ULINT),
13@@ -833,7 +833,7 @@
14 STRUCT_FLD(validate, ib_cfg_var_validate_numeric),
15 STRUCT_FLD(set, ib_cfg_var_set_generic),
16 STRUCT_FLD(get, ib_cfg_var_get_generic),
17- STRUCT_FLD(tank, &srv_log_file_size)},
18+ STRUCT_FLD(tank, &srv_log_file_curr_size)},
19
20 {STRUCT_FLD(name, "log_files_in_group"),
21 STRUCT_FLD(type, IB_CFG_ULINT),
22
23=== modified file 'include/srv0srv.h'
24--- include/srv0srv.h 2010-12-16 00:54:57 +0000
25+++ include/srv0srv.h 2011-01-10 14:52:53 +0000
26@@ -101,7 +101,9 @@
27
28 extern ulint srv_n_log_files;
29 extern ulint srv_log_file_size;
30+extern ulint srv_log_file_curr_size;
31 extern ulint srv_log_buffer_size;
32+extern ulint srv_log_buffer_curr_size;
33 extern ulong srv_flush_log_at_trx_commit;
34 extern ibool srv_adaptive_flushing;
35
36
37=== modified file 'srv/srv0srv.c'
38--- srv/srv0srv.c 2010-10-01 05:27:36 +0000
39+++ srv/srv0srv.c 2011-01-10 14:52:53 +0000
40@@ -163,8 +163,10 @@
41 UNIV_INTERN ulint srv_n_log_files = ULINT_MAX;
42 /** Size in database pages */
43 UNIV_INTERN ulint srv_log_file_size = ULINT_MAX;
44+UNIV_INTERN ulint srv_log_file_curr_size = ULINT_MAX;
45 /** Size in database pages */
46 UNIV_INTERN ulint srv_log_buffer_size = ULINT_MAX;
47+UNIV_INTERN ulint srv_log_buffer_curr_size = ULINT_MAX;
48 UNIV_INTERN ulong srv_flush_log_at_trx_commit = 1;
49
50 /** Try to flush dirty pages so as to avoid IO bursts at
51@@ -693,7 +695,9 @@
52
53 srv_n_log_files = ULINT_MAX;
54 srv_log_file_size = ULINT_MAX;
55+ srv_log_file_curr_size = ULINT_MAX;
56 srv_log_buffer_size = ULINT_MAX;
57+ srv_log_buffer_curr_size = ULINT_MAX;
58 srv_flush_log_at_trx_commit = 1;
59
60 srv_buf_pool_size = ULINT_MAX;
61@@ -1138,9 +1142,11 @@
62 srv_last_file_size_max = srv_last_file_size_max
63 * ((1024 * 1024) / UNIV_PAGE_SIZE);
64
65- srv_log_file_size = srv_log_file_size / UNIV_PAGE_SIZE;
66+ srv_log_file_size = srv_log_file_curr_size / UNIV_PAGE_SIZE;
67+ srv_log_file_curr_size = srv_log_file_size * UNIV_PAGE_SIZE;
68
69- srv_log_buffer_size = srv_log_buffer_size / UNIV_PAGE_SIZE;
70+ srv_log_buffer_size = srv_log_buffer_curr_size / UNIV_PAGE_SIZE;
71+ srv_log_buffer_curr_size = srv_log_buffer_size * UNIV_PAGE_SIZE;
72
73 srv_lock_table_size = 5 * (srv_buf_pool_size / UNIV_PAGE_SIZE);
74

Subscribers

People subscribed via source and target branches