revision-id: ce4149fc9b5eda464919cefb6ea22d02879a6882 parent(s): 0fad97a9ecbcb6a68ae396ea6f7a1dd4d933279c committer: Sergei Petrunia branch nick: 10.2-r10 timestamp: 2018-04-15 21:15:21 +0300 message: Post-merge fixes: make rocksdb.use_direct_reads_writes pass --- .../rocksdb/r/use_direct_reads_writes.result | 35 ++++++---------------- .../rocksdb/t/use_direct_reads_writes.test | 1 - 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads_writes.result b/storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads_writes.result index f601f75..e845645 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads_writes.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads_writes.result @@ -1,35 +1,18 @@ +call mtr.add_suppression("rocksdb"); +call mtr.add_suppression("Aborting"); +# This shows that RocksDB plugin is loaded: +select plugin_name, plugin_type from information_schema.plugins where plugin_name='RocksDB'; +plugin_name plugin_type +ROCKSDB STORAGE ENGINE Checking direct reads +FOUND 1 /enable both use_direct_reads/ in use_direct_reads_writes.err Checking direct writes +FOUND 1 /enable both use_direct_io_for_flush_and_compaction/ in use_direct_reads_writes.err Checking rocksdb_flush_log_at_trx_commit +FOUND 1 /rocksdb_flush_log_at_trx_commit needs to be/ in use_direct_reads_writes.err Validate flush_log settings when direct writes is enabled set global rocksdb_flush_log_at_trx_commit=0; set global rocksdb_flush_log_at_trx_commit=1; ERROR 42000: Variable 'rocksdb_flush_log_at_trx_commit' can't be set to the value of '1' set global rocksdb_flush_log_at_trx_commit=2; ERROR 42000: Variable 'rocksdb_flush_log_at_trx_commit' can't be set to the value of '2' -call mtr.add_suppression("rocksdb"); -call mtr.add_suppression("Aborting"); -# This shows that RocksDB plugin is loaded: -select plugin_name, plugin_type from information_schema.plugins where plugin_name='RocksDB'; -plugin_name plugin_type -ROCKSDB STORAGE ENGINE -# Check that ROCKSDB plugin is not loaded: -select plugin_name, plugin_type from information_schema.plugins where plugin_name='RocksDB'; -plugin_name plugin_type -# Check that MyRocks has printed an error message into server error log: -FOUND 1 /enable both use_direct_reads/ in mysqld.1.err -# Now, restart the server back with regular settings -select plugin_name, plugin_type from information_schema.plugins where plugin_name='RocksDB'; -plugin_name plugin_type -ROCKSDB STORAGE ENGINE -# -# Now, repeat the same with another set of invalid arguments -# -# Check that ROCKSDB plugin is not loaded: -select plugin_name, plugin_type from information_schema.plugins where plugin_name='RocksDB'; -plugin_name plugin_type -FOUND 1 /enable both use_direct_io_for_flush_and_compaction/ in mysqld.1.err -# Now, restart the server back with regular settings -select plugin_name, plugin_type from information_schema.plugins where plugin_name='RocksDB'; -plugin_name plugin_type -ROCKSDB STORAGE ENGINE diff --git a/storage/rocksdb/mysql-test/rocksdb/t/use_direct_reads_writes.test b/storage/rocksdb/mysql-test/rocksdb/t/use_direct_reads_writes.test index 550cbd2..8dfbe31 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/use_direct_reads_writes.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/use_direct_reads_writes.test @@ -34,7 +34,6 @@ select plugin_name, plugin_type from information_schema.plugins where plugin_nam --source include/search_pattern_in_file.inc --remove_file $LOG -select plugin_name, plugin_type from information_schema.plugins where plugin_name='RocksDB'; # Verify invalid direct-writes and --rocksdb_flush_log_at_trx_commit combination at startup fails --echo Checking rocksdb_flush_log_at_trx_commit