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
=== modified file 'plugin/embedded_innodb/embedded_innodb_engine.cc'
--- plugin/embedded_innodb/embedded_innodb_engine.cc 2010-05-17 13:08:01 +0000
+++ plugin/embedded_innodb/embedded_innodb_engine.cc 2010-05-17 13:08:03 +0000
@@ -2187,6 +2187,8 @@
2187static unsigned long srv_max_purge_lag;2187static unsigned long srv_max_purge_lag;
2188static unsigned long innobase_lru_old_blocks_pct;2188static unsigned long innobase_lru_old_blocks_pct;
2189static unsigned long innobase_lru_block_access_recency;2189static unsigned long innobase_lru_block_access_recency;
2190static unsigned long innobase_read_io_threads;
2191static unsigned long innobase_write_io_threads;
2190static long innobase_open_files;2192static long innobase_open_files;
2191static char default_innodb_data_file_path[]= "ibdata1:10M:autoextend";2193static char default_innodb_data_file_path[]= "ibdata1:10M:autoextend";
2192static char* innodb_data_file_path= NULL;2194static char* innodb_data_file_path= NULL;
@@ -2278,6 +2280,14 @@
2278 if (err != DB_SUCCESS)2280 if (err != DB_SUCCESS)
2279 goto innodb_error;2281 goto innodb_error;
22802282
2283 err= ib_cfg_set_int("read_io_threads", innobase_read_io_threads);
2284 if (err != DB_SUCCESS)
2285 goto innodb_error;
2286
2287 err= ib_cfg_set_int("write_io_threads", innobase_write_io_threads);
2288 if (err != DB_SUCCESS)
2289 goto innodb_error;
2290
2281 err= ib_startup(innobase_file_format_name);2291 err= ib_startup(innobase_file_format_name);
2282 if (err != DB_SUCCESS)2292 if (err != DB_SUCCESS)
2283 goto innodb_error;2293 goto innodb_error;
@@ -2502,6 +2512,16 @@
2502 "How many files at the maximum InnoDB keeps open at the same time.",2512 "How many files at the maximum InnoDB keeps open at the same time.",
2503 NULL, NULL, 300L, 10L, LONG_MAX, 0);2513 NULL, NULL, 300L, 10L, LONG_MAX, 0);
25042514
2515static DRIZZLE_SYSVAR_ULONG(read_io_threads, innobase_read_io_threads,
2516 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
2517 "Number of background read I/O threads in InnoDB.",
2518 NULL, NULL, 4, 1, 64, 0);
2519
2520static DRIZZLE_SYSVAR_ULONG(write_io_threads, innobase_write_io_threads,
2521 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
2522 "Number of background write I/O threads in InnoDB.",
2523 NULL, NULL, 4, 1, 64, 0);
2524
2505static drizzle_sys_var* innobase_system_variables[]= {2525static drizzle_sys_var* innobase_system_variables[]= {
2506 DRIZZLE_SYSVAR(checksums),2526 DRIZZLE_SYSVAR(checksums),
2507 DRIZZLE_SYSVAR(data_home_dir),2527 DRIZZLE_SYSVAR(data_home_dir),
@@ -2522,6 +2542,8 @@
2522 DRIZZLE_SYSVAR(max_dirty_pages_pct),2542 DRIZZLE_SYSVAR(max_dirty_pages_pct),
2523 DRIZZLE_SYSVAR(max_purge_lag),2543 DRIZZLE_SYSVAR(max_purge_lag),
2524 DRIZZLE_SYSVAR(open_files),2544 DRIZZLE_SYSVAR(open_files),
2545 DRIZZLE_SYSVAR(read_io_threads),
2546 DRIZZLE_SYSVAR(write_io_threads),
2525 NULL2547 NULL
2526};2548};
25272549
25282550
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_read_io_threads_64.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_read_io_threads_64.result 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_read_io_threads_64.result 2010-05-17 13:08:03 +0000
@@ -0,0 +1,6 @@
1SHOW VARIABLES LIKE 'innodb_read_io_threads';
2Variable_name Value
3innodb_read_io_threads 64
4SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='read_io_threads';
5NAME TYPE VALUE
6read_io_threads ULINT 64
07
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_read_io_threads_default.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_read_io_threads_default.result 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_read_io_threads_default.result 2010-05-17 13:08:03 +0000
@@ -0,0 +1,6 @@
1SHOW VARIABLES LIKE 'innodb_read_io_threads';
2Variable_name Value
3innodb_read_io_threads 4
4SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='read_io_threads';
5NAME TYPE VALUE
6read_io_threads ULINT 4
07
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_64.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_64.result 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_64.result 2010-05-17 13:08:03 +0000
@@ -0,0 +1,6 @@
1SHOW VARIABLES LIKE 'innodb_write_io_threads';
2Variable_name Value
3innodb_write_io_threads 64
4SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='write_io_threads';
5NAME TYPE VALUE
6write_io_threads ULINT 64
07
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_default.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_default.result 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_default.result 2010-05-17 13:08:03 +0000
@@ -0,0 +1,6 @@
1SHOW VARIABLES LIKE 'innodb_write_io_threads';
2Variable_name Value
3innodb_write_io_threads 4
4SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='write_io_threads';
5NAME TYPE VALUE
6write_io_threads ULINT 4
07
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64-master.opt 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64-master.opt 2010-05-17 13:08:03 +0000
@@ -0,0 +1,1 @@
1--plugin_add=embedded_innodb --plugin_remove=innobase --innodb-read-io-threads=64
02
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64.test 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64.test 2010-05-17 13:08:03 +0000
@@ -0,0 +1,2 @@
1SHOW VARIABLES LIKE 'innodb_read_io_threads';
2SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='read_io_threads';
03
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default-master.opt 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default-master.opt 2010-05-17 13:08:03 +0000
@@ -0,0 +1,1 @@
1--plugin_add=embedded_innodb --plugin_remove=innobase
02
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default.test 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default.test 2010-05-17 13:08:03 +0000
@@ -0,0 +1,2 @@
1SHOW VARIABLES LIKE 'innodb_read_io_threads';
2SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='read_io_threads';
03
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64-master.opt 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64-master.opt 2010-05-17 13:08:03 +0000
@@ -0,0 +1,1 @@
1--plugin_add=embedded_innodb --plugin_remove=innobase --innodb-write-io-threads=64
02
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64.test 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64.test 2010-05-17 13:08:03 +0000
@@ -0,0 +1,2 @@
1SHOW VARIABLES LIKE 'innodb_write_io_threads';
2SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='write_io_threads';
03
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default-master.opt 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default-master.opt 2010-05-17 13:08:03 +0000
@@ -0,0 +1,1 @@
1--plugin_add=embedded_innodb --plugin_remove=innobase
02
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default.test 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default.test 2010-05-17 13:08:03 +0000
@@ -0,0 +1,2 @@
1SHOW VARIABLES LIKE 'innodb_write_io_threads';
2SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='write_io_threads';