From: Marc Alff Date: September 8 2010 6:01pm Subject: bzr commit into mysql-5.5-bugfixing branch (marc.alff:3203) Bug#56528 List-Archive: http://lists.mysql.com/commits/117786 X-Bug: 56528 Message-Id: <20100908180120.0BC2045E80@linux-su11.site> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0871037418929374637==" --===============0871037418929374637== 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-56528/ based on revid:wlad@stripped 3203 Marc Alff 2010-09-08 Bug#56528 Increased server footprint with MTR With recent changes in the performance schema default sizing parameters, the memory used by a mysqld binary increased accordingly. This negatively affects the MTR test suite, because running several tests in parallel now consumes more ressources. The fix is to leave the default production values unchanged, and to configure the MTR environment to limit memory used when running tests in the test suite, which is ok because only a few objects are typically used within a test script. This fix: - changed the default configuration in MTR to use less memory - adjusted the performance schema tests accordingly Note that 1,000 mutex instances was too short and caused test failures in the past in team trees, so the default used is now 10,000 in MTR. The amount of memory used by the performance schema itself can be observed with the statement SHOW ENGINE PERFORMANCE_SCHEMA STATUS modified: mysql-test/include/default_mysqld.cnf 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 === modified file 'mysql-test/include/default_mysqld.cnf' --- a/mysql-test/include/default_mysqld.cnf 2010-02-17 09:18:17 +0000 +++ b/mysql-test/include/default_mysqld.cnf 2010-09-08 18:01:12 +0000 @@ -43,5 +43,11 @@ log-bin=mysqld-bin # Run tests with the performance schema instrumentation loose-enable-performance-schema +# Run tests with a small number of instrumented objects +# to limit memory consumption with MTR +loose-performance-schema-max-mutex-instances=10000 +loose-performance-schema-max-rwlock-instances=10000 +loose-performance-schema-max-table-instances=500 +loose-performance-schema-max-table-handles=1000 binlog-direct-non-transactional-updates === 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-25 00:21:43 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result 2010-09-08 18:01:12 +0000 @@ -45,11 +45,11 @@ 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 1000000 +performance_schema_max_mutex_instances 10000 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_rwlock_instances 10000 +performance_schema_max_table_handles 1000 +performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 1000 show engine PERFORMANCE_SCHEMA status; === 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-25 00:21:43 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result 2010-09-08 18:01:12 +0000 @@ -45,11 +45,11 @@ 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 1000000 +performance_schema_max_mutex_instances 10000 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_rwlock_instances 10000 +performance_schema_max_table_handles 1000 +performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 1000 show engine PERFORMANCE_SCHEMA status; === 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-25 00:21:43 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result 2010-09-08 18:01:12 +0000 @@ -45,11 +45,11 @@ 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 1000000 +performance_schema_max_mutex_instances 10000 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_rwlock_instances 10000 +performance_schema_max_table_handles 1000 +performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 1000 show engine PERFORMANCE_SCHEMA status; === 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-25 00:21:43 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result 2010-09-08 18:01:12 +0000 @@ -45,11 +45,11 @@ 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 1000000 +performance_schema_max_mutex_instances 10000 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_rwlock_instances 10000 +performance_schema_max_table_handles 1000 +performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 1000 show engine PERFORMANCE_SCHEMA status; === 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-25 00:21:43 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result 2010-09-08 18:01:12 +0000 @@ -45,11 +45,11 @@ 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 1000000 +performance_schema_max_mutex_instances 10000 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_rwlock_instances 10000 +performance_schema_max_table_handles 1000 +performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 1000 show engine PERFORMANCE_SCHEMA status; === 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-25 00:21:43 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result 2010-09-08 18:01:12 +0000 @@ -47,9 +47,9 @@ performance_schema_max_file_instances 10 performance_schema_max_mutex_classes 200 performance_schema_max_mutex_instances 0 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_rwlock_instances 10000 +performance_schema_max_table_handles 1000 +performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 1000 show engine PERFORMANCE_SCHEMA status; === 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-25 00:21:43 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result 2010-09-08 18:01:12 +0000 @@ -45,11 +45,11 @@ 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 1000000 +performance_schema_max_mutex_instances 10000 performance_schema_max_rwlock_classes 0 -performance_schema_max_rwlock_instances 1000000 -performance_schema_max_table_handles 100000 -performance_schema_max_table_instances 50000 +performance_schema_max_rwlock_instances 10000 +performance_schema_max_table_handles 1000 +performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 1000 show engine PERFORMANCE_SCHEMA status; === 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-25 00:21:43 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result 2010-09-08 18:01:12 +0000 @@ -45,11 +45,11 @@ 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 1000000 +performance_schema_max_mutex_instances 10000 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 0 -performance_schema_max_table_handles 100000 -performance_schema_max_table_instances 50000 +performance_schema_max_table_handles 1000 +performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 1000 show engine PERFORMANCE_SCHEMA status; === 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-25 00:21:43 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result 2010-09-08 18:01:12 +0000 @@ -45,11 +45,11 @@ 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 1000000 +performance_schema_max_mutex_instances 10000 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_rwlock_instances 10000 +performance_schema_max_table_handles 1000 +performance_schema_max_table_instances 500 performance_schema_max_thread_classes 0 performance_schema_max_thread_instances 1000 show engine PERFORMANCE_SCHEMA status; === 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-25 00:21:43 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result 2010-09-08 18:01:12 +0000 @@ -45,11 +45,11 @@ 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 1000000 +performance_schema_max_mutex_instances 10000 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_rwlock_instances 10000 +performance_schema_max_table_handles 1000 +performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 0 show engine PERFORMANCE_SCHEMA status; === modified file 'mysql-test/suite/perfschema/r/start_server_off.result' --- a/mysql-test/suite/perfschema/r/start_server_off.result 2010-08-25 00:21:43 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_off.result 2010-09-08 18:01:12 +0000 @@ -45,11 +45,11 @@ 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 1000000 +performance_schema_max_mutex_instances 10000 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_rwlock_instances 10000 +performance_schema_max_table_handles 1000 +performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 1000 show engine PERFORMANCE_SCHEMA status; === modified file 'mysql-test/suite/perfschema/r/start_server_on.result' --- a/mysql-test/suite/perfschema/r/start_server_on.result 2010-08-25 00:21:43 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_on.result 2010-09-08 18:01:12 +0000 @@ -45,11 +45,11 @@ 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 1000000 +performance_schema_max_mutex_instances 10000 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_rwlock_instances 10000 +performance_schema_max_table_handles 1000 +performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 1000 show engine PERFORMANCE_SCHEMA status; --===============0871037418929374637== 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-\ # 56528/ # testament_sha1: 59c69ef56acf518b020f7c9ff26d550c4d9aee0c # timestamp: 2010-09-08 12:01:19 -0600 # base_revision_id: wlad@stripped # # Begin bundle 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 --===============0871037418929374637==--