[Commits] fa99dd8: MariaRocks: Run rocksdb testsuite with @@rocksdb_flush_log_at_trx_commit=0

Sergei Petrunia psergey at askmonty.org
Wed Mar 15 22:19:33 EET 2017


revision-id: fa99dd88fba300153bb84092f8896914ed83960b
parent(s): 20c085a4b7a9e5c207db4b622a202d5e4500759f
committer: Sergei Petrunia
branch nick: 10.2-mariarocks
timestamp: 2017-03-15 23:19:33 +0300
message:

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).

---
 storage/rocksdb/mysql-test/rocksdb/my.cnf              | 2 ++
 storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result    | 2 +-
 storage/rocksdb/mysql-test/rocksdb/r/write_sync.result | 3 ++-
 storage/rocksdb/mysql-test/rocksdb/t/write_sync.test   | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/storage/rocksdb/mysql-test/rocksdb/my.cnf b/storage/rocksdb/mysql-test/rocksdb/my.cnf
index c6817df..64420f7 100644
--- a/storage/rocksdb/mysql-test/rocksdb/my.cnf
+++ b/storage/rocksdb/mysql-test/rocksdb/my.cnf
@@ -9,3 +9,5 @@ sql-mode=NO_ENGINE_SUBSTITUTION
 explicit-defaults-for-timestamp=1
 loose-rocksdb_lock_wait_timeout=1
 loose-rocksdb_strict_collation_check=0
+
+loose-rocksdb-flush-log-at-trx-commit=0
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
index aa0bd23..bb02660 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
@@ -910,7 +910,7 @@ rocksdb_enable_bulk_load_api	ON
 rocksdb_enable_thread_tracking	OFF
 rocksdb_enable_write_thread_adaptive_yield	OFF
 rocksdb_error_if_exists	OFF
-rocksdb_flush_log_at_trx_commit	1
+rocksdb_flush_log_at_trx_commit	0
 rocksdb_flush_memtable_on_analyze	ON
 rocksdb_force_compute_memtable_stats	ON
 rocksdb_force_flush_memtable_now	OFF
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/write_sync.result b/storage/rocksdb/mysql-test/rocksdb/r/write_sync.result
index 6ba50a3..8f84953 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/write_sync.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/write_sync.result
@@ -1,6 +1,7 @@
 SET GLOBAL rocksdb_write_disable_wal=false;
 SET GLOBAL rocksdb_write_ignore_missing_column_families=true;
 create table aaa (id int primary key, i int) engine rocksdb;
+set @save_rocksdb_flush_log_at_trx_commit= @@global.rocksdb_flush_log_at_trx_commit;
 SET LOCAL rocksdb_flush_log_at_trx_commit=0;
 select variable_value into @a from information_schema.global_status where variable_name='rocksdb_wal_synced';
 insert aaa(id, i) values(1,1);
@@ -33,7 +34,7 @@ SET LOCAL rocksdb_flush_log_at_trx_commit=0;
 insert aaa(id, i) values(7,1);
 truncate table aaa;
 drop table aaa;
-SET GLOBAL rocksdb_flush_log_at_trx_commit=1;
+SET GLOBAL rocksdb_flush_log_at_trx_commit=@save_rocksdb_flush_log_at_trx_commit;
 SET GLOBAL rocksdb_write_disable_wal=false;
 SET GLOBAL rocksdb_write_ignore_missing_column_families=false;
 SET GLOBAL rocksdb_background_sync=off;
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/write_sync.test b/storage/rocksdb/mysql-test/rocksdb/t/write_sync.test
index 672687b..cd8237d 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/write_sync.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/write_sync.test
@@ -4,7 +4,7 @@ SET GLOBAL rocksdb_write_disable_wal=false;
 SET GLOBAL rocksdb_write_ignore_missing_column_families=true;
 
 create table aaa (id int primary key, i int) engine rocksdb;
-
+set @save_rocksdb_flush_log_at_trx_commit= @@global.rocksdb_flush_log_at_trx_commit;
 SET LOCAL rocksdb_flush_log_at_trx_commit=0;
 --exec sleep 30
 select variable_value into @a from information_schema.global_status where variable_name='rocksdb_wal_synced';
@@ -35,7 +35,7 @@ truncate table aaa;
 
 # Cleanup
 drop table aaa;
-SET GLOBAL rocksdb_flush_log_at_trx_commit=1;
+SET GLOBAL rocksdb_flush_log_at_trx_commit=@save_rocksdb_flush_log_at_trx_commit; 
 SET GLOBAL rocksdb_write_disable_wal=false;
 SET GLOBAL rocksdb_write_ignore_missing_column_families=false;
 SET GLOBAL rocksdb_background_sync=off;


More information about the commits mailing list