Skip to content

M
MariaDB
Commit 38908aaf authored by Monty's avatar Monty
Browse files
Options

Fix failing mtr tests 

- Changed rocksdb.2pcgroup_commit.test to print information on error
- Updated myisam_views-big.result
parent c2118a08
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
storage/rocksdb/mysql-test/rocksdb/r/2pc_group_commit.result
View file @ 38908aaf
...@@ -14,16 +14,16 @@ SET GLOBAL rocksdb_flush_log_at_trx_commit=1; ...@@ -14,16 +14,16 @@ SET GLOBAL rocksdb_flush_log_at_trx_commit=1;
select variable_value into @b1 from information_schema.global_status where variable_name='Binlog_commits'; select variable_value into @b1 from information_schema.global_status where variable_name='Binlog_commits';
select variable_value into @b2 from information_schema.global_status where variable_name='Binlog_group_commits'; select variable_value into @b2 from information_schema.global_status where variable_name='Binlog_group_commits';
select variable_value into @b3 from information_schema.global_status where variable_name='Rocksdb_wal_synced'; select variable_value into @b3 from information_schema.global_status where variable_name='Rocksdb_wal_synced';
select IF(variable_value - @b1 = 1000, 'OK', 'FAIL') as Binlog_commits select IF(variable_value - @b1 = 1000, 'OK', variable_value - @b1 = 1000) as Binlog_commits
from information_schema.global_status where variable_name='Binlog_commits'; from information_schema.global_status where variable_name='Binlog_commits';
Binlog_commits Binlog_commits
OK OK
select IF(variable_value - @b2 = 1000, 'OK', 'FAIL') as Binlog_group_commits select IF(variable_value - @b2 = 1000, 'OK', variable_value - @b2 = 1000) as Binlog_group_commits
from information_schema.global_status where variable_name='Binlog_group_commits'; from information_schema.global_status where variable_name='Binlog_group_commits';
Binlog_group_commits Binlog_group_commits
OK OK
# Prepare operations sync, commits don't. We expect slightly more than 1K syncs: # Prepare operations sync, commits don't. We expect slightly more than 1K syncs:
select IF(variable_value - @b3 between 1000 and 1500, 'OK', 'FAIL') as Rocksdb_wal_synced select IF(variable_value - @b3 between 1000 and 1500, 'OK', variable_value - @b3 between 1000 and 1500) as Rocksdb_wal_synced
from information_schema.global_status where variable_name='Rocksdb_wal_synced'; from information_schema.global_status where variable_name='Rocksdb_wal_synced';
Rocksdb_wal_synced Rocksdb_wal_synced
OK OK
...@@ -33,17 +33,17 @@ OK ...@@ -33,17 +33,17 @@ OK
select variable_value into @b1 from information_schema.global_status where variable_name='Binlog_commits'; select variable_value into @b1 from information_schema.global_status where variable_name='Binlog_commits';
select variable_value into @b2 from information_schema.global_status where variable_name='Binlog_group_commits'; select variable_value into @b2 from information_schema.global_status where variable_name='Binlog_group_commits';
select variable_value into @b3 from information_schema.global_status where variable_name='Rocksdb_wal_synced'; select variable_value into @b3 from information_schema.global_status where variable_name='Rocksdb_wal_synced';
select IF(variable_value - @b1 = 10000, 'OK', 'FAIL') as Binlog_commits select IF(variable_value - @b1 = 10000, 'OK', variable_value - @b1 = 10000) as Binlog_commits
from information_schema.global_status where variable_name='Binlog_commits'; from information_schema.global_status where variable_name='Binlog_commits';
Binlog_commits Binlog_commits
OK OK
select IF(variable_value - @b2 between 100 and 5000, 'OK', 'FAIL') as Binlog_group_commits select IF(variable_value - @b2 between 100 and 5000, 'OK', variable_value - @b2 between 100 and 5000) as Binlog_group_commits
from information_schema.global_status where variable_name='Binlog_group_commits'; from information_schema.global_status where variable_name='Binlog_group_commits';
Binlog_group_commits Binlog_group_commits
OK OK
select IF(variable_value - @b3 between 1 and 9000, 'OK', 'FAIL') select IF(variable_value - @b3 between 1 and 9000, 'OK', variable_value - @b3 between 1 and 9000)
from information_schema.global_status where variable_name='Rocksdb_wal_synced'; from information_schema.global_status where variable_name='Rocksdb_wal_synced';
IF(variable_value - @b3 between 1 and 9000, 'OK', 'FAIL') IF(variable_value - @b3 between 1 and 9000, 'OK', variable_value - @b3 between 1 and 9000)
OK OK
## ##
# 2PC enabled, MyRocks durability disabled, single thread # 2PC enabled, MyRocks durability disabled, single thread
...@@ -53,17 +53,17 @@ SET GLOBAL rocksdb_flush_log_at_trx_commit=0; ...@@ -53,17 +53,17 @@ SET GLOBAL rocksdb_flush_log_at_trx_commit=0;
select variable_value into @b1 from information_schema.global_status where variable_name='Binlog_commits'; select variable_value into @b1 from information_schema.global_status where variable_name='Binlog_commits';
select variable_value into @b2 from information_schema.global_status where variable_name='Binlog_group_commits'; select variable_value into @b2 from information_schema.global_status where variable_name='Binlog_group_commits';
select variable_value into @b3 from information_schema.global_status where variable_name='Rocksdb_wal_synced'; select variable_value into @b3 from information_schema.global_status where variable_name='Rocksdb_wal_synced';
select IF(variable_value - @b1 = 1000, 'OK', 'FAIL') as Binlog_commits select IF(variable_value - @b1 = 1000, 'OK', variable_value - @b1 = 1000) as Binlog_commits
from information_schema.global_status where variable_name='Binlog_commits'; from information_schema.global_status where variable_name='Binlog_commits';
Binlog_commits Binlog_commits
OK OK
select IF(variable_value - @b2 = 1000, 'OK', 'FAIL') as Binlog_group_commits select IF(variable_value - @b2 = 1000, 'OK', variable_value - @b2 = 1000) as Binlog_group_commits
from information_schema.global_status where variable_name='Binlog_group_commits'; from information_schema.global_status where variable_name='Binlog_group_commits';
Binlog_group_commits Binlog_group_commits
OK OK
select IF(variable_value - @b3 < 10, 'OK', 'FAIL') select IF(variable_value - @b3 < 10, 'OK', variable_value - @b3 < 10)
from information_schema.global_status where variable_name='Rocksdb_wal_synced'; from information_schema.global_status where variable_name='Rocksdb_wal_synced';
IF(variable_value - @b3 < 10, 'OK', 'FAIL') IF(variable_value - @b3 < 10, 'OK', variable_value - @b3 < 10)
OK OK
## ##
# 2PC enabled, MyRocks durability disabled, concurrent workload # 2PC enabled, MyRocks durability disabled, concurrent workload
...@@ -71,17 +71,17 @@ OK ...@@ -71,17 +71,17 @@ OK
select variable_value into @b1 from information_schema.global_status where variable_name='Binlog_commits'; select variable_value into @b1 from information_schema.global_status where variable_name='Binlog_commits';
select variable_value into @b2 from information_schema.global_status where variable_name='Binlog_group_commits'; select variable_value into @b2 from information_schema.global_status where variable_name='Binlog_group_commits';
select variable_value into @b3 from information_schema.global_status where variable_name='Rocksdb_wal_synced'; select variable_value into @b3 from information_schema.global_status where variable_name='Rocksdb_wal_synced';
select IF(variable_value - @b1 = 10000, 'OK', 'FAIL') as Binlog_commits select IF(variable_value - @b1 = 10000, 'OK', variable_value - @b1 = 10000) as Binlog_commits
from information_schema.global_status where variable_name='Binlog_commits'; from information_schema.global_status where variable_name='Binlog_commits';
Binlog_commits Binlog_commits
OK OK
select IF(variable_value - @b2 < 8000, 'OK', 'FAIL') as Binlog_group_commits select IF(variable_value - @b2 < 8000, 'OK', variable_value - @b2 < 8000) as Binlog_group_commits
from information_schema.global_status where variable_name='Binlog_group_commits'; from information_schema.global_status where variable_name='Binlog_group_commits';
Binlog_group_commits Binlog_group_commits
OK OK
select IF(variable_value - @b3 < 10, 'OK', 'FAIL') select IF(variable_value - @b3 < 10, 'OK', variable_value - @b3 < 10)
from information_schema.global_status where variable_name='Rocksdb_wal_synced'; from information_schema.global_status where variable_name='Rocksdb_wal_synced';
IF(variable_value - @b3 < 10, 'OK', 'FAIL') IF(variable_value - @b3 < 10, 'OK', variable_value - @b3 < 10)
OK OK
SET GLOBAL rocksdb_enable_2pc= @save_rocksdb_enable_2pc; SET GLOBAL rocksdb_enable_2pc= @save_rocksdb_enable_2pc;
SET GLOBAL rocksdb_flush_log_at_trx_commit= @save_rocksdb_flush_log_at_trx_commit; SET GLOBAL rocksdb_flush_log_at_trx_commit= @save_rocksdb_flush_log_at_trx_commit;
......
storage/rocksdb/mysql-test/rocksdb/t/2pc_group_commit.test
View file @ 38908aaf
...@@ -31,12 +31,12 @@ select variable_value into @b1 from information_schema.global_status where varia ...@@ -31,12 +31,12 @@ select variable_value into @b1 from information_schema.global_status where varia
select variable_value into @b2 from information_schema.global_status where variable_name='Binlog_group_commits'; select variable_value into @b2 from information_schema.global_status where variable_name='Binlog_group_commits';
select variable_value into @b3 from information_schema.global_status where variable_name='Rocksdb_wal_synced'; select variable_value into @b3 from information_schema.global_status where variable_name='Rocksdb_wal_synced';
--exec $MYSQL_SLAP --silent --concurrency=1 --number-of-queries=1000 --query="INSERT INTO t1 (id, value) VALUES(NULL, 1)" --exec $MYSQL_SLAP --silent --concurrency=1 --number-of-queries=1000 --query="INSERT INTO t1 (id, value) VALUES(NULL, 1)"
select IF(variable_value - @b1 = 1000, 'OK', 'FAIL') as Binlog_commits select IF(variable_value - @b1 = 1000, 'OK', variable_value - @b1 = 1000) as Binlog_commits
from information_schema.global_status where variable_name='Binlog_commits'; from information_schema.global_status where variable_name='Binlog_commits';
select IF(variable_value - @b2 = 1000, 'OK', 'FAIL') as Binlog_group_commits select IF(variable_value - @b2 = 1000, 'OK', variable_value - @b2 = 1000) as Binlog_group_commits
from information_schema.global_status where variable_name='Binlog_group_commits'; from information_schema.global_status where variable_name='Binlog_group_commits';
--echo # Prepare operations sync, commits don't. We expect slightly more than 1K syncs: --echo # Prepare operations sync, commits don't. We expect slightly more than 1K syncs:
select IF(variable_value - @b3 between 1000 and 1500, 'OK', 'FAIL') as Rocksdb_wal_synced select IF(variable_value - @b3 between 1000 and 1500, 'OK', variable_value - @b3 between 1000 and 1500) as Rocksdb_wal_synced
from information_schema.global_status where variable_name='Rocksdb_wal_synced'; from information_schema.global_status where variable_name='Rocksdb_wal_synced';
--echo ## --echo ##
...@@ -48,11 +48,11 @@ select variable_value into @b3 from information_schema.global_status where varia ...@@ -48,11 +48,11 @@ select variable_value into @b3 from information_schema.global_status where varia
--exec $MYSQL_SLAP --silent --concurrency=50 --number-of-queries=10000 --query="INSERT INTO t1 (id, value) VALUES(NULL, 1)" --exec $MYSQL_SLAP --silent --concurrency=50 --number-of-queries=10000 --query="INSERT INTO t1 (id, value) VALUES(NULL, 1)"
select IF(variable_value - @b1 = 10000, 'OK', 'FAIL') as Binlog_commits select IF(variable_value - @b1 = 10000, 'OK', variable_value - @b1 = 10000) as Binlog_commits
from information_schema.global_status where variable_name='Binlog_commits'; from information_schema.global_status where variable_name='Binlog_commits';
select IF(variable_value - @b2 between 100 and 5000, 'OK', 'FAIL') as Binlog_group_commits select IF(variable_value - @b2 between 100 and 5000, 'OK', variable_value - @b2 between 100 and 5000) as Binlog_group_commits
from information_schema.global_status where variable_name='Binlog_group_commits'; from information_schema.global_status where variable_name='Binlog_group_commits';
select IF(variable_value - @b3 between 1 and 9000, 'OK', 'FAIL') select IF(variable_value - @b3 between 1 and 9000, 'OK', variable_value - @b3 between 1 and 9000)
from information_schema.global_status where variable_name='Rocksdb_wal_synced'; from information_schema.global_status where variable_name='Rocksdb_wal_synced';
--echo ## --echo ##
...@@ -66,11 +66,11 @@ select variable_value into @b2 from information_schema.global_status where varia ...@@ -66,11 +66,11 @@ select variable_value into @b2 from information_schema.global_status where varia
select variable_value into @b3 from information_schema.global_status where variable_name='Rocksdb_wal_synced'; select variable_value into @b3 from information_schema.global_status where variable_name='Rocksdb_wal_synced';
--exec $MYSQL_SLAP --silent --concurrency=1 --number-of-queries=1000 --query="INSERT INTO t1 (id, value) VALUES(NULL, 1)" --exec $MYSQL_SLAP --silent --concurrency=1 --number-of-queries=1000 --query="INSERT INTO t1 (id, value) VALUES(NULL, 1)"
select IF(variable_value - @b1 = 1000, 'OK', 'FAIL') as Binlog_commits select IF(variable_value - @b1 = 1000, 'OK', variable_value - @b1 = 1000) as Binlog_commits
from information_schema.global_status where variable_name='Binlog_commits'; from information_schema.global_status where variable_name='Binlog_commits';
select IF(variable_value - @b2 = 1000, 'OK', 'FAIL') as Binlog_group_commits select IF(variable_value - @b2 = 1000, 'OK', variable_value - @b2 = 1000) as Binlog_group_commits
from information_schema.global_status where variable_name='Binlog_group_commits'; from information_schema.global_status where variable_name='Binlog_group_commits';
select IF(variable_value - @b3 < 10, 'OK', 'FAIL') select IF(variable_value - @b3 < 10, 'OK', variable_value - @b3 < 10)
from information_schema.global_status where variable_name='Rocksdb_wal_synced'; from information_schema.global_status where variable_name='Rocksdb_wal_synced';
--echo ## --echo ##
...@@ -83,11 +83,11 @@ select variable_value into @b3 from information_schema.global_status where varia ...@@ -83,11 +83,11 @@ select variable_value into @b3 from information_schema.global_status where varia
--exec $MYSQL_SLAP --silent --concurrency=50 --number-of-queries=10000 --query="INSERT INTO t1 (id, value) VALUES(NULL, 1)" --exec $MYSQL_SLAP --silent --concurrency=50 --number-of-queries=10000 --query="INSERT INTO t1 (id, value) VALUES(NULL, 1)"
select IF(variable_value - @b1 = 10000, 'OK', 'FAIL') as Binlog_commits select IF(variable_value - @b1 = 10000, 'OK', variable_value - @b1 = 10000) as Binlog_commits
from information_schema.global_status where variable_name='Binlog_commits'; from information_schema.global_status where variable_name='Binlog_commits';
select IF(variable_value - @b2 < 8000, 'OK', 'FAIL') as Binlog_group_commits select IF(variable_value - @b2 < 8000, 'OK', variable_value - @b2 < 8000) as Binlog_group_commits
from information_schema.global_status where variable_name='Binlog_group_commits'; from information_schema.global_status where variable_name='Binlog_group_commits';
select IF(variable_value - @b3 < 10, 'OK', 'FAIL') select IF(variable_value - @b3 < 10, 'OK', variable_value - @b3 < 10)
from information_schema.global_status where variable_name='Rocksdb_wal_synced'; from information_schema.global_status where variable_name='Rocksdb_wal_synced';
## ##
......
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