From: Marc Alff Date: June 25 2012 9:51am Subject: bzr push into mysql-trunk branch (marc.alff:3902 to 3903) List-Archive: http://lists.mysql.com/commits/144304 Message-Id: <201206250951.q5P9pRnv025481@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3903 Marc Alff 2012-06-25 Test suite cleanup after last merges. Performance schema autosizing: adjusted the mutex_per_share heuristic to follow the server behavior. removed: mysql-test/suite/perfschema/t/sizing_growth.opt added: mysql-test/suite/perfschema/t/sizing_growth-master.opt modified: mysql-test/suite/perfschema/r/sizing_default.result mysql-test/suite/perfschema/r/sizing_growth.result mysql-test/suite/perfschema/r/sizing_high.result mysql-test/suite/perfschema/r/sizing_low.result mysql-test/suite/perfschema/r/sizing_med.result mysql-test/suite/perfschema/t/sizing_growth.test storage/perfschema/pfs_autosize.cc 3902 Sergey Vojtovich 2012-06-25 Fixed innodb-wl5980-discard failure detected after push of WL#6216. modified: mysql-test/suite/innodb/r/innodb-wl5980-discard.result === modified file 'mysql-test/suite/perfschema/r/sizing_default.result' --- a/mysql-test/suite/perfschema/r/sizing_default.result 2012-06-11 14:36:24 +0000 +++ b/mysql-test/suite/perfschema/r/sizing_default.result 2012-06-25 09:50:31 +0000 @@ -25,7 +25,7 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 1556 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 2837 +performance_schema_max_mutex_instances 3282 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 1724 performance_schema_max_socket_classes 10 @@ -91,8 +91,8 @@ performance_schema (pfs_file_class).row_ performance_schema (pfs_file_class).row_count 50 performance_schema (pfs_file_class).memory 16000 performance_schema mutex_instances.row_size 128 -performance_schema mutex_instances.row_count 2837 -performance_schema mutex_instances.memory 363136 +performance_schema mutex_instances.row_count 3282 +performance_schema mutex_instances.memory 420096 performance_schema rwlock_instances.row_size 192 performance_schema rwlock_instances.row_count 1724 performance_schema rwlock_instances.memory 331008 @@ -220,4 +220,4 @@ performance_schema (table_share_hash).co performance_schema (table_share_hash).size 445 performance_schema (user_hash).count 2 performance_schema (user_hash).size 5 -performance_schema performance_schema.memory 35410240 +performance_schema performance_schema.memory 35467200 === modified file 'mysql-test/suite/perfschema/r/sizing_growth.result' --- a/mysql-test/suite/perfschema/r/sizing_growth.result 2012-06-08 14:11:10 +0000 +++ b/mysql-test/suite/perfschema/r/sizing_growth.result 2012-06-25 09:50:31 +0000 @@ -203,8 +203,8 @@ Performance_schema_table_instances_lost Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 -select @mutex_per_share <= 4; -@mutex_per_share <= 4 +select @mutex_per_share <= 5; +@mutex_per_share <= 5 1 select @rwlock_per_share <= 3; @rwlock_per_share <= 3 @@ -240,7 +240,7 @@ select @file_per_handle; @file_per_handle 0 select if( -(@mutex_per_share <= 4) +(@mutex_per_share <= 5) AND (@rwlock_per_share <= 3) AND (@cond_per_share = 0) AND (@file_per_share <= 3) === modified file 'mysql-test/suite/perfschema/r/sizing_high.result' --- a/mysql-test/suite/perfschema/r/sizing_high.result 2012-06-11 14:36:24 +0000 +++ b/mysql-test/suite/perfschema/r/sizing_high.result 2012-06-25 09:50:31 +0000 @@ -25,7 +25,7 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 23385 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 42200 +performance_schema_max_mutex_instances 52200 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 30800 performance_schema_max_socket_classes 10 @@ -91,8 +91,8 @@ performance_schema (pfs_file_class).row_ performance_schema (pfs_file_class).row_count 50 performance_schema (pfs_file_class).memory 16000 performance_schema mutex_instances.row_size 128 -performance_schema mutex_instances.row_count 42200 -performance_schema mutex_instances.memory 5401600 +performance_schema mutex_instances.row_count 52200 +performance_schema mutex_instances.memory 6681600 performance_schema rwlock_instances.row_size 192 performance_schema rwlock_instances.row_count 30800 performance_schema rwlock_instances.memory 5913600 @@ -220,4 +220,4 @@ performance_schema (table_share_hash).co performance_schema (table_share_hash).size 12500 performance_schema (user_hash).count 2 performance_schema (user_hash).size 100 -performance_schema performance_schema.memory 418130808 +performance_schema performance_schema.memory 419410808 === modified file 'mysql-test/suite/perfschema/r/sizing_low.result' --- a/mysql-test/suite/perfschema/r/sizing_low.result 2012-06-11 14:36:24 +0000 +++ b/mysql-test/suite/perfschema/r/sizing_low.result 2012-06-25 09:50:31 +0000 @@ -25,7 +25,7 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 1556 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 2500 +performance_schema_max_mutex_instances 2945 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 1612 performance_schema_max_socket_classes 10 @@ -91,8 +91,8 @@ performance_schema (pfs_file_class).row_ performance_schema (pfs_file_class).row_count 50 performance_schema (pfs_file_class).memory 16000 performance_schema mutex_instances.row_size 128 -performance_schema mutex_instances.row_count 2500 -performance_schema mutex_instances.memory 320000 +performance_schema mutex_instances.row_count 2945 +performance_schema mutex_instances.memory 376960 performance_schema rwlock_instances.row_size 192 performance_schema rwlock_instances.row_count 1612 performance_schema rwlock_instances.memory 309504 @@ -220,4 +220,4 @@ performance_schema (table_share_hash).co performance_schema (table_share_hash).size 445 performance_schema (user_hash).count 2 performance_schema (user_hash).size 5 -performance_schema performance_schema.memory 24384000 +performance_schema performance_schema.memory 24440960 === modified file 'mysql-test/suite/perfschema/r/sizing_med.result' --- a/mysql-test/suite/perfschema/r/sizing_med.result 2012-06-11 14:36:24 +0000 +++ b/mysql-test/suite/perfschema/r/sizing_med.result 2012-06-25 09:50:31 +0000 @@ -25,7 +25,7 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 1754 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 3658 +performance_schema_max_mutex_instances 4230 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 2222 performance_schema_max_socket_classes 10 @@ -91,8 +91,8 @@ performance_schema (pfs_file_class).row_ performance_schema (pfs_file_class).row_count 50 performance_schema (pfs_file_class).memory 16000 performance_schema mutex_instances.row_size 128 -performance_schema mutex_instances.row_count 3658 -performance_schema mutex_instances.memory 468224 +performance_schema mutex_instances.row_count 4230 +performance_schema mutex_instances.memory 541440 performance_schema rwlock_instances.row_size 192 performance_schema rwlock_instances.row_count 2222 performance_schema rwlock_instances.memory 426624 @@ -220,4 +220,4 @@ performance_schema (table_share_hash).co performance_schema (table_share_hash).size 556 performance_schema (user_hash).count 2 performance_schema (user_hash).size 100 -performance_schema performance_schema.memory 69557248 +performance_schema performance_schema.memory 69630464 === added file 'mysql-test/suite/perfschema/t/sizing_growth-master.opt' --- a/mysql-test/suite/perfschema/t/sizing_growth-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/perfschema/t/sizing_growth-master.opt 2012-06-25 09:50:31 +0000 @@ -0,0 +1,3 @@ +--force-restart +--innodb_file_per_table=1 + === removed file 'mysql-test/suite/perfschema/t/sizing_growth.opt' --- a/mysql-test/suite/perfschema/t/sizing_growth.opt 2012-05-25 13:22:34 +0000 +++ b/mysql-test/suite/perfschema/t/sizing_growth.opt 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ ---force-restart ---innodb_file_per_table=1 - === modified file 'mysql-test/suite/perfschema/t/sizing_growth.test' --- a/mysql-test/suite/perfschema/t/sizing_growth.test 2012-06-08 14:11:10 +0000 +++ b/mysql-test/suite/perfschema/t/sizing_growth.test 2012-06-25 09:50:31 +0000 @@ -370,8 +370,9 @@ show status like "performance_schema%"; # This is very storage engine dependent # For innodb: # - wait/synch/mutex/innodb/autoinc_mutex +# - wait/synch/mutex/innodb/os_mutex # -select @mutex_per_share <= 4; +select @mutex_per_share <= 5; # # Expecting 1: @@ -444,12 +445,12 @@ select @file_per_handle; # IMPORTANT NOTE: # when any measurement here changes, the heuristics # in storage/perfschema/pfs_autosize.cc need to be updated. -# Note that this in turns imply to update the results for sizing_*, -# which will lead to different estimations for automated sizing. +# Note that this in turns will lead to different estimations for automated +# sizing, and imply to update the results for sizing_*. # select if( - (@mutex_per_share <= 4) + (@mutex_per_share <= 5) AND (@rwlock_per_share <= 3) AND (@cond_per_share = 0) AND (@file_per_share <= 3) === modified file 'storage/perfschema/pfs_autosize.cc' --- a/storage/perfschema/pfs_autosize.cc 2012-06-08 14:11:10 +0000 +++ b/storage/perfschema/pfs_autosize.cc 2012-06-25 09:50:31 +0000 @@ -47,7 +47,7 @@ static const ulong file_per_handle= 0; static const ulong socket_per_handle= 0; static const ulong thread_per_handle= 0; -static const ulong mutex_per_share= 4; +static const ulong mutex_per_share= 5; static const ulong rwlock_per_share= 3; static const ulong cond_per_share= 1; static const ulong file_per_share= 3; No bundle (reason: useless for push emails).