From b1aae2efdd5e7ffea556cdb0bb74514e1ed5f87e Mon Sep 17 00:00:00 2001 From: jsteemann Date: Fri, 12 May 2017 12:12:09 +0200 Subject: [PATCH] remove unused options --- .../Administration/Configuration/RocksDB.md | 18 ------------------ .../MMFiles/MMFilesPersistentIndexFeature.cpp | 3 --- arangod/RocksDBEngine/RocksDBEngine.cpp | 4 ---- .../RocksDBOptionFeature.cpp | 18 ------------------ lib/ApplicationFeatures/RocksDBOptionFeature.h | 3 --- 5 files changed, 46 deletions(-) diff --git a/Documentation/Books/Manual/Administration/Configuration/RocksDB.md b/Documentation/Books/Manual/Administration/Configuration/RocksDB.md index de02c97a8b..a2cd211107 100644 --- a/Documentation/Books/Manual/Administration/Configuration/RocksDB.md +++ b/Documentation/Books/Manual/Administration/Configuration/RocksDB.md @@ -111,28 +111,10 @@ The number of bits used to shard the block cache to allow concurrent operations. To keep individual shards at a reasonable size (i.e. at least 512KB), keep this value to at most `block-cache-shard-bits / 512KB`. Default: 4. -### Logging - -`--rocksdb.max-log-file-size` (Hidden) - -Specify the maximal size of the info log file. When the file size is reached, a -new file will be created. If set to 0, everything will be written to one file. -Default: 0. - -`--rocksdb.keep-log-file-num` (Hidden) - -The maximum number of info log files to be kept. Default: 1000. - `--rocksdb.recycle-log-file-num` (Hidden) Number of log files to keep around for recycling. Default: 0. -`--rocksdb.log-file-time-to-roll` (Hidden) - -Time for the info log file to roll (in seconds). If specified with non-zero -value, log file will be rolled if it has been active longer than -`log_file_time_to_roll`. Set to 0 to disable. Default: 0. - ### Miscellaneous `--rocksdb.verify-checksums-in-compaction` (Hidden) diff --git a/arangod/MMFiles/MMFilesPersistentIndexFeature.cpp b/arangod/MMFiles/MMFilesPersistentIndexFeature.cpp index 45969b5b94..ac7ef6004d 100644 --- a/arangod/MMFiles/MMFilesPersistentIndexFeature.cpp +++ b/arangod/MMFiles/MMFilesPersistentIndexFeature.cpp @@ -124,9 +124,6 @@ void MMFilesPersistentIndexFeature::start() { _options.base_background_compactions = static_cast(opts->_baseBackgroundCompactions); _options.max_background_compactions = static_cast(opts->_maxBackgroundCompactions); - _options.max_log_file_size = static_cast(opts->_maxLogFileSize); - _options.keep_log_file_num = static_cast(opts->_keepLogFileNum); - _options.log_file_time_to_roll = static_cast(opts->_logFileTimeToRoll); _options.compaction_readahead_size = static_cast(opts->_compactionReadaheadSize); if (_options.base_background_compactions > 1 || _options.max_background_compactions > 1) { diff --git a/arangod/RocksDBEngine/RocksDBEngine.cpp b/arangod/RocksDBEngine/RocksDBEngine.cpp index 3f13853fcb..a60167cec8 100644 --- a/arangod/RocksDBEngine/RocksDBEngine.cpp +++ b/arangod/RocksDBEngine/RocksDBEngine.cpp @@ -209,11 +209,7 @@ void RocksDBEngine::start() { _options.max_background_flushes = static_cast(opts->_maxFlushes); _options.use_fsync = opts->_useFSync; - _options.max_log_file_size = static_cast(opts->_maxLogFileSize); - _options.keep_log_file_num = static_cast(opts->_keepLogFileNum); _options.recycle_log_file_num = static_cast(opts->_recycleLogFileNum); - _options.log_file_time_to_roll = - static_cast(opts->_logFileTimeToRoll); _options.compaction_readahead_size = static_cast(opts->_compactionReadaheadSize); diff --git a/lib/ApplicationFeatures/RocksDBOptionFeature.cpp b/lib/ApplicationFeatures/RocksDBOptionFeature.cpp index 0b247d97b0..4c918de2f4 100644 --- a/lib/ApplicationFeatures/RocksDBOptionFeature.cpp +++ b/lib/ApplicationFeatures/RocksDBOptionFeature.cpp @@ -61,10 +61,7 @@ RocksDBOptionFeature::RocksDBOptionFeature( _numThreadsLow(rocksDBDefaults.max_background_compactions), _blockCacheSize(8 * 1024 * 1024), _blockCacheShardBits(4), - _maxLogFileSize(rocksDBDefaults.max_log_file_size), - _keepLogFileNum(rocksDBDefaults.keep_log_file_num), _recycleLogFileNum(rocksDBDefaults.recycle_log_file_num), - _logFileTimeToRoll(rocksDBDefaults.log_file_time_to_roll), _compactionReadaheadSize(rocksDBDefaults.compaction_readahead_size), _verifyChecksumsInCompaction( rocksDBDefaults.verify_checksums_in_compaction), @@ -193,25 +190,10 @@ void RocksDBOptionFeature::collectOptions( "number of shard bits to use for block cache", new UInt64Parameter(&_blockCacheShardBits)); - options->addHiddenOption("--rocksdb.max-log-file-size", - "specify the maximal size of the info log file", - new UInt64Parameter(&_maxLogFileSize)); - - options->addHiddenOption("--rocksdb.keep-log-file-num", - "maximal info log files to be kept", - new UInt64Parameter(&_keepLogFileNum)); - options->addHiddenOption("--rocksdb.recycle-log-file-num", "number of log files to keep around for recycling", new UInt64Parameter(&_recycleLogFileNum)); - options->addHiddenOption( - "--rocksdb.log-file-time-to-roll", - "time for the info log file to roll (in seconds). " - "If specified with non-zero value, log file will be rolled " - "if it has been active longer than `log_file_time_to_roll`", - new UInt64Parameter(&_logFileTimeToRoll)); - options->addHiddenOption( "--rocksdb.compaction-read-ahead-size", "if non-zero, we perform bigger reads when doing compaction. If you're " diff --git a/lib/ApplicationFeatures/RocksDBOptionFeature.h b/lib/ApplicationFeatures/RocksDBOptionFeature.h index 5e7e823508..3ba073be20 100644 --- a/lib/ApplicationFeatures/RocksDBOptionFeature.h +++ b/lib/ApplicationFeatures/RocksDBOptionFeature.h @@ -61,10 +61,7 @@ class RocksDBOptionFeature final uint64_t _numThreadsLow; uint64_t _blockCacheSize; uint64_t _blockCacheShardBits; - uint64_t _maxLogFileSize; - uint64_t _keepLogFileNum; uint64_t _recycleLogFileNum; - uint64_t _logFileTimeToRoll; uint64_t _compactionReadaheadSize; bool _verifyChecksumsInCompaction; bool _optimizeFiltersForHits;