Drizzle

Merge lp:~stewart/drizzle/embedded-innodb-configuration-io-threads into lp:~drizzle-trunk/drizzle/development

  1. embedded-innodb-configuration-io-threads
  2. Merge into development
Proposed by Stewart Smith
Status: Merged
Merged at revision: 1536
Proposed branch: lp:~stewart/drizzle/embedded-innodb-configuration-io-threads
Merge into: lp:~drizzle-trunk/drizzle/development
Prerequisite: lp:~stewart/drizzle/embedded-innodb-configuration-open-files
Diff against target: 149 lines (+58/-0)
13 files modified
plugin/embedded_innodb/embedded_innodb_engine.cc (+22/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_read_io_threads_64.result (+6/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_read_io_threads_default.result (+6/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_64.result (+6/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_default.result (+6/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64-master.opt (+1/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64.test (+2/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default-master.opt (+1/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default.test (+2/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64-master.opt (+1/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64.test (+2/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default-master.opt (+1/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default.test (+2/-0)
To merge this branch: bzr merge lp:~stewart/drizzle/embedded-innodb-configuration-io-threads
Reviewer Review Type Date Requested Status
Jay Pipes (community) Approve
Brian Aker Pending
Review via email: mp+24973@code.launchpad.net

Description of the change

read and write io thread numbers for embedded_innodb

To post a comment you must log in.
Revision history for this message
Jay Pipes (jaypipes) :
review: Approve
lp:~stewart/drizzle/embedded-innodb-configuration-io-threads updated
1450. By Stewart Smith

Merged embedded-innodb-configuration-open-files into embedded-innodb-configuration-io-threads.

1451. By Stewart Smith

Merged embedded-innodb-configuration-open-files into embedded-innodb-configuration-io-threads.

1452. By Stewart Smith

merge trunk

1453. By Stewart Smith

Merged embedded-innodb-configuration-open-files into embedded-innodb-configuration-io-threads.

1454. By Stewart Smith

Merged embedded-innodb-configuration-open-files into embedded-innodb-configuration-io-threads.

1455. By Stewart Smith

Merged embedded-innodb-configuration-open-files into embedded-innodb-configuration-io-threads.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugin/embedded_innodb/embedded_innodb_engine.cc'
2--- plugin/embedded_innodb/embedded_innodb_engine.cc 2010-05-17 13:08:01 +0000
3+++ plugin/embedded_innodb/embedded_innodb_engine.cc 2010-05-17 13:08:03 +0000
4@@ -2187,6 +2187,8 @@
5 static unsigned long srv_max_purge_lag;
6 static unsigned long innobase_lru_old_blocks_pct;
7 static unsigned long innobase_lru_block_access_recency;
8+static unsigned long innobase_read_io_threads;
9+static unsigned long innobase_write_io_threads;
10 static long innobase_open_files;
11 static char default_innodb_data_file_path[]= "ibdata1:10M:autoextend";
12 static char* innodb_data_file_path= NULL;
13@@ -2278,6 +2280,14 @@
14 if (err != DB_SUCCESS)
15 goto innodb_error;
16
17+ err= ib_cfg_set_int("read_io_threads", innobase_read_io_threads);
18+ if (err != DB_SUCCESS)
19+ goto innodb_error;
20+
21+ err= ib_cfg_set_int("write_io_threads", innobase_write_io_threads);
22+ if (err != DB_SUCCESS)
23+ goto innodb_error;
24+
25 err= ib_startup(innobase_file_format_name);
26 if (err != DB_SUCCESS)
27 goto innodb_error;
28@@ -2502,6 +2512,16 @@
29 "How many files at the maximum InnoDB keeps open at the same time.",
30 NULL, NULL, 300L, 10L, LONG_MAX, 0);
31
32+static DRIZZLE_SYSVAR_ULONG(read_io_threads, innobase_read_io_threads,
33+ PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
34+ "Number of background read I/O threads in InnoDB.",
35+ NULL, NULL, 4, 1, 64, 0);
36+
37+static DRIZZLE_SYSVAR_ULONG(write_io_threads, innobase_write_io_threads,
38+ PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
39+ "Number of background write I/O threads in InnoDB.",
40+ NULL, NULL, 4, 1, 64, 0);
41+
42 static drizzle_sys_var* innobase_system_variables[]= {
43 DRIZZLE_SYSVAR(checksums),
44 DRIZZLE_SYSVAR(data_home_dir),
45@@ -2522,6 +2542,8 @@
46 DRIZZLE_SYSVAR(max_dirty_pages_pct),
47 DRIZZLE_SYSVAR(max_purge_lag),
48 DRIZZLE_SYSVAR(open_files),
49+ DRIZZLE_SYSVAR(read_io_threads),
50+ DRIZZLE_SYSVAR(write_io_threads),
51 NULL
52 };
53
54
55=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_read_io_threads_64.result'
56--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_read_io_threads_64.result 1970-01-01 00:00:00 +0000
57+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_read_io_threads_64.result 2010-05-17 13:08:03 +0000
58@@ -0,0 +1,6 @@
59+SHOW VARIABLES LIKE 'innodb_read_io_threads';
60+Variable_name Value
61+innodb_read_io_threads 64
62+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='read_io_threads';
63+NAME TYPE VALUE
64+read_io_threads ULINT 64
65
66=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_read_io_threads_default.result'
67--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_read_io_threads_default.result 1970-01-01 00:00:00 +0000
68+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_read_io_threads_default.result 2010-05-17 13:08:03 +0000
69@@ -0,0 +1,6 @@
70+SHOW VARIABLES LIKE 'innodb_read_io_threads';
71+Variable_name Value
72+innodb_read_io_threads 4
73+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='read_io_threads';
74+NAME TYPE VALUE
75+read_io_threads ULINT 4
76
77=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_64.result'
78--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_64.result 1970-01-01 00:00:00 +0000
79+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_64.result 2010-05-17 13:08:03 +0000
80@@ -0,0 +1,6 @@
81+SHOW VARIABLES LIKE 'innodb_write_io_threads';
82+Variable_name Value
83+innodb_write_io_threads 64
84+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='write_io_threads';
85+NAME TYPE VALUE
86+write_io_threads ULINT 64
87
88=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_default.result'
89--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_default.result 1970-01-01 00:00:00 +0000
90+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_default.result 2010-05-17 13:08:03 +0000
91@@ -0,0 +1,6 @@
92+SHOW VARIABLES LIKE 'innodb_write_io_threads';
93+Variable_name Value
94+innodb_write_io_threads 4
95+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='write_io_threads';
96+NAME TYPE VALUE
97+write_io_threads ULINT 4
98
99=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64-master.opt'
100--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64-master.opt 1970-01-01 00:00:00 +0000
101+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64-master.opt 2010-05-17 13:08:03 +0000
102@@ -0,0 +1,1 @@
103+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb-read-io-threads=64
104
105=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64.test'
106--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64.test 1970-01-01 00:00:00 +0000
107+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64.test 2010-05-17 13:08:03 +0000
108@@ -0,0 +1,2 @@
109+SHOW VARIABLES LIKE 'innodb_read_io_threads';
110+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='read_io_threads';
111
112=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default-master.opt'
113--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default-master.opt 1970-01-01 00:00:00 +0000
114+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default-master.opt 2010-05-17 13:08:03 +0000
115@@ -0,0 +1,1 @@
116+--plugin_add=embedded_innodb --plugin_remove=innobase
117
118=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default.test'
119--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default.test 1970-01-01 00:00:00 +0000
120+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default.test 2010-05-17 13:08:03 +0000
121@@ -0,0 +1,2 @@
122+SHOW VARIABLES LIKE 'innodb_read_io_threads';
123+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='read_io_threads';
124
125=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64-master.opt'
126--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64-master.opt 1970-01-01 00:00:00 +0000
127+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64-master.opt 2010-05-17 13:08:03 +0000
128@@ -0,0 +1,1 @@
129+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb-write-io-threads=64
130
131=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64.test'
132--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64.test 1970-01-01 00:00:00 +0000
133+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64.test 2010-05-17 13:08:03 +0000
134@@ -0,0 +1,2 @@
135+SHOW VARIABLES LIKE 'innodb_write_io_threads';
136+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='write_io_threads';
137
138=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default-master.opt'
139--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default-master.opt 1970-01-01 00:00:00 +0000
140+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default-master.opt 2010-05-17 13:08:03 +0000
141@@ -0,0 +1,1 @@
142+--plugin_add=embedded_innodb --plugin_remove=innobase
143
144=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default.test'
145--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default.test 1970-01-01 00:00:00 +0000
146+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default.test 2010-05-17 13:08:03 +0000
147@@ -0,0 +1,2 @@
148+SHOW VARIABLES LIKE 'innodb_write_io_threads';
149+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='write_io_threads';