#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/
2656 Guilhem Bichot 2008-07-03
Fix for BUG#35107 "maria-preload.test is disabled because unrepeatable page cache statistics"
What varies accross machine is maria_pagecache_read_requests, but maria_pagecache_reads doesn't and
is the most interesting (helps verify that disk wasn't touched after preloading), that's all we keep.
modified:
mysql-test/r/maria-preload.result
mysql-test/t/maria-preload.test
storage/maria/ma_test_force_start.pl
per-file messages:
mysql-test/r/maria-preload.result
unrepeatable variable removed
mysql-test/t/maria-preload.test
unrepeatable variable removed
storage/maria/ma_test_force_start.pl
portability fix for running under Windows
=== modified file 'mysql-test/r/maria-preload.result'
--- a/mysql-test/r/maria-preload.result 2008-07-02 08:30:51 +0000
+++ b/mysql-test/r/maria-preload.result 2008-07-03 21:02:13 +0000
@@ -2,7 +2,7 @@ drop table if exists t1, t2;
set global maria_checkpoint_interval=0;
create temporary table initial
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_reads";
create table t1 (
a int not null auto_increment,
b char(16) not null,
@@ -52,21 +52,18 @@ flush tables;
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;
variable_name g.variable_value-i.variable_value
-MARIA_PAGECACHE_READ_REQUESTS 211645
MARIA_PAGECACHE_READS 3
select count(*) from t1 where b = 'test1';
count(*)
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;
variable_name g.variable_value-i.variable_value
-MARIA_PAGECACHE_READ_REQUESTS 211928
MARIA_PAGECACHE_READS 11
select count(*) from t1 where b = 'test1';
count(*)
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;
variable_name g.variable_value-i.variable_value
-MARIA_PAGECACHE_READ_REQUESTS 212211
MARIA_PAGECACHE_READS 12
flush tables;
flush status;
@@ -78,20 +75,17 @@ Table Op Msg_type Msg_text
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;
variable_name g.variable_value-i.variable_value
-MARIA_PAGECACHE_READ_REQUESTS 212539
MARIA_PAGECACHE_READS 84
select count(*) from t1 where b = 'test1';
count(*)
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;
variable_name g.variable_value-i.variable_value
-MARIA_PAGECACHE_READ_REQUESTS 212822
MARIA_PAGECACHE_READS 85
flush tables;
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;
variable_name g.variable_value-i.variable_value
-MARIA_PAGECACHE_READ_REQUESTS 213079
MARIA_PAGECACHE_READS 86
set session preload_buffer_size=256*1024;
select @@preload_buffer_size;
@@ -102,20 +96,17 @@ Table Op Msg_type Msg_text
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;
variable_name g.variable_value-i.variable_value
-MARIA_PAGECACHE_READ_REQUESTS 213407
MARIA_PAGECACHE_READS 158
select count(*) from t1 where b = 'test1';
count(*)
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;
variable_name g.variable_value-i.variable_value
-MARIA_PAGECACHE_READ_REQUESTS 213690
MARIA_PAGECACHE_READS 165
flush tables;
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;
variable_name g.variable_value-i.variable_value
-MARIA_PAGECACHE_READ_REQUESTS 213947
MARIA_PAGECACHE_READS 166
set session preload_buffer_size=1*1024;
select @@preload_buffer_size;
@@ -127,7 +118,6 @@ test.t1 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;
variable_name g.variable_value-i.variable_value
-MARIA_PAGECACHE_READ_REQUESTS 214318
MARIA_PAGECACHE_READS 281
select count(*) from t1 where b = 'test1';
count(*)
@@ -137,13 +127,11 @@ count(*)
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;
variable_name g.variable_value-i.variable_value
-MARIA_PAGECACHE_READ_REQUESTS 214615
MARIA_PAGECACHE_READS 285
flush tables;
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;
variable_name g.variable_value-i.variable_value
-MARIA_PAGECACHE_READ_REQUESTS 214872
MARIA_PAGECACHE_READS 286
load index into cache t3, t2 key (primary,b) ;
Table Op Msg_type Msg_text
@@ -152,13 +140,11 @@ test.t3 preload_keys error Corrupt
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;
variable_name g.variable_value-i.variable_value
-MARIA_PAGECACHE_READ_REQUESTS 215172
MARIA_PAGECACHE_READS 330
flush tables;
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;
variable_name g.variable_value-i.variable_value
-MARIA_PAGECACHE_READ_REQUESTS 215429
MARIA_PAGECACHE_READS 331
load index into cache t3 key (b), t2 key (c) ;
Table Op Msg_type Msg_text
@@ -168,7 +154,6 @@ test.t2 preload_keys Error Key 'c' doesn
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;
variable_name g.variable_value-i.variable_value
-MARIA_PAGECACHE_READ_REQUESTS 215686
MARIA_PAGECACHE_READS 332
drop table t1, t2;
drop temporary table initial;
=== modified file 'mysql-test/t/maria-preload.test'
--- a/mysql-test/t/maria-preload.test 2008-07-02 08:30:51 +0000
+++ b/mysql-test/t/maria-preload.test 2008-07-03 21:02:13 +0000
@@ -13,10 +13,11 @@ let $def_checkinterval=`select @@global.
set global maria_checkpoint_interval=0;
# 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. Maria_pagecache_read_requests varies accross machines.
create temporary table initial
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_reads";
# we don't use block-format because we want page cache stats
# about indices and not data pages.
=== modified file 'storage/maria/ma_test_force_start.pl'
--- a/storage/maria/ma_test_force_start.pl 2008-06-16 08:57:25 +0000
+++ b/storage/maria/ma_test_force_start.pl 2008-07-03 21:02:13 +0000
@@ -160,7 +160,7 @@ open(FILE, "<", $error_log_name) or die;
@cmd_output= <FILE>;
close FILE;
die unless grep(/\[Warning\] mysqld(.exe)*: Maria engine: removed all logs after [\d]+ consecutive failures of recovery from logs/, @cmd_output);
-die unless grep(/\[ERROR\] mysqld(.exe)*: File '...tmp.maria_log.00000001' not found \(Errcode: 2\)/, @cmd_output);
+die unless grep(/\[ERROR\] mysqld(.exe)*: File '.*tmp.maria_log.00000001' not found \(Errcode: 2\)/, @cmd_output);
print "success - ok\n";
open(FILE, ">", $sql_name) or die;
| Thread |
|---|
| • bzr commit into MySQL/Maria:mysql-maria branch (guilhem:2656) Bug#35107 | Guilhem Bichot | 3 Jul |
