ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-10-31 15:38:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: minor refine logging for internal GC-related ops.

Browse Source
This commit is contained in:
Leonid Yuriev
2022-01-05 10:50:39 +03:00
parent d316bde561
commit ab83d173ac
1 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/core.c
View File

@@ -6313,7 +6313,7 @@ __hot static struct page_result mdbx_page_alloc(MDBX_cursor *mc,
ret.page = txn->tw.loose_pages; ret.page = txn->tw.loose_pages;
txn->tw.loose_pages = ret.page->mp_next; txn->tw.loose_pages = ret.page->mp_next;
txn->tw.loose_count--; txn->tw.loose_count--;
mdbx_debug("db %d use loose page %" PRIaPGNO, DDBI(mc), mdbx_debug_extra("db %d use loose page %" PRIaPGNO, DDBI(mc),
ret.page->mp_pgno); ret.page->mp_pgno);
mdbx_tassert(txn, ret.page->mp_pgno < txn->mt_next_pgno); mdbx_tassert(txn, ret.page->mp_pgno < txn->mt_next_pgno);
mdbx_ensure(env, ret.page->mp_pgno >= NUM_METAS); mdbx_ensure(env, ret.page->mp_pgno >= NUM_METAS);
@@ -6508,7 +6508,7 @@ no_loose:
/* Stop reclaiming to avoid overflow the page list. /* Stop reclaiming to avoid overflow the page list.
* This is a rare case while search for a continuously multi-page region * This is a rare case while search for a continuously multi-page region
* in a large database. https://github.com/erthink/libmdbx/issues/123 */ * in a large database. https://github.com/erthink/libmdbx/issues/123 */
mdbx_debug("stop reclaiming to avoid PNL overflow: %u (current) + %u " mdbx_notice("stop reclaiming to avoid PNL overflow: %u (current) + %u "
"(chunk) -> %u", "(chunk) -> %u",
MDBX_PNL_SIZE(txn->tw.reclaimed_pglist), gc_len, MDBX_PNL_SIZE(txn->tw.reclaimed_pglist), gc_len,
gc_len + MDBX_PNL_SIZE(txn->tw.reclaimed_pglist)); gc_len + MDBX_PNL_SIZE(txn->tw.reclaimed_pglist));
@@ -6560,6 +6560,7 @@ no_loose:
/* Done for a kick-reclaim mode, actually no page needed */ /* Done for a kick-reclaim mode, actually no page needed */
if (unlikely(num == 0)) { if (unlikely(num == 0)) {
mdbx_debug("early-return NULL-page for %s mode", "MDBX_ALLOC_SLOT");
mdbx_assert(env, flags & MDBX_ALLOC_SLOT); mdbx_assert(env, flags & MDBX_ALLOC_SLOT);
ret.err = MDBX_SUCCESS; ret.err = MDBX_SUCCESS;
ret.page = NULL; ret.page = NULL;
@@ -6567,14 +6568,20 @@ no_loose:
} }
/* Don't try to coalesce too much. */ /* Don't try to coalesce too much. */
if (flags & MDBX_COALESCE) {
if (re_len /* current size */ > coalesce_threshold || if (re_len /* current size */ > coalesce_threshold ||
(re_len > prev_re_len && re_len - prev_re_len /* delta from prev */ >= (re_len > prev_re_len &&
coalesce_threshold / 2)) re_len - prev_re_len /* delta from prev */ >=
coalesce_threshold / 2)) {
mdbx_trace("clear %s %s", "MDBX_COALESCE", "since got threshold");
flags &= ~MDBX_COALESCE; flags &= ~MDBX_COALESCE;
} }
}
}
if (F_ISSET(flags, MDBX_COALESCE | MDBX_ALLOC_CACHE)) { if (F_ISSET(flags, MDBX_COALESCE | MDBX_ALLOC_CACHE)) {
flags -= MDBX_COALESCE; mdbx_debug_extra("clear %s and continue", "MDBX_COALESCE");
flags &= ~MDBX_COALESCE;
continue; continue;
} }
@@ -6698,6 +6705,12 @@ no_loose:
txn->mt_next_pgno - MDBX_ENABLE_REFUND)); txn->mt_next_pgno - MDBX_ENABLE_REFUND));
if (likely(!(flags & MDBX_ALLOC_SLOT))) if (likely(!(flags & MDBX_ALLOC_SLOT)))
txn->mt_flags |= MDBX_TXN_ERROR; txn->mt_flags |= MDBX_TXN_ERROR;
if (num != 1 || ret.err != MDBX_NOTFOUND)
mdbx_notice("alloc %u pages failed, flags 0x%x, errcode %d", num, flags,
ret.err);
else
mdbx_trace("alloc %u pages failed, flags 0x%x, errcode %d", num, flags,
ret.err);
mdbx_assert(env, ret.err != MDBX_SUCCESS); mdbx_assert(env, ret.err != MDBX_SUCCESS);
ret.page = NULL; ret.page = NULL;
return ret; return ret;
@@ -6706,6 +6719,7 @@ no_loose:
done: done:
ret.page = NULL; ret.page = NULL;
if (unlikely(flags & MDBX_ALLOC_SLOT)) { if (unlikely(flags & MDBX_ALLOC_SLOT)) {
mdbx_debug("return NULL-page for %s mode", "MDBX_ALLOC_SLOT");
ret.err = MDBX_SUCCESS; ret.err = MDBX_SUCCESS;
return ret; return ret;
} }
@@ -9080,7 +9094,6 @@ retry:
reused_gc_slot) * reused_gc_slot) *
env->me_maxgc_ov1page && env->me_maxgc_ov1page &&
!dense_gc) { !dense_gc) {
/* LY: need just a txn-id for save page list. */ /* LY: need just a txn-id for save page list. */
bool need_cleanup = false; bool need_cleanup = false;
txnid_t snap_oldest; txnid_t snap_oldest;
@@ -9159,7 +9172,7 @@ retry:
++gc_rid; ++gc_rid;
rc = mdbx_cursor_get(&couple.outer, &key, &data, MDBX_FIRST); rc = mdbx_cursor_get(&couple.outer, &key, &data, MDBX_FIRST);
if (rc == MDBX_NOTFOUND) { if (rc == MDBX_NOTFOUND) {
mdbx_debug("%s: GC is empty", dbg_prefix_mode); mdbx_debug("%s: GC is empty (going dense-mode)", dbg_prefix_mode);
dense_gc = true; dense_gc = true;
break; break;
} }
@@ -9175,7 +9188,8 @@ retry:
goto bailout; goto bailout;
} }
if (gc_first <= MIN_TXNID) { if (gc_first <= MIN_TXNID) {
mdbx_debug("%s: no free GC's id(s) less than %" PRIaTXN, mdbx_debug("%s: no free GC's id(s) less than %" PRIaTXN
" (going dense-mode)",
dbg_prefix_mode, gc_rid); dbg_prefix_mode, gc_rid);
dense_gc = true; dense_gc = true;
break; break;
@@ -9237,7 +9251,7 @@ retry:
if (gc_rid >= gc_first) if (gc_rid >= gc_first)
gc_rid = gc_first - 1; gc_rid = gc_first - 1;
if (unlikely(gc_rid == 0)) { if (unlikely(gc_rid == 0)) {
mdbx_error("%s", "** no GC tail-space to store"); mdbx_error("%s", "** no GC tail-space to store (going dense-mode)");
dense_gc = true; dense_gc = true;
goto retry; goto retry;
} }