Skip to content

Commit

Permalink
Move myrocks settings to my.cnf
Browse files Browse the repository at this point in the history
Summary:
This enables running myrocks test byitself without relying on any magic from mysqltest.sh, making it easier for external folks to run it. It also enables running myrocks + innodb tests together, useful for cases like code coverage runs, etc.

The idea is to move those settings into my.cnf in myrocks suites and put it in a common file default_rocksdb.cnf.

Reviewed By: satya-valluri

Differential Revision: D29350639

fbshipit-source-id: 08fa380d179
  • Loading branch information
yizhang82 authored and facebook-github-bot committed Jun 25, 2021
1 parent d054548 commit d7fe2e2
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
4 changes: 4 additions & 0 deletions mysql-test/include/default_rocksdb.cnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[server]
default_storage_engine=rocksdb
default_tmp_storage_engine=MyISAM
ssl=0
2 changes: 1 addition & 1 deletion mysql-test/suite/rocksdb/my.cnf
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
!include include/default_my.cnf
!include include/default_rocksdb.cnf

[server]
# Align with 5.6 default character-set latin1
Expand All @@ -11,4 +12,3 @@ explicit-defaults-for-timestamp=1
rocksdb_lock_wait_timeout=1
rocksdb_strict_collation_check=0
rocksdb_force_compute_memtable_stats_cachetime=0
default-storage-engine=rocksdb
8 changes: 1 addition & 7 deletions mysql-test/suite/rocksdb_hotbackup/base.cnf
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
# Use default setting for mysqld processes
!include include/default_mysqld.cnf
!include include/default_client.cnf
!include include/default_myrocks.cnf

[mysqld.1]
rocksdb
default-storage-engine=rocksdb
skip-innodb
default-tmp-storage-engine=MyISAM
binlog_format=row

[mysqld.2]
rocksdb
default-storage-engine=rocksdb
skip-innodb
default-tmp-storage-engine=MyISAM
binlog_format=row

[ENV]
Expand Down
1 change: 1 addition & 0 deletions mysql-test/suite/rocksdb_rpl/my.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# add setting to connect the slave to the master by default
!include rpl_1slave_base.cnf
!include include/default_client.cnf
!include include/default_rocksdb.cnf

[mysqld.2]

2 changes: 1 addition & 1 deletion mysql-test/suite/rocksdb_sys_vars/my.cnf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
!include include/default_my.cnf
!include include/default_rocksdb.cnf

[server]
rocksdb_force_compute_memtable_stats_cachetime=0
default-storage-engine=rocksdb

0 comments on commit d7fe2e2

Please sign in to comment.