Skip to content

M
mariadb
Commit 47f01c42 authored by Guilhem Bichot's avatar Guilhem Bichot
Browse files
Options

Re-enabling maria-preload.test, to see if it is repeatable on all machines. 

mysql-test/r/maria-preload.result:
  new result.
mysql-test/t/disabled.def:
  re-enabling test
mysql-test/t/maria-preload.test:
  Background dirty pages flushing may influence page cache stats
parent 3e37fb35
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 16 deletions
mysql-test/r/maria-preload.result
View file @ 47f01c42
drop table if exists t1, t2; drop table if exists t1, t2;
set global maria_checkpoint_interval=0;
create temporary table initial create temporary table initial
select variable_name,variable_value from select variable_name,variable_value from
information_schema.global_status where variable_name like "Maria_pagecache_read%"; information_schema.global_status where variable_name like "Maria_pagecache_read%";
...@@ -51,21 +52,21 @@ flush tables; ...@@ -51,21 +52,21 @@ flush tables;
flush status; flush status;
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 211644 MARIA_PAGECACHE_READ_REQUESTS 211645
MARIA_PAGECACHE_READS 3 MARIA_PAGECACHE_READS 3
select count(*) from t1 where b = 'test1'; select count(*) from t1 where b = 'test1';
count(*) count(*)
4181 4181
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 211926 MARIA_PAGECACHE_READ_REQUESTS 211928
MARIA_PAGECACHE_READS 11 MARIA_PAGECACHE_READS 11
select count(*) from t1 where b = 'test1'; select count(*) from t1 where b = 'test1';
count(*) count(*)
4181 4181
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 212208 MARIA_PAGECACHE_READ_REQUESTS 212211
MARIA_PAGECACHE_READS 12 MARIA_PAGECACHE_READS 12
flush tables; flush tables;
flush status; flush status;
...@@ -77,20 +78,20 @@ Table Op Msg_type Msg_text ...@@ -77,20 +78,20 @@ Table Op Msg_type Msg_text
test.t1 preload_keys status OK test.t1 preload_keys status OK
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 212535 MARIA_PAGECACHE_READ_REQUESTS 212539
MARIA_PAGECACHE_READS 84 MARIA_PAGECACHE_READS 84
select count(*) from t1 where b = 'test1'; select count(*) from t1 where b = 'test1';
count(*) count(*)
4181 4181
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 212817 MARIA_PAGECACHE_READ_REQUESTS 212822
MARIA_PAGECACHE_READS 85 MARIA_PAGECACHE_READS 85
flush tables; flush tables;
flush status; flush status;
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 213073 MARIA_PAGECACHE_READ_REQUESTS 213079
MARIA_PAGECACHE_READS 86 MARIA_PAGECACHE_READS 86
set session preload_buffer_size=256*1024; set session preload_buffer_size=256*1024;
select @@preload_buffer_size; select @@preload_buffer_size;
...@@ -101,20 +102,20 @@ Table Op Msg_type Msg_text ...@@ -101,20 +102,20 @@ Table Op Msg_type Msg_text
test.t1 preload_keys status OK test.t1 preload_keys status OK
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 213400 MARIA_PAGECACHE_READ_REQUESTS 213407
MARIA_PAGECACHE_READS 158 MARIA_PAGECACHE_READS 158
select count(*) from t1 where b = 'test1'; select count(*) from t1 where b = 'test1';
count(*) count(*)
4181 4181
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 213682 MARIA_PAGECACHE_READ_REQUESTS 213690
MARIA_PAGECACHE_READS 165 MARIA_PAGECACHE_READS 165
flush tables; flush tables;
flush status; flush status;
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 213938 MARIA_PAGECACHE_READ_REQUESTS 213947
MARIA_PAGECACHE_READS 166 MARIA_PAGECACHE_READS 166
set session preload_buffer_size=1*1024; set session preload_buffer_size=1*1024;
select @@preload_buffer_size; select @@preload_buffer_size;
...@@ -126,7 +127,7 @@ test.t1 preload_keys status OK ...@@ -126,7 +127,7 @@ test.t1 preload_keys status OK
test.t2 preload_keys status OK test.t2 preload_keys status OK
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 214308 MARIA_PAGECACHE_READ_REQUESTS 214318
MARIA_PAGECACHE_READS 281 MARIA_PAGECACHE_READS 281
select count(*) from t1 where b = 'test1'; select count(*) from t1 where b = 'test1';
count(*) count(*)
...@@ -136,13 +137,13 @@ count(*) ...@@ -136,13 +137,13 @@ count(*)
2584 2584
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 214604 MARIA_PAGECACHE_READ_REQUESTS 214615
MARIA_PAGECACHE_READS 285 MARIA_PAGECACHE_READS 285
flush tables; flush tables;
flush status; flush status;
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 214860 MARIA_PAGECACHE_READ_REQUESTS 214872
MARIA_PAGECACHE_READS 286 MARIA_PAGECACHE_READS 286
load index into cache t3, t2 key (primary,b) ; load index into cache t3, t2 key (primary,b) ;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
...@@ -151,13 +152,13 @@ test.t3 preload_keys error Corrupt ...@@ -151,13 +152,13 @@ test.t3 preload_keys error Corrupt
test.t2 preload_keys status OK test.t2 preload_keys status OK
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 215159 MARIA_PAGECACHE_READ_REQUESTS 215172
MARIA_PAGECACHE_READS 330 MARIA_PAGECACHE_READS 330
flush tables; flush tables;
flush status; flush status;
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 215415 MARIA_PAGECACHE_READ_REQUESTS 215429
MARIA_PAGECACHE_READS 331 MARIA_PAGECACHE_READS 331
load index into cache t3 key (b), t2 key (c) ; load index into cache t3 key (b), t2 key (c) ;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
...@@ -167,7 +168,7 @@ test.t2 preload_keys Error Key 'c' doesn't exist in table 't2' ...@@ -167,7 +168,7 @@ test.t2 preload_keys Error Key 'c' doesn't exist in table 't2'
test.t2 preload_keys status Operation failed test.t2 preload_keys status Operation failed
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 215671 MARIA_PAGECACHE_READ_REQUESTS 215686
MARIA_PAGECACHE_READS 332 MARIA_PAGECACHE_READS 332
drop table t1, t2; drop table t1, t2;
drop temporary table initial; drop temporary table initial;
......
mysql-test/t/disabled.def
View file @ 47f01c42
...@@ -19,4 +19,3 @@ ctype_create : Bug#32965 main.ctype_create fails ...@@ -19,4 +19,3 @@ ctype_create : Bug#32965 main.ctype_create fails
status : Bug#32966 main.status fails status : Bug#32966 main.status fails
ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166 ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
maria-preload : Bug#35107 crashes
mysql-test/t/maria-preload.test
View file @ 47f01c42
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
drop table if exists t1, t2; drop table if exists t1, t2;
--enable_warnings --enable_warnings
# Background dirty pages flushing may influence page cache stats:
let $def_checkinterval=`select @@global.maria_checkpoint_interval`;
set global maria_checkpoint_interval=0;
# Work around BUG#34911 "FLUSH STATUS doesn't flush what it should": # Work around BUG#34911 "FLUSH STATUS doesn't flush what it should":
# compute differences in status variables before and after relevant queries # compute differences in status variables before and after relevant queries
create temporary table initial create temporary table initial
...@@ -111,3 +115,9 @@ drop temporary table initial; ...@@ -111,3 +115,9 @@ drop temporary table initial;
# check that Maria didn't use key cache # check that Maria didn't use key cache
show status like "key_read%"; show status like "key_read%";
--disable_result_log
--disable_query_log
eval set global maria_checkpoint_interval=$def_checkinterval;
--enable_result_log
--enable_query_log
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7