Skip to content

Commit

Permalink
MDEV-23386: mtr: main.mysqld--help autosized table{-open,}-cach and m…
Browse files Browse the repository at this point in the history
…ax-connections

Example of the failure:
http://buildbot.askmonty.org/buildbot/builders/bld-p9-rhel7/builds/4417/steps/mtr/logs/stdio
```
main.mysqld--help 'unix'                 w17 [ fail ]
        Test ended at 2020-06-20 18:51:45

CURRENT_TEST: main.mysqld--help
--- /opt/buildbot-slave/bld-p9-rhel7/build/mysql-test/main/mysqld--help.result	2020-06-20 16:06:49.903604179 +0300
+++ /opt/buildbot-slave/bld-p9-rhel7/build/mysql-test/main/mysqld--help.reject	2020-06-20 18:51:44.886766820 +0300
@@ -1797,10 +1797,10 @@
 sync-relay-log-info 10000
 sysdate-is-now FALSE
 system-versioning-alter-history ERROR
-table-cache 421
+table-cache 2000
 table-definition-cache 400
-table-open-cache 421
-table-open-cache-instances 1
+table-open-cache 2000
+table-open-cache-instances 8
 tc-heuristic-recover OFF
 tcp-keepalive-interval 0
 tcp-keepalive-probes 0

mysqltest: Result length mismatch
```
mtr: table_open_cache_basic autosized:

Lets assume that >400 are available and that
we can set the result back to the start value.

All of these system variables are autosized and can
generate MTR output differences.

Closes #1527
  • Loading branch information
grooverdan authored and an3l committed Aug 10, 2020
1 parent 85bd531 commit deb3655
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 31 deletions.
31 changes: 12 additions & 19 deletions mysql-test/r/mysqld--help,win.rdiff
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
--- mysqld--help.result
+++ mysqld--help,win.reject
@@ -333,7 +333,6 @@
@@ -337,7 +337,6 @@ The following specify which files/extra groups are read (specified before remain
The number of segments in a key cache
-L, --language=name Client error messages in given language. May be given as
a full path. Deprecated. Use --lc-messages-dir instead.
- --large-pages Enable support for large pages
--lc-messages=name Set the language used for the error messages.
-L, --lc-messages-dir=name
Directory where error messages are
@@ -533,6 +532,7 @@
@@ -537,6 +536,7 @@ The following specify which files/extra groups are read (specified before remain
Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME,
DATETIME, TIMESTAMP columns.
(Defaults to on; use --skip-mysql56-temporal-format to disable.)
+ --named-pipe Enable the named pipe (NT)
--net-buffer-length=#
Buffer length for TCP/IP and socket communication
--net-read-timeout=#
@@ -924,6 +924,9 @@
@@ -928,6 +928,9 @@ The following specify which files/extra groups are read (specified before remain
files within specified directory
--server-id=# Uniquely identifies the server instance in the community
of replication partners
Expand All @@ -26,7 +26,7 @@
--show-slave-auth-info
Show user and password in SHOW SLAVE HOSTS on this
master.
@@ -1034,6 +1037,10 @@
@@ -1038,6 +1041,10 @@ The following specify which files/extra groups are read (specified before remain
Log slow queries to given log file. Defaults logging to
'hostname'-slow.log. Must be enabled to activate other
slow log options
Expand All @@ -37,15 +37,15 @@
--socket=name Socket file to use for connection
--sort-buffer-size=#
Each thread that needs to do a sort allocates a buffer of
@@ -1052,6 +1059,7 @@
@@ -1056,6 +1063,7 @@ The following specify which files/extra groups are read (specified before remain
NO_ENGINE_SUBSTITUTION, PAD_CHAR_TO_FULL_LENGTH
--stack-trace Print a symbolic stack trace on failure
(Defaults to on; use --skip-stack-trace to disable.)
+ --standalone Dummy option to start as a standalone program (NT).
--stored-program-cache=#
The soft upper limit for number of cached stored routines
for one connection.
@@ -1088,25 +1096,11 @@
@@ -1092,25 +1100,11 @@ The following specify which files/extra groups are read (specified before remain
COMMIT, ROLLBACK
--thread-cache-size=#
How many threads we should keep in a cache for reuse
Expand Down Expand Up @@ -73,7 +73,7 @@
--thread-stack=# The stack size for each thread
--time-format=name The TIME format (ignored)
--timed-mutexes Specify whether to time mutexes. Deprecated, has no
@@ -1115,8 +1109,8 @@
@@ -1119,8 +1113,8 @@ The following specify which files/extra groups are read (specified before remain
size, MariaDB will automatically convert it to an on-disk
MyISAM or Aria table.
-t, --tmpdir=name Path for temporary files. Several paths may be specified,
Expand All @@ -84,23 +84,23 @@
--transaction-alloc-block-size=#
Allocation block size for transactions to be stored in
binary log
@@ -1240,7 +1234,6 @@
@@ -1244,7 +1238,6 @@ key-cache-block-size 1024
key-cache-division-limit 100
key-cache-file-hash-size 512
key-cache-segments 0
-large-pages FALSE
lc-messages en_US
lc-messages-dir MYSQL_SHAREDIR/
lc-time-names en_US
@@ -1307,6 +1300,7 @@
@@ -1310,6 +1303,7 @@ myisam-sort-buffer-size 134216704
myisam-stats-method NULLS_UNEQUAL
myisam-use-mmap FALSE
mysql56-temporal-format TRUE
+named-pipe FALSE
net-buffer-length 16384
net-read-timeout 30
net-retry-count 10
@@ -1403,6 +1397,8 @@
@@ -1406,6 +1400,8 @@ safe-user-create FALSE
secure-auth TRUE
secure-file-priv (No default value)
server-id 0
Expand All @@ -109,23 +109,16 @@
show-slave-auth-info FALSE
silent-startup FALSE
skip-grant-tables TRUE
@@ -1426,6 +1422,7 @@
@@ -1429,6 +1425,7 @@ slave-transaction-retries 10
slave-type-conversions
slow-launch-time 2
slow-query-log FALSE
+slow-start-timeout 15000
sort-buffer-size 2097152
sql-mode NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
stack-trace TRUE
@@ -1438,15 +1435,13 @@
sync-relay-log 10000
sync-relay-log-info 10000
sysdate-is-now FALSE
-table-cache 421
+table-cache 2000
@@ -1444,10 +1441,8 @@ sysdate-is-now FALSE
table-definition-cache 400
-table-open-cache 421
+table-open-cache 2000
tc-heuristic-recover OFF
thread-cache-size 0
-thread-pool-idle-timeout 60
Expand Down
3 changes: 0 additions & 3 deletions mysql-test/r/mysqld--help.result
Original file line number Diff line number Diff line change
Expand Up @@ -1277,7 +1277,6 @@ max-binlog-cache-size 18446744073709547520
max-binlog-size 1073741824
max-binlog-stmt-cache-size 18446744073709547520
max-connect-errors 100
max-connections 151
max-delayed-threads 20
max-digest-length 1024
max-error-count 64
Expand Down Expand Up @@ -1442,9 +1441,7 @@ sync-master-info 10000
sync-relay-log 10000
sync-relay-log-info 10000
sysdate-is-now FALSE
table-cache 421
table-definition-cache 400
table-open-cache 421
tc-heuristic-recover OFF
thread-cache-size 0
thread-pool-idle-timeout 60
Expand Down
12 changes: 6 additions & 6 deletions mysql-test/suite/sys_vars/r/table_open_cache_basic.result
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SET @start_value = @@global.table_open_cache ;
SELECT @start_value;
@start_value
421
SELECT @start_value > 400;
@start_value > 400
1
'#--------------------FN_DYNVARS_001_01------------------------#'
SET @@global.table_open_cache = 99;
SET @@global.table_open_cache = DeFAULT;
Expand Down Expand Up @@ -108,6 +108,6 @@ ERROR 42S02: Unknown table 'global' in field list
SELECT table_open_cache = @@session.table_open_cache ;
ERROR 42S22: Unknown column 'table_open_cache' in 'field list'
SET @@global.table_open_cache = @start_value;
SELECT @@global.table_open_cache ;
@@global.table_open_cache
421
SELECT @@global.table_open_cache = @start_value ;
@@global.table_open_cache = @start_value
1
4 changes: 2 additions & 2 deletions mysql-test/suite/sys_vars/t/table_open_cache_basic.test
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
##########################################################################

SET @start_value = @@global.table_open_cache ;
SELECT @start_value;
SELECT @start_value > 400;


--echo '#--------------------FN_DYNVARS_001_01------------------------#'
Expand Down Expand Up @@ -165,7 +165,7 @@ SELECT table_open_cache = @@session.table_open_cache ;
##############################

SET @@global.table_open_cache = @start_value;
SELECT @@global.table_open_cache ;
SELECT @@global.table_open_cache = @start_value ;


##################################################################
Expand Down
3 changes: 2 additions & 1 deletion mysql-test/t/mysqld--help.test
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ perl;
log-slow-queries pid-file slow-query-log-file log-basename
datadir slave-load-tmpdir tmpdir socket thread-pool-size
large-files-support lower-case-file-system system-time-zone
collation-server character-set-server log-tc-size version.*/;
collation-server character-set-server log-tc-size table-cache
table-open-cache max-connections version.*/;

# Plugins which may or may not be there:
@plugins=qw/innodb archive blackhole federated partition
Expand Down

0 comments on commit deb3655

Please sign in to comment.