mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-12-22 22:58:52 +00:00
Merge pull request #5647
2ff99fb
db_lmdb: commit pruning txn at checkpoints (moneromooo-monero)
This commit is contained in:
commit
591c72613b
@ -1953,7 +1953,7 @@ bool BlockchainLMDB::prune_worker(int mode, uint32_t pruning_seed)
|
|||||||
|
|
||||||
TIME_MEASURE_START(t);
|
TIME_MEASURE_START(t);
|
||||||
|
|
||||||
size_t n_total_records = 0, n_prunable_records = 0, n_pruned_records = 0;
|
size_t n_total_records = 0, n_prunable_records = 0, n_pruned_records = 0, commit_counter = 0;
|
||||||
uint64_t n_bytes = 0;
|
uint64_t n_bytes = 0;
|
||||||
|
|
||||||
mdb_txn_safe txn;
|
mdb_txn_safe txn;
|
||||||
@ -2056,6 +2056,7 @@ bool BlockchainLMDB::prune_worker(int mode, uint32_t pruning_seed)
|
|||||||
{
|
{
|
||||||
MDEBUG("Pruning at height " << block_height << "/" << blockchain_height);
|
MDEBUG("Pruning at height " << block_height << "/" << blockchain_height);
|
||||||
++n_pruned_records;
|
++n_pruned_records;
|
||||||
|
++commit_counter;
|
||||||
n_bytes += k.mv_size + v.mv_size;
|
n_bytes += k.mv_size + v.mv_size;
|
||||||
result = mdb_cursor_del(c_txs_prunable, 0);
|
result = mdb_cursor_del(c_txs_prunable, 0);
|
||||||
if (result)
|
if (result)
|
||||||
@ -2065,6 +2066,25 @@ bool BlockchainLMDB::prune_worker(int mode, uint32_t pruning_seed)
|
|||||||
result = mdb_cursor_del(c_txs_prunable_tip, 0);
|
result = mdb_cursor_del(c_txs_prunable_tip, 0);
|
||||||
if (result)
|
if (result)
|
||||||
throw0(DB_ERROR(lmdb_error("Failed to delete transaction tip data: ", result).c_str()));
|
throw0(DB_ERROR(lmdb_error("Failed to delete transaction tip data: ", result).c_str()));
|
||||||
|
|
||||||
|
if (mode != prune_mode_check && commit_counter >= 4096)
|
||||||
|
{
|
||||||
|
MDEBUG("Committing txn at checkpoint...");
|
||||||
|
txn.commit();
|
||||||
|
result = mdb_txn_begin(m_env, NULL, 0, txn);
|
||||||
|
if (result)
|
||||||
|
throw0(DB_ERROR(lmdb_error("Failed to create a transaction for the db: ", result).c_str()));
|
||||||
|
result = mdb_cursor_open(txn, m_txs_pruned, &c_txs_pruned);
|
||||||
|
if (result)
|
||||||
|
throw0(DB_ERROR(lmdb_error("Failed to open a cursor for txs_pruned: ", result).c_str()));
|
||||||
|
result = mdb_cursor_open(txn, m_txs_prunable, &c_txs_prunable);
|
||||||
|
if (result)
|
||||||
|
throw0(DB_ERROR(lmdb_error("Failed to open a cursor for txs_prunable: ", result).c_str()));
|
||||||
|
result = mdb_cursor_open(txn, m_txs_prunable_tip, &c_txs_prunable_tip);
|
||||||
|
if (result)
|
||||||
|
throw0(DB_ERROR(lmdb_error("Failed to open a cursor for txs_prunable_tip: ", result).c_str()));
|
||||||
|
commit_counter = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2134,6 +2154,7 @@ bool BlockchainLMDB::prune_worker(int mode, uint32_t pruning_seed)
|
|||||||
result = mdb_cursor_del(c_txs_prunable, 0);
|
result = mdb_cursor_del(c_txs_prunable, 0);
|
||||||
if (result)
|
if (result)
|
||||||
throw0(DB_ERROR(lmdb_error("Failed to delete transaction prunable data: ", result).c_str()));
|
throw0(DB_ERROR(lmdb_error("Failed to delete transaction prunable data: ", result).c_str()));
|
||||||
|
++commit_counter;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2150,6 +2171,34 @@ bool BlockchainLMDB::prune_worker(int mode, uint32_t pruning_seed)
|
|||||||
", seed " << epee::string_tools::to_string_hex(pruning_seed));
|
", seed " << epee::string_tools::to_string_hex(pruning_seed));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (mode != prune_mode_check && commit_counter >= 4096)
|
||||||
|
{
|
||||||
|
MDEBUG("Committing txn at checkpoint...");
|
||||||
|
txn.commit();
|
||||||
|
result = mdb_txn_begin(m_env, NULL, 0, txn);
|
||||||
|
if (result)
|
||||||
|
throw0(DB_ERROR(lmdb_error("Failed to create a transaction for the db: ", result).c_str()));
|
||||||
|
result = mdb_cursor_open(txn, m_txs_pruned, &c_txs_pruned);
|
||||||
|
if (result)
|
||||||
|
throw0(DB_ERROR(lmdb_error("Failed to open a cursor for txs_pruned: ", result).c_str()));
|
||||||
|
result = mdb_cursor_open(txn, m_txs_prunable, &c_txs_prunable);
|
||||||
|
if (result)
|
||||||
|
throw0(DB_ERROR(lmdb_error("Failed to open a cursor for txs_prunable: ", result).c_str()));
|
||||||
|
result = mdb_cursor_open(txn, m_txs_prunable_tip, &c_txs_prunable_tip);
|
||||||
|
if (result)
|
||||||
|
throw0(DB_ERROR(lmdb_error("Failed to open a cursor for txs_prunable_tip: ", result).c_str()));
|
||||||
|
result = mdb_cursor_open(txn, m_tx_indices, &c_tx_indices);
|
||||||
|
if (result)
|
||||||
|
throw0(DB_ERROR(lmdb_error("Failed to open a cursor for tx_indices: ", result).c_str()));
|
||||||
|
MDB_val val;
|
||||||
|
val.mv_size = sizeof(ti);
|
||||||
|
val.mv_data = (void *)&ti;
|
||||||
|
result = mdb_cursor_get(c_tx_indices, (MDB_val*)&zerokval, &val, MDB_GET_BOTH);
|
||||||
|
if (result)
|
||||||
|
throw0(DB_ERROR(lmdb_error("Failed to restore cursor for tx_indices: ", result).c_str()));
|
||||||
|
commit_counter = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
mdb_cursor_close(c_tx_indices);
|
mdb_cursor_close(c_tx_indices);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user