ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-04 18:44:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: refine/fix pages reserving inside mdbx_updage_gc() to avoid non-reclamation in a rare cases.

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2022-02-16 12:18:53 +03:00
parent 72bc655ece
commit 3705d705d3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core.c
View File

@ -6763,8 +6763,8 @@ no_loose:
mdbx_error("unable growth datafile to %zu pages (+%zu), errcode %d", mdbx_error("unable growth datafile to %zu pages (+%zu), errcode %d",
aligned, aligned - txn->mt_end_pgno, ret.err); aligned, aligned - txn->mt_end_pgno, ret.err);
} else { } else {
mdbx_debug("gc-alloc: next %zu > upper %" PRIaPGNO, next, mdbx_notice("gc-alloc: next %zu > upper %" PRIaPGNO, next,
txn->mt_geo.upper); txn->mt_geo.upper);
} }
} }
@ -8787,7 +8787,7 @@ static int mdbx_prep_backlog(MDBX_txn *txn, MDBX_cursor *gc_cursor,
MDBX_val gc_key, fake_val; MDBX_val gc_key, fake_val;
int err; int err;
if (linear4list < 2) { if (unlikely(linear4list > 2)) {
gc_key.iov_base = fake_val.iov_base = nullptr; gc_key.iov_base = fake_val.iov_base = nullptr;
gc_key.iov_len = sizeof(txnid_t); gc_key.iov_len = sizeof(txnid_t);
fake_val.iov_len = pnl_bytes; fake_val.iov_len = pnl_bytes;
@ -8800,7 +8800,7 @@ static int mdbx_prep_backlog(MDBX_txn *txn, MDBX_cursor *gc_cursor,
err = mdbx_cursor_touch(gc_cursor); err = mdbx_cursor_touch(gc_cursor);
mdbx_trace("== after-touch, backlog %u, err %d", backlog_size(txn), err); mdbx_trace("== after-touch, backlog %u, err %d", backlog_size(txn), err);
if (linear4list > 1 && err == MDBX_SUCCESS) { if (unlikely(linear4list > 1) && err == MDBX_SUCCESS) {
if (retired_stored) { if (retired_stored) {
gc_key.iov_base = &txn->mt_txnid; gc_key.iov_base = &txn->mt_txnid;
gc_key.iov_len = sizeof(txn->mt_txnid); gc_key.iov_len = sizeof(txn->mt_txnid);
@ -8975,7 +8975,7 @@ retry:
} }
if (cleaned_gc_id > txn->tw.last_reclaimed) if (cleaned_gc_id > txn->tw.last_reclaimed)
break; break;
if (likely(!dense_gc) && cleaned_gc_id < txn->tw.last_reclaimed) { if (likely(!dense_gc)) {
rc = mdbx_prep_backlog(txn, &couple.outer, 0, nullptr); rc = mdbx_prep_backlog(txn, &couple.outer, 0, nullptr);
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
goto bailout; goto bailout;