Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

issue #9654: make `--rocksdb.max-write-buffer-number` work (#9750) 

* issue #9654: make `--rocksdb.max-write-buffer-number` work

* fix the logic
This commit is contained in:
Jan 2019-08-19 15:42:08 +02:00 committed by Matthew Von-Maszewski
parent a54e1fc427
commit 346edaec3a
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arangod/RocksDBEngine/RocksDBEngine.cpp
View File

@ -581,9 +581,18 @@ void RocksDBEngine::start() {
_options.db_write_buffer_size = opts->_totalWriteBufferSize;
}
// this is cfFamilies.size() + 2 ... but _option needs to be set before
// building cfFamilies
_options.max_write_buffer_number = 7 + 2;
if (!application_features::ApplicationServer::server->options()->processingResult().touched("rocksdb.max-write-buffer-number")) {
// user hasn't explicitly set the number of write buffers, so we use a default value based
// on the number of column families
// this is cfFamilies.size() + 2 ... but _option needs to be set before
// building cfFamilies
// Update max_write_buffer_number above if you change number of families used
_options.max_write_buffer_number = 7 + 2;
} else if (_options.max_write_buffer_number < 7 + 2) {
// user set the value explicitly, and it is lower than recommended
_options.max_write_buffer_number = 7 + 2;
LOG_TOPIC("d5c49", WARN, Logger::ENGINES) << "ignoring value for option `--rocksdb.max-write-buffer-number` because it is lower than recommended";
}
// cf options for definitons (dbs, collections, views, ...)
rocksdb::ColumnFamilyOptions definitionsCF(_options);
@ -622,8 +631,8 @@ void RocksDBEngine::start() {
cfFamilies.emplace_back("GeoIndex", fixedPrefCF); // 5
cfFamilies.emplace_back("FulltextIndex", fixedPrefCF); // 6
// DO NOT FORGET TO DESTROY THE CFs ON CLOSE
// Update max_write_buffer_number above if you change number of families used
TRI_ASSERT(static_cast<int>(_options.max_write_buffer_number) >= static_cast<int>(cfFamilies.size()));
// Update max_write_buffer_number above if you change number of families used
std::vector<rocksdb::ColumnFamilyHandle*> cfHandles;
size_t const numberOfColumnFamilies = RocksDBColumnFamily::minNumberOfColumnFamilies;

2
lib/ApplicationFeatures/RocksDBOptionFeature.cpp
View File

@ -57,7 +57,7 @@ RocksDBOptionFeature::RocksDBOptionFeature(application_features::ApplicationServ
_transactionLockTimeout(rocksDBTrxDefaults.transaction_lock_timeout),
_totalWriteBufferSize(rocksDBDefaults.db_write_buffer_size),
_writeBufferSize(rocksDBDefaults.write_buffer_size),
_maxWriteBufferNumber(rocksDBDefaults.max_write_buffer_number),
_maxWriteBufferNumber(7 + 2), // number of column families plus 2
_maxTotalWalSize(80 << 20),
_delayedWriteRate(rocksDBDefaults.delayed_write_rate),
_minWriteBufferNumberToMerge(rocksDBDefaults.min_write_buffer_number_to_merge),

1
lib/ApplicationFeatures/RocksDBOptionFeature.h
View File

@ -58,6 +58,7 @@ class RocksDBOptionFeature final : public application_features::ApplicationFeatu
std::string _walDirectory;
uint64_t _totalWriteBufferSize;
uint64_t _writeBufferSize;
// Update max_write_buffer_number above if you change number of families used
uint64_t _maxWriteBufferNumber;
uint64_t _maxTotalWalSize;
uint64_t _delayedWriteRate;