diff options
author | Sergei Golubchik <serg@mariadb.org> | 2021-07-10 12:42:53 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2021-07-16 19:14:28 +0200 |
commit | bd3ac6758a9615e9a5d7d45a87dde8b448cb4a86 (patch) | |
tree | cc20ff45e6184da6626a726feb3d69366956f8f7 | |
parent | e3814a74eee4f47b5d58997f90c8ee9742452681 (diff) | |
download | mariadb-git-bd3ac6758a9615e9a5d7d45a87dde8b448cb4a86.tar.gz |
fix perfschema.sizing_* tests to run
still cannot be enabled permanently, but at least they
could be run manually, if needed
-rw-r--r-- | mysql-test/suite/perfschema/include/default_mysqld_autosize.cnf | 53 | ||||
-rw-r--r-- | mysql-test/suite/perfschema/include/have_aligned_memory.inc | 5 | ||||
-rw-r--r-- | mysql-test/suite/perfschema/include/sizing_auto.inc | 4 | ||||
-rw-r--r-- | mysql-test/suite/perfschema/r/sizing_default.result | 41 | ||||
-rw-r--r-- | mysql-test/suite/perfschema/r/sizing_high.result | 39 | ||||
-rw-r--r-- | mysql-test/suite/perfschema/r/sizing_low.result | 43 | ||||
-rw-r--r-- | mysql-test/suite/perfschema/r/sizing_med.result | 25 | ||||
-rw-r--r-- | mysql-test/suite/perfschema/r/sizing_off.result | 4 | ||||
-rw-r--r-- | mysql-test/suite/perfschema/t/sizing_default.cnf | 4 | ||||
-rw-r--r-- | mysql-test/suite/perfschema/t/sizing_default.test | 22 | ||||
-rw-r--r-- | mysql-test/suite/perfschema/t/sizing_high.cnf | 3 | ||||
-rw-r--r-- | mysql-test/suite/perfschema/t/sizing_low.cnf | 3 | ||||
-rw-r--r-- | mysql-test/suite/perfschema/t/sizing_med.cnf | 3 | ||||
-rw-r--r-- | mysql-test/suite/perfschema/t/sizing_off.cnf | 2 |
14 files changed, 158 insertions, 93 deletions
diff --git a/mysql-test/suite/perfschema/include/default_mysqld_autosize.cnf b/mysql-test/suite/perfschema/include/default_mysqld_autosize.cnf new file mode 100644 index 00000000000..eee52ede869 --- /dev/null +++ b/mysql-test/suite/perfschema/include/default_mysqld_autosize.cnf @@ -0,0 +1,53 @@ + +# Default values that applies to all MySQL Servers +[mysqld] +local-infile +character-set-server= latin1 +default-storage-engine=myisam + +# Increase default connect_timeout to avoid intermittent +# disconnects when test servers are put under load see BUG#28359 +connect-timeout= 60 + +log-bin-trust-function-creators=1 +key_buffer_size= 1M +sort_buffer_size= 256K +max_heap_table_size= 1M + +loose-innodb_data_file_path= ibdata1:10M:autoextend +loose-innodb_buffer_pool_size= 8M +loose-innodb_lru_scan_depth= 100 +loose-innodb_write_io_threads= 2 +loose-innodb_read_io_threads= 2 +loose-innodb_log_buffer_size= 1M +loose-innodb_log_file_size= 5M +loose-innodb_log_files_in_group= 2 + +slave-net-timeout=120 + +log-bin=mysqld-bin + +# No performance schema sizing provided + +# Disable everything, we only need the sizing data, +# and also need a stable output for show engine performance_schema status +loose-performance-schema-consumer-global-instrumentation=OFF + +loose-performance-schema-instrument='%=ON' + +loose-performance-schema-consumer-events-stages-current=ON +loose-performance-schema-consumer-events-stages-history=ON +loose-performance-schema-consumer-events-stages-history-long=ON +loose-performance-schema-consumer-events-statements-current=ON +loose-performance-schema-consumer-events-statements-history=ON +loose-performance-schema-consumer-events-statements-history-long=ON +loose-performance-schema-consumer-events-transactions-current=ON +loose-performance-schema-consumer-events-transactions-history=ON +loose-performance-schema-consumer-events-transactions-history-long=ON +loose-performance-schema-consumer-events-waits-current=ON +loose-performance-schema-consumer-events-waits-history=ON +loose-performance-schema-consumer-events-waits-history-long=ON +loose-performance-schema-consumer-thread-instrumentation=ON + +binlog-direct-non-transactional-updates + diff --git a/mysql-test/suite/perfschema/include/have_aligned_memory.inc b/mysql-test/suite/perfschema/include/have_aligned_memory.inc index 9638cbe1da4..d420f0e055a 100644 --- a/mysql-test/suite/perfschema/include/have_aligned_memory.inc +++ b/mysql-test/suite/perfschema/include/have_aligned_memory.inc @@ -4,10 +4,7 @@ # For tests sensitive to the internal sizes (show engine performance_schema # status), make sure we use a platform with aligned memory. ---disable_query_log -let $aligned = `SELECT count(*) from performance_schema.session_connect_attrs where PROCESSLIST_ID = connection_id() and ATTR_NAME = '_os' and ATTR_VALUE in ('Linux', 'Windows')`; -if (!$aligned) +if (`SELECT count(*)=0 from performance_schema.session_connect_attrs where PROCESSLIST_ID = connection_id() and ATTR_NAME = '_os' and ATTR_VALUE in ('Linux', 'Windows')`) { skip Need a platform with aligned memory; } ---enable_query_log diff --git a/mysql-test/suite/perfschema/include/sizing_auto.inc b/mysql-test/suite/perfschema/include/sizing_auto.inc index 3bb4db2276f..6cb077e3cf7 100644 --- a/mysql-test/suite/perfschema/include/sizing_auto.inc +++ b/mysql-test/suite/perfschema/include/sizing_auto.inc @@ -3,7 +3,7 @@ show variables like "table_definition_cache"; show variables like "table_open_cache"; show variables like "max_connections"; # open_files_limit depends on OS configuration (ulimit -n) -#show variables like "open_files_limit"; +show variables like "open_files_limit"; show variables where `Variable_name` != "performance_schema_max_statement_classes" and `Variable_name` like "performance_schema%"; @@ -17,7 +17,7 @@ show status like "%performance_schema%"; # is very dependent on the platform, # so it is not printed here to ensure stability of the .results files. # To troubleshoot the performance schema memory consumption at different -# configuration settings, comment the following line. +# configuration settings, uncomment the following line. # Debug only: # show engine performance_schema status; diff --git a/mysql-test/suite/perfschema/r/sizing_default.result b/mysql-test/suite/perfschema/r/sizing_default.result index 07fbf35619b..ea611315be3 100644 --- a/mysql-test/suite/perfschema/r/sizing_default.result +++ b/mysql-test/suite/perfschema/r/sizing_default.result @@ -1,43 +1,46 @@ show variables like "table_definition_cache"; Variable_name Value -table_definition_cache 1400 +table_definition_cache 400 show variables like "table_open_cache"; Variable_name Value -table_open_cache 2000 +table_open_cache 421 show variables like "max_connections"; Variable_name Value max_connections 151 +show variables like "open_files_limit"; +Variable_name Value +open_files_limit 1024 show variables where `Variable_name` != "performance_schema_max_statement_classes" and `Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 -performance_schema_digests_size 10000 -performance_schema_events_stages_history_long_size 10000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 10000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 +performance_schema_digests_size 5000 +performance_schema_events_stages_history_long_size 1000 +performance_schema_events_stages_history_size 20 +performance_schema_events_statements_history_long_size 1000 +performance_schema_events_statements_history_size 20 +performance_schema_events_waits_history_long_size 1000 +performance_schema_events_waits_history_size 20 performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 3504 +performance_schema_max_cond_classes 90 +performance_schema_max_cond_instances 1360 performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 7693 +performance_schema_max_file_instances 2500 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 15906 +performance_schema_max_mutex_instances 5648 performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 9102 +performance_schema_max_rwlock_instances 3073 performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 322 -performance_schema_max_stage_classes\t160 -performance_schema_max_table_handles 4000 -performance_schema_max_table_instances 12500 +performance_schema_max_socket_instances 230 +performance_schema_max_stage_classes 160 +performance_schema_max_table_handles 2858 +performance_schema_max_table_instances 667 performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 402 +performance_schema_max_thread_instances 288 performance_schema_session_connect_attrs_size 512 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 diff --git a/mysql-test/suite/perfschema/r/sizing_high.result b/mysql-test/suite/perfschema/r/sizing_high.result index 1cf84a14d22..1f63ac6015a 100644 --- a/mysql-test/suite/perfschema/r/sizing_high.result +++ b/mysql-test/suite/perfschema/r/sizing_high.result @@ -3,41 +3,44 @@ Variable_name Value table_definition_cache 5000 show variables like "table_open_cache"; Variable_name Value -table_open_cache 400 +table_open_cache 397 show variables like "max_connections"; Variable_name Value max_connections 200 +show variables like "open_files_limit"; +Variable_name Value +open_files_limit 1024 show variables where `Variable_name` != "performance_schema_max_statement_classes" and `Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON performance_schema_accounts_size 100 -performance_schema_digests_size 10000 -performance_schema_events_stages_history_long_size 10000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 10000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 +performance_schema_digests_size 5000 +performance_schema_events_stages_history_long_size 1000 +performance_schema_events_stages_history_size 20 +performance_schema_events_statements_history_long_size 1000 +performance_schema_events_statements_history_size 20 +performance_schema_events_waits_history_long_size 1000 +performance_schema_events_waits_history_size 20 performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 10900 +performance_schema_max_cond_classes 90 +performance_schema_max_cond_instances 1500 performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 23385 +performance_schema_max_file_instances 2500 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 52200 +performance_schema_max_mutex_instances 5858 performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 30800 +performance_schema_max_rwlock_instances 3143 performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 420 -performance_schema_max_stage_classes\t160 -performance_schema_max_table_handles 800 -performance_schema_max_table_instances 12500 +performance_schema_max_socket_instances 300 +performance_schema_max_stage_classes 160 +performance_schema_max_table_handles 2858 +performance_schema_max_table_instances 667 performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 500 +performance_schema_max_thread_instances 358 performance_schema_session_connect_attrs_size 512 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 diff --git a/mysql-test/suite/perfschema/r/sizing_low.result b/mysql-test/suite/perfschema/r/sizing_low.result index 4569ebd7a5e..d6d6baeca9a 100644 --- a/mysql-test/suite/perfschema/r/sizing_low.result +++ b/mysql-test/suite/perfschema/r/sizing_low.result @@ -7,41 +7,44 @@ table_open_cache 100 show variables like "max_connections"; Variable_name Value max_connections 50 +show variables like "open_files_limit"; +Variable_name Value +open_files_limit 1024 show variables where `Variable_name` != "performance_schema_max_statement_classes" and `Variable_name` like "performance_schema%"; Variable_name Value performance_schema ON -performance_schema_accounts_size 10 -performance_schema_digests_size 1000 -performance_schema_events_stages_history_long_size 100 -performance_schema_events_stages_history_size 5 -performance_schema_events_statements_history_long_size 100 -performance_schema_events_statements_history_size 5 -performance_schema_events_waits_history_long_size 100 -performance_schema_events_waits_history_size 5 -performance_schema_hosts_size 20 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 612 +performance_schema_accounts_size 100 +performance_schema_digests_size 5000 +performance_schema_events_stages_history_long_size 1000 +performance_schema_events_stages_history_size 20 +performance_schema_events_statements_history_long_size 1000 +performance_schema_events_statements_history_size 20 +performance_schema_events_waits_history_long_size 1000 +performance_schema_events_waits_history_size 20 +performance_schema_hosts_size 100 +performance_schema_max_cond_classes 90 +performance_schema_max_cond_instances 1072 performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 1556 +performance_schema_max_file_instances 2500 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 2945 +performance_schema_max_mutex_instances 5215 performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 1612 +performance_schema_max_rwlock_instances 2929 performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 67 -performance_schema_max_stage_classes\t160 -performance_schema_max_table_handles 112 -performance_schema_max_table_instances 445 +performance_schema_max_socket_instances 86 +performance_schema_max_stage_classes 160 +performance_schema_max_table_handles 2858 +performance_schema_max_table_instances 667 performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 112 +performance_schema_max_thread_instances 143 performance_schema_session_connect_attrs_size 512 performance_schema_setup_actors_size 100 performance_schema_setup_objects_size 100 -performance_schema_users_size 5 +performance_schema_users_size 100 show status like "%performance_schema%"; Variable_name Value Performance_schema_accounts_lost 0 diff --git a/mysql-test/suite/perfschema/r/sizing_med.result b/mysql-test/suite/perfschema/r/sizing_med.result index 24fba02d16b..f662809b5cd 100644 --- a/mysql-test/suite/perfschema/r/sizing_med.result +++ b/mysql-test/suite/perfschema/r/sizing_med.result @@ -7,6 +7,9 @@ table_open_cache 401 show variables like "max_connections"; Variable_name Value max_connections 152 +show variables like "open_files_limit"; +Variable_name Value +open_files_limit 1024 show variables where `Variable_name` != "performance_schema_max_statement_classes" and `Variable_name` like "performance_schema%"; @@ -15,27 +18,27 @@ performance_schema ON performance_schema_accounts_size 100 performance_schema_digests_size 5000 performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 +performance_schema_events_stages_history_size 20 performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 +performance_schema_events_statements_history_size 20 performance_schema_events_waits_history_long_size 1000 -performance_schema_events_waits_history_size 10 +performance_schema_events_waits_history_size 20 performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1079 +performance_schema_max_cond_classes 90 +performance_schema_max_cond_instances 1363 performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 1754 +performance_schema_max_file_instances 2500 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 4230 +performance_schema_max_mutex_instances 5652 performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 2222 +performance_schema_max_rwlock_instances 3075 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 232 -performance_schema_max_stage_classes\t160 -performance_schema_max_table_handles 573 -performance_schema_max_table_instances 556 +performance_schema_max_stage_classes 160 +performance_schema_max_table_handles 2858 +performance_schema_max_table_instances 667 performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 289 performance_schema_session_connect_attrs_size 512 diff --git a/mysql-test/suite/perfschema/r/sizing_off.result b/mysql-test/suite/perfschema/r/sizing_off.result index e49a9824f42..d3c0a0de0a1 100644 --- a/mysql-test/suite/perfschema/r/sizing_off.result +++ b/mysql-test/suite/perfschema/r/sizing_off.result @@ -12,7 +12,7 @@ performance_schema_events_statements_history_size -1 performance_schema_events_waits_history_long_size -1 performance_schema_events_waits_history_size -1 performance_schema_hosts_size -1 -performance_schema_max_cond_classes 80 +performance_schema_max_cond_classes 90 performance_schema_max_cond_instances -1 performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 @@ -24,7 +24,7 @@ performance_schema_max_rwlock_classes 40 performance_schema_max_rwlock_instances -1 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances -1 -performance_schema_max_stage_classes\t160 +performance_schema_max_stage_classes 160 performance_schema_max_table_handles -1 performance_schema_max_table_instances -1 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/t/sizing_default.cnf b/mysql-test/suite/perfschema/t/sizing_default.cnf index 6a929998329..0515832d41c 100644 --- a/mysql-test/suite/perfschema/t/sizing_default.cnf +++ b/mysql-test/suite/perfschema/t/sizing_default.cnf @@ -1,5 +1,5 @@ -!include include/default_mysqld_autosize.cnf +!include suite/perfschema/include/default_mysqld_autosize.cnf [mysqld.1] @@ -14,6 +14,8 @@ # Automated sizing for everything +loose-enable-performance-schema + loose-performance-schema-accounts-size=-1 loose-performance-schema-digests-size=-1 loose-performance-schema-hosts-size=-1 diff --git a/mysql-test/suite/perfschema/t/sizing_default.test b/mysql-test/suite/perfschema/t/sizing_default.test index d5fb8be9f77..f8086cc7afd 100644 --- a/mysql-test/suite/perfschema/t/sizing_default.test +++ b/mysql-test/suite/perfschema/t/sizing_default.test @@ -5,27 +5,25 @@ --source include/not_valgrind.inc --source ../include/have_aligned_memory.inc +#SELECT @@open_files_limit, @@table_open_cache, @@table_definition_cache, @@max_connections; +#exit; + # Skip test if not defaults is used. -let $max_open_files_limit= `SELECT @@open_files_limit < 5000`; -if ($max_open_files_limit) +if (`SELECT @@open_files_limit < 1024`) { - skip Need open_files_limit to be at least 5000; + skip Need open_files_limit to be at least 1024; } -let $max_table_open_cache= `SELECT @@table_open_cache != 2000`; -if ($max_table_open_cache) +if (`SELECT @@table_open_cache != 421`) { - skip Need table_open_cache to be exactly 2000; + skip Need table_open_cache to be exactly 421; } -let $max_table_definition_cache= `SELECT @@table_definition_cache != 1400`; -if ($max_table_definition_cache) +if (`SELECT @@table_definition_cache != 400`) { - skip Need table_definition_cache to be exactly 1400; + skip Need table_definition_cache to be exactly 400; } -let $max_connections= `SELECT @@max_connections != 151`; -if ($max_connections) +if (`SELECT @@max_connections != 151`) { skip Need max_connections to be exactly 151; } --source ../include/sizing_auto.inc - diff --git a/mysql-test/suite/perfschema/t/sizing_high.cnf b/mysql-test/suite/perfschema/t/sizing_high.cnf index 8445ff60928..519ad79f3ad 100644 --- a/mysql-test/suite/perfschema/t/sizing_high.cnf +++ b/mysql-test/suite/perfschema/t/sizing_high.cnf @@ -1,5 +1,5 @@ -!include include/default_mysqld_autosize.cnf +!include suite/perfschema/include/default_mysqld_autosize.cnf [mysqld.1] @@ -32,6 +32,7 @@ open_files_limit=1024 # max_connections*5 = 200*5 = 1000 # Automated sizing for everything +loose-enable-performance-schema loose-performance-schema-accounts-size=-1 loose-performance-schema-digests-size=-1 diff --git a/mysql-test/suite/perfschema/t/sizing_low.cnf b/mysql-test/suite/perfschema/t/sizing_low.cnf index 54c881830cf..79e891bda60 100644 --- a/mysql-test/suite/perfschema/t/sizing_low.cnf +++ b/mysql-test/suite/perfschema/t/sizing_low.cnf @@ -1,5 +1,5 @@ -!include include/default_mysqld_autosize.cnf +!include suite/perfschema/include/default_mysqld_autosize.cnf [mysqld.1] @@ -9,6 +9,7 @@ max_connections=50 open_files_limit=1024 # Automated sizing for everything +loose-enable-performance-schema loose-performance-schema-accounts-size=-1 loose-performance-schema-digests-size=-1 diff --git a/mysql-test/suite/perfschema/t/sizing_med.cnf b/mysql-test/suite/perfschema/t/sizing_med.cnf index 8aff531ea69..4a113272e38 100644 --- a/mysql-test/suite/perfschema/t/sizing_med.cnf +++ b/mysql-test/suite/perfschema/t/sizing_med.cnf @@ -1,5 +1,5 @@ -!include include/default_mysqld_autosize.cnf +!include suite/perfschema/include/default_mysqld_autosize.cnf [mysqld.1] @@ -9,6 +9,7 @@ max_connections=152 open_files_limit=1024 # Automated sizing for everything +loose-enable-performance-schema loose-performance-schema-accounts-size=-1 loose-performance-schema-digests-size=-1 diff --git a/mysql-test/suite/perfschema/t/sizing_off.cnf b/mysql-test/suite/perfschema/t/sizing_off.cnf index 24ca58bbb0b..80c00494791 100644 --- a/mysql-test/suite/perfschema/t/sizing_off.cnf +++ b/mysql-test/suite/perfschema/t/sizing_off.cnf @@ -1,5 +1,5 @@ -!include include/default_mysqld_autosize.cnf +!include suite/perfschema/include/default_mysqld_autosize.cnf [mysqld.1] |