rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-30 14:53:27 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #664

Browse Source 
d8f9bb3 Keep a running blocksize count (Howard Chu)
bf22109 Win32 import batchsize tweaks (Howard Chu)
This commit is contained in:
Riccardo Spagni 2016-02-17 17:08:36 +02:00
commit a7fdfa4169
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/blockchain_db/lmdb/db_lmdb.cpp
View File

@ -428,7 +428,7 @@ void BlockchainLMDB::check_and_resize_for_batch(uint64_t batch_num_blocks)
{ {
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
LOG_PRINT_L1("[" << __func__ << "] " << "checking DB size"); LOG_PRINT_L1("[" << __func__ << "] " << "checking DB size");
const uint64_t min_increase_size = 128 * (1 << 20); const uint64_t min_increase_size = 512 * (1 << 20);
uint64_t threshold_size = 0; uint64_t threshold_size = 0;
uint64_t increase_size = 0; uint64_t increase_size = 0;
if (batch_num_blocks > 0) if (batch_num_blocks > 0)
@ -464,6 +464,7 @@ uint64_t BlockchainLMDB::get_estimated_batch_size(uint64_t batch_num_blocks) con
// batch size estimate * batch safety factor = final size estimate // batch size estimate * batch safety factor = final size estimate
// Takes into account "reasonable" block size increases in batch. // Takes into account "reasonable" block size increases in batch.
float batch_safety_factor = 1.7f; float batch_safety_factor = 1.7f;
float batch_fudge_factor = batch_safety_factor * batch_num_blocks;
// estimate of stored block expanded from raw block, including denormalization and db overhead. // estimate of stored block expanded from raw block, including denormalization and db overhead.
// Note that this probably doesn't grow linearly with block size. // Note that this probably doesn't grow linearly with block size.
float db_expand_factor = 4.5f; float db_expand_factor = 4.5f;
@ -485,6 +486,13 @@ uint64_t BlockchainLMDB::get_estimated_batch_size(uint64_t batch_num_blocks) con
{ {
LOG_PRINT_L1("No existing blocks to check for average block size"); LOG_PRINT_L1("No existing blocks to check for average block size");
} }
else if (m_cum_count)
{
avg_block_size = m_cum_size / m_cum_count;
LOG_PRINT_L1("average block size across recent " << m_cum_count << " blocks: " << avg_block_size);
m_cum_size = 0;
m_cum_count = 0;
}
else else
{ {
for (uint64_t block_num = block_start; block_num <= block_stop; ++block_num) for (uint64_t block_num = block_start; block_num <= block_stop; ++block_num)
@ -502,8 +510,10 @@ uint64_t BlockchainLMDB::get_estimated_batch_size(uint64_t batch_num_blocks) con
avg_block_size = min_block_size; avg_block_size = min_block_size;
LOG_PRINT_L1("estimated average block size for batch: " << avg_block_size); LOG_PRINT_L1("estimated average block size for batch: " << avg_block_size);
threshold_size = avg_block_size * db_expand_factor * batch_num_blocks; // bigger safety margin on smaller block sizes
threshold_size = threshold_size * batch_safety_factor; if (batch_fudge_factor < 5000.0)
batch_fudge_factor = 5000.0;
threshold_size = avg_block_size * db_expand_factor * batch_fudge_factor;
return threshold_size; return threshold_size;
} }
@ -570,6 +580,8 @@ void BlockchainLMDB::add_block(const block& blk, const size_t& block_size, const
if (result) if (result)
throw0(DB_ERROR(std::string("Failed to add block hash to db transaction: ").append(mdb_strerror(result)).c_str())); throw0(DB_ERROR(std::string("Failed to add block hash to db transaction: ").append(mdb_strerror(result)).c_str()));
m_cum_size += block_size;
m_cum_count++;
} }
void BlockchainLMDB::remove_block() void BlockchainLMDB::remove_block()
@ -945,6 +957,8 @@ BlockchainLMDB::BlockchainLMDB(bool batch_transactions)
m_write_batch_txn = nullptr; m_write_batch_txn = nullptr;
m_batch_active = false; m_batch_active = false;
m_height = 0; m_height = 0;
m_cum_size = 0;
m_cum_count = 0;
m_hardfork = nullptr; m_hardfork = nullptr;
} }
@ -1208,6 +1222,8 @@ void BlockchainLMDB::reset()
txn.commit(); txn.commit();
m_height = 0; m_height = 0;
m_num_outputs = 0; m_num_outputs = 0;
m_cum_size = 0;
m_cum_count = 0;
} }
std::vector<std::string> BlockchainLMDB::get_filenames() const std::vector<std::string> BlockchainLMDB::get_filenames() const

2
src/blockchain_db/lmdb/db_lmdb.h
View File

@ -306,6 +306,8 @@ private:
uint64_t m_height; uint64_t m_height;
uint64_t m_num_outputs; uint64_t m_num_outputs;
mutable uint64_t m_cum_size; // used in batch size estimation
mutable int m_cum_count;
std::string m_folder; std::string m_folder;
mdb_txn_safe* m_write_txn; // may point to either a short-lived txn or a batch txn mdb_txn_safe* m_write_txn; // may point to either a short-lived txn or a batch txn
mdb_txn_safe* m_write_batch_txn; // persist batch txn outside of BlockchainLMDB mdb_txn_safe* m_write_batch_txn; // persist batch txn outside of BlockchainLMDB