#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;
Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100908180112-0e6o8uiku59gtbhl.bundle
