Skip to content

Commit c010f06

Browse files
committed
MariaRocks: Run rocksdb testsuite with @@rocksdb_flush_log_at_trx_commit=0
The default value of 1 causes many tests to time out (primary reason is that many tests populate tables with one-row INSERT statements that run with autocommit=1).
1 parent bf578ff commit c010f06

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

storage/rocksdb/mysql-test/rocksdb/my.cnf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ sql-mode=NO_ENGINE_SUBSTITUTION
99
explicit-defaults-for-timestamp=1
1010
loose-rocksdb_lock_wait_timeout=1
1111
loose-rocksdb_strict_collation_check=0
12+
13+
loose-rocksdb-flush-log-at-trx-commit=0

storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ rocksdb_enable_bulk_load_api ON
910910
rocksdb_enable_thread_tracking OFF
911911
rocksdb_enable_write_thread_adaptive_yield OFF
912912
rocksdb_error_if_exists OFF
913-
rocksdb_flush_log_at_trx_commit 1
913+
rocksdb_flush_log_at_trx_commit 0
914914
rocksdb_flush_memtable_on_analyze ON
915915
rocksdb_force_compute_memtable_stats ON
916916
rocksdb_force_flush_memtable_now OFF

storage/rocksdb/mysql-test/rocksdb/r/write_sync.result

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
SET GLOBAL rocksdb_write_disable_wal=false;
22
SET GLOBAL rocksdb_write_ignore_missing_column_families=true;
33
create table aaa (id int primary key, i int) engine rocksdb;
4+
set @save_rocksdb_flush_log_at_trx_commit= @@global.rocksdb_flush_log_at_trx_commit;
45
SET LOCAL rocksdb_flush_log_at_trx_commit=0;
56
select variable_value into @a from information_schema.global_status where variable_name='rocksdb_wal_synced';
67
insert aaa(id, i) values(1,1);
@@ -33,7 +34,7 @@ SET LOCAL rocksdb_flush_log_at_trx_commit=0;
3334
insert aaa(id, i) values(7,1);
3435
truncate table aaa;
3536
drop table aaa;
36-
SET GLOBAL rocksdb_flush_log_at_trx_commit=1;
37+
SET GLOBAL rocksdb_flush_log_at_trx_commit=@save_rocksdb_flush_log_at_trx_commit;
3738
SET GLOBAL rocksdb_write_disable_wal=false;
3839
SET GLOBAL rocksdb_write_ignore_missing_column_families=false;
3940
SET GLOBAL rocksdb_background_sync=off;

storage/rocksdb/mysql-test/rocksdb/t/write_sync.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SET GLOBAL rocksdb_write_disable_wal=false;
44
SET GLOBAL rocksdb_write_ignore_missing_column_families=true;
55

66
create table aaa (id int primary key, i int) engine rocksdb;
7-
7+
set @save_rocksdb_flush_log_at_trx_commit= @@global.rocksdb_flush_log_at_trx_commit;
88
SET LOCAL rocksdb_flush_log_at_trx_commit=0;
99
--exec sleep 30
1010
select variable_value into @a from information_schema.global_status where variable_name='rocksdb_wal_synced';
@@ -35,7 +35,7 @@ truncate table aaa;
3535

3636
# Cleanup
3737
drop table aaa;
38-
SET GLOBAL rocksdb_flush_log_at_trx_commit=1;
38+
SET GLOBAL rocksdb_flush_log_at_trx_commit=@save_rocksdb_flush_log_at_trx_commit;
3939
SET GLOBAL rocksdb_write_disable_wal=false;
4040
SET GLOBAL rocksdb_write_ignore_missing_column_families=false;
4141
SET GLOBAL rocksdb_background_sync=off;

0 commit comments

Comments
 (0)