From: Marc Alff Date: August 25 2010 12:21am Subject: bzr commit into mysql-5.5-bugfixing branch (marc.alff:3192) Bug#55576 List-Archive: http://lists.mysql.com/commits/116697 X-Bug: 55576 Message-Id: <20100825002148.C6FDD45E80@linux-su11.site> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7702848997019004275==" --===============7702848997019004275== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/malff/BZR_TREE/mysql-5.5-bugfixing-55576/ based on revid:epotemkin@stripped 3192 Marc Alff 2010-08-24 Bug#55576 Two perfschema tests failed on mysql-next-mr-innodb PB2 tests Before this fix, some tests failed due to lack of instrumentation slots in the performance schema, because the default sizing was too low. Now that more code has been instrumented, the default sizing has to be adjusted to match the current instrumentation consumption. This change: - increases the number of rwlock classes from 20 to 30, - increases the number of rwlock and mutex instances to 1 million. Both are to account for the volume of data instrumented when the innodb storage engine is used (because of the innodb buffer pool). Adjusted the test output accordingly. modified: mysql-test/suite/perfschema/r/start_server_no_cond_class.result mysql-test/suite/perfschema/r/start_server_no_cond_inst.result mysql-test/suite/perfschema/r/start_server_no_file_class.result mysql-test/suite/perfschema/r/start_server_no_file_inst.result mysql-test/suite/perfschema/r/start_server_no_mutex_class.result mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result mysql-test/suite/perfschema/r/start_server_no_thread_class.result mysql-test/suite/perfschema/r/start_server_no_thread_inst.result mysql-test/suite/perfschema/r/start_server_off.result mysql-test/suite/perfschema/r/start_server_on.result sql/sys_vars.cc storage/perfschema/pfs_server.h === modified file 'mysql-test/suite/perfschema/r/start_server_no_cond_class.result' --- a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result 2010-08-12 14:08:52 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result 2010-08-25 00:21:43 +0000 @@ -45,9 +45,9 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 1000 -performance_schema_max_rwlock_classes 20 -performance_schema_max_rwlock_instances 1000 +performance_schema_max_mutex_instances 1000000 +performance_schema_max_rwlock_classes 30 +performance_schema_max_rwlock_instances 1000000 performance_schema_max_table_handles 100000 performance_schema_max_table_instances 50000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_cond_inst.result' --- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result 2010-08-12 14:08:52 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result 2010-08-25 00:21:43 +0000 @@ -45,9 +45,9 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 1000 -performance_schema_max_rwlock_classes 20 -performance_schema_max_rwlock_instances 1000 +performance_schema_max_mutex_instances 1000000 +performance_schema_max_rwlock_classes 30 +performance_schema_max_rwlock_instances 1000000 performance_schema_max_table_handles 100000 performance_schema_max_table_instances 50000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_file_class.result' --- a/mysql-test/suite/perfschema/r/start_server_no_file_class.result 2010-08-12 14:08:52 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result 2010-08-25 00:21:43 +0000 @@ -45,9 +45,9 @@ performance_schema_max_file_classes 0 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 1000 -performance_schema_max_rwlock_classes 20 -performance_schema_max_rwlock_instances 1000 +performance_schema_max_mutex_instances 1000000 +performance_schema_max_rwlock_classes 30 +performance_schema_max_rwlock_instances 1000000 performance_schema_max_table_handles 100000 performance_schema_max_table_instances 50000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_file_inst.result' --- a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result 2010-08-12 14:08:52 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result 2010-08-25 00:21:43 +0000 @@ -45,9 +45,9 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 0 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 1000 -performance_schema_max_rwlock_classes 20 -performance_schema_max_rwlock_instances 1000 +performance_schema_max_mutex_instances 1000000 +performance_schema_max_rwlock_classes 30 +performance_schema_max_rwlock_instances 1000000 performance_schema_max_table_handles 100000 performance_schema_max_table_instances 50000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_mutex_class.result' --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result 2010-08-12 14:08:52 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result 2010-08-25 00:21:43 +0000 @@ -45,9 +45,9 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 performance_schema_max_mutex_classes 0 -performance_schema_max_mutex_instances 1000 -performance_schema_max_rwlock_classes 20 -performance_schema_max_rwlock_instances 1000 +performance_schema_max_mutex_instances 1000000 +performance_schema_max_rwlock_classes 30 +performance_schema_max_rwlock_instances 1000000 performance_schema_max_table_handles 100000 performance_schema_max_table_instances 50000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result' --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result 2010-08-12 14:08:52 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result 2010-08-25 00:21:43 +0000 @@ -46,8 +46,8 @@ performance_schema_max_file_handles 3276 performance_schema_max_file_instances 10000 performance_schema_max_mutex_classes 200 performance_schema_max_mutex_instances 0 -performance_schema_max_rwlock_classes 20 -performance_schema_max_rwlock_instances 1000 +performance_schema_max_rwlock_classes 30 +performance_schema_max_rwlock_instances 1000000 performance_schema_max_table_handles 100000 performance_schema_max_table_instances 50000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result' --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result 2010-08-12 14:08:52 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result 2010-08-25 00:21:43 +0000 @@ -45,9 +45,9 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 1000 +performance_schema_max_mutex_instances 1000000 performance_schema_max_rwlock_classes 0 -performance_schema_max_rwlock_instances 1000 +performance_schema_max_rwlock_instances 1000000 performance_schema_max_table_handles 100000 performance_schema_max_table_instances 50000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result' --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result 2010-08-12 14:08:52 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result 2010-08-25 00:21:43 +0000 @@ -45,8 +45,8 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 1000 -performance_schema_max_rwlock_classes 20 +performance_schema_max_mutex_instances 1000000 +performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 0 performance_schema_max_table_handles 100000 performance_schema_max_table_instances 50000 @@ -56,7 +56,7 @@ show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_rwlock_classes"; Variable_name Value -performance_schema_max_rwlock_classes 20 +performance_schema_max_rwlock_classes 30 select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS where name like "wait/synch/rwlock/%"; count(*) > 0 === modified file 'mysql-test/suite/perfschema/r/start_server_no_thread_class.result' --- a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result 2010-08-12 14:08:52 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result 2010-08-25 00:21:43 +0000 @@ -45,9 +45,9 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 1000 -performance_schema_max_rwlock_classes 20 -performance_schema_max_rwlock_instances 1000 +performance_schema_max_mutex_instances 1000000 +performance_schema_max_rwlock_classes 30 +performance_schema_max_rwlock_instances 1000000 performance_schema_max_table_handles 100000 performance_schema_max_table_instances 50000 performance_schema_max_thread_classes 0 === modified file 'mysql-test/suite/perfschema/r/start_server_no_thread_inst.result' --- a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result 2010-08-12 14:08:52 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result 2010-08-25 00:21:43 +0000 @@ -45,9 +45,9 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 1000 -performance_schema_max_rwlock_classes 20 -performance_schema_max_rwlock_instances 1000 +performance_schema_max_mutex_instances 1000000 +performance_schema_max_rwlock_classes 30 +performance_schema_max_rwlock_instances 1000000 performance_schema_max_table_handles 100000 performance_schema_max_table_instances 50000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_off.result' --- a/mysql-test/suite/perfschema/r/start_server_off.result 2010-08-12 14:08:52 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_off.result 2010-08-25 00:21:43 +0000 @@ -45,9 +45,9 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 1000 -performance_schema_max_rwlock_classes 20 -performance_schema_max_rwlock_instances 1000 +performance_schema_max_mutex_instances 1000000 +performance_schema_max_rwlock_classes 30 +performance_schema_max_rwlock_instances 1000000 performance_schema_max_table_handles 100000 performance_schema_max_table_instances 50000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_on.result' --- a/mysql-test/suite/perfschema/r/start_server_on.result 2010-08-12 14:08:52 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_on.result 2010-08-25 00:21:43 +0000 @@ -45,9 +45,9 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 1000 -performance_schema_max_rwlock_classes 20 -performance_schema_max_rwlock_instances 1000 +performance_schema_max_mutex_instances 1000000 +performance_schema_max_rwlock_classes 30 +performance_schema_max_rwlock_instances 1000000 performance_schema_max_table_handles 100000 performance_schema_max_table_instances 50000 performance_schema_max_thread_classes 50 === modified file 'sql/sys_vars.cc' --- a/sql/sys_vars.cc 2010-08-16 13:05:01 +0000 +++ b/sql/sys_vars.cc 2010-08-25 00:21:43 +0000 @@ -145,7 +145,7 @@ static Sys_var_ulong Sys_pfs_max_mutex_i "performance_schema_max_mutex_instances", "Maximum number of instrumented MUTEX objects.", READ_ONLY GLOBAL_VAR(pfs_param.m_mutex_sizing), - CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 1024*1024), + CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 100*1024*1024), DEFAULT(PFS_MAX_MUTEX), BLOCK_SIZE(1), PFS_TRAILING_PROPERTIES); @@ -161,7 +161,7 @@ static Sys_var_ulong Sys_pfs_max_rwlock_ "performance_schema_max_rwlock_instances", "Maximum number of instrumented RWLOCK objects.", READ_ONLY GLOBAL_VAR(pfs_param.m_rwlock_sizing), - CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 1024*1024), + CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 100*1024*1024), DEFAULT(PFS_MAX_RWLOCK), BLOCK_SIZE(1), PFS_TRAILING_PROPERTIES); === modified file 'storage/perfschema/pfs_server.h' --- a/storage/perfschema/pfs_server.h 2010-07-15 23:44:45 +0000 +++ b/storage/perfschema/pfs_server.h 2010-08-25 00:21:43 +0000 @@ -25,13 +25,13 @@ #define PFS_MAX_MUTEX_CLASS 200 #endif #ifndef PFS_MAX_MUTEX - #define PFS_MAX_MUTEX 1000 + #define PFS_MAX_MUTEX 1000000 #endif #ifndef PFS_MAX_RWLOCK_CLASS - #define PFS_MAX_RWLOCK_CLASS 20 + #define PFS_MAX_RWLOCK_CLASS 30 #endif #ifndef PFS_MAX_RWLOCK - #define PFS_MAX_RWLOCK 1000 + #define PFS_MAX_RWLOCK 1000000 #endif #ifndef PFS_MAX_COND_CLASS #define PFS_MAX_COND_CLASS 80 --===============7702848997019004275== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marc.alff@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing-\ # 55576/ # testament_sha1: 528767805dcf6f2b5cad7e450ff8c99b7ad71b0d # timestamp: 2010-08-24 18:21:48 -0600 # base_revision_id: epotemkin@stripped\ # nrpic8mv9b020ems # # Begin bundle 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 --===============7702848997019004275==--