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

mdbx: create/refactoring override_meta().

Browse Source
This commit is contained in:
Leonid Yuriev 2021-07-08 23:52:16 +03:00
parent 00c6dc9788
commit 8bdee27248
2 changed files with 82 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
src/core.c
View File

@ -3627,6 +3627,10 @@ static int __must_check_result mdbx_page_split(MDBX_cursor *mc,
static int __must_check_result mdbx_validate_meta_copy(MDBX_env *env, static int __must_check_result mdbx_validate_meta_copy(MDBX_env *env,
const MDBX_meta *meta, const MDBX_meta *meta,
MDBX_meta *dest); MDBX_meta *dest);
static int __must_check_result mdbx_override_meta(MDBX_env *env,
unsigned target,
txnid_t txnid,
const MDBX_meta *shape);
static int __must_check_result mdbx_read_header(MDBX_env *env, MDBX_meta *meta, static int __must_check_result mdbx_read_header(MDBX_env *env, MDBX_meta *meta,
const int lck_exclusive, const int lck_exclusive,
const mdbx_mode_t mode_bits); const mdbx_mode_t mode_bits);
@ -10433,7 +10437,6 @@ __cold static int mdbx_read_header(MDBX_env *env, MDBX_meta *dest,
__cold static MDBX_page *mdbx_meta_model(const MDBX_env *env, MDBX_page *model, __cold static MDBX_page *mdbx_meta_model(const MDBX_env *env, MDBX_page *model,
unsigned num) { unsigned num) {
mdbx_ensure(env, is_powerof2(env->me_psize)); mdbx_ensure(env, is_powerof2(env->me_psize));
mdbx_ensure(env, env->me_psize >= MIN_PAGESIZE); mdbx_ensure(env, env->me_psize >= MIN_PAGESIZE);
mdbx_ensure(env, env->me_psize <= MAX_PAGESIZE); mdbx_ensure(env, env->me_psize <= MAX_PAGESIZE);
@ -10442,7 +10445,7 @@ __cold static MDBX_page *mdbx_meta_model(const MDBX_env *env, MDBX_page *model,
mdbx_ensure(env, env->me_dbgeo.now >= env->me_dbgeo.lower); mdbx_ensure(env, env->me_dbgeo.now >= env->me_dbgeo.lower);
mdbx_ensure(env, env->me_dbgeo.now <= env->me_dbgeo.upper); mdbx_ensure(env, env->me_dbgeo.now <= env->me_dbgeo.upper);
memset(model, 0, sizeof(*model)); memset(model, 0, env->me_psize);
model->mp_pgno = num; model->mp_pgno = num;
model->mp_flags = P_META; model->mp_flags = P_META;
MDBX_meta *const model_meta = page_meta(model); MDBX_meta *const model_meta = page_meta(model);
@ -12170,8 +12173,62 @@ static uint32_t merge_sync_flags(const uint32_t a, const uint32_t b) {
return r; return r;
} }
__cold int mdbx_env_turn_for_recovery(MDBX_env *env, unsigned target_meta) { __cold static int __must_check_result mdbx_override_meta(
if (unlikely(target_meta >= NUM_METAS)) MDBX_env *env, unsigned target, txnid_t txnid, const MDBX_meta *shape) {
MDBX_page *const page = env->me_pbuf;
mdbx_meta_model(env, page, target);
MDBX_meta *const model = page_meta(page);
mdbx_meta_set_txnid(env, model, txnid);
if (shape) {
model->mm_extra_flags = shape->mm_extra_flags;
model->mm_validator_id = shape->mm_validator_id;
model->mm_extra_pagehdr = shape->mm_extra_pagehdr;
memcpy(&model->mm_geo, &shape->mm_geo, sizeof(model->mm_geo));
memcpy(&model->mm_dbs, &shape->mm_dbs, sizeof(model->mm_dbs));
memcpy(&model->mm_canary, &shape->mm_canary, sizeof(model->mm_canary));
memcpy(&model->mm_pages_retired, &shape->mm_pages_retired,
sizeof(model->mm_pages_retired));
}
unaligned_poke_u64(4, model->mm_datasync_sign, mdbx_meta_sign(model));
int rc = mdbx_validate_meta(env, model, page, target, nullptr);
if (unlikely(MDBX_IS_ERROR(rc)))
return MDBX_PROBLEM;
#if MDBX_ENABLE_PGOP_STAT
safe64_inc(&env->me_lck->mti_pgop_stat.wops, 1);
#endif /* MDBX_ENABLE_PGOP_STAT */
if (env->me_flags & MDBX_WRITEMAP) {
rc = mdbx_msync(&env->me_dxb_mmap, 0,
pgno_align2os_bytes(env, model->mm_geo.next),
MDBX_SYNC_DATA | MDBX_SYNC_IODQ);
if (unlikely(rc != MDBX_SUCCESS))
return rc;
MDBX_meta *live = METAPAGE(env, target);
mdbx_meta_update_begin(env, live, unaligned_peek_u64(4, model->mm_txnid_a));
mdbx_flush_incoherent_cpu_writeback();
mdbx_meta_update_begin(env, model,
unaligned_peek_u64(4, model->mm_txnid_a));
unaligned_poke_u64(4, model->mm_datasync_sign, MDBX_DATASIGN_WEAK);
memcpy((void *)data_page(live), page, env->me_psize);
mdbx_meta_update_end(env, live, unaligned_peek_u64(4, model->mm_txnid_b));
mdbx_flush_incoherent_cpu_writeback();
rc = mdbx_msync(&env->me_dxb_mmap, 0, pgno_align2os_bytes(env, target),
MDBX_SYNC_DATA | MDBX_SYNC_IODQ);
} else {
const mdbx_filehandle_t fd = (env->me_dsync_fd != INVALID_HANDLE_VALUE)
? env->me_dsync_fd
: env->me_lazy_fd;
rc = mdbx_pwrite(fd, page, env->me_psize, pgno2bytes(env, target));
if (rc == MDBX_SUCCESS && fd == env->me_lazy_fd)
rc = mdbx_fsync(env->me_lazy_fd, MDBX_SYNC_DATA | MDBX_SYNC_IODQ);
}
mdbx_flush_incoherent_mmap(env->me_map, pgno2bytes(env, NUM_METAS),
env->me_os_psize);
return rc;
}
__cold int mdbx_env_turn_for_recovery(MDBX_env *env, unsigned target) {
if (unlikely(target >= NUM_METAS))
return MDBX_EINVAL; return MDBX_EINVAL;
int rc = check_env(env, true); int rc = check_env(env, true);
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
@ -12181,53 +12238,30 @@ __cold int mdbx_env_turn_for_recovery(MDBX_env *env, unsigned target_meta) {
MDBX_EXCLUSIVE)) MDBX_EXCLUSIVE))
return MDBX_EPERM; return MDBX_EPERM;
MDBX_page *page = const MDBX_meta *target_meta = METAPAGE(env, target);
(env->me_flags & MDBX_WRITEMAP) txnid_t new_txnid =
? pgno2page(env, target_meta) safe64_txnid_next(mdbx_meta_txnid_stable(env, target_meta));
: memcpy(env->me_pbuf, pgno2page(env, target_meta), env->me_psize); for (unsigned n = 0; n < NUM_METAS; ++n) {
page->mp_pgno = target_meta; MDBX_page *page = pgno2page(env, n);
page->mp_flags = P_META; MDBX_meta meta = *page_meta(page);
if (n == target)
MDBX_meta *meta = page_meta(page); continue;
unaligned_poke_u64(4, meta->mm_magic_and_version, MDBX_DATA_MAGIC); if (mdbx_validate_meta(env, &meta, page, n, nullptr) != MDBX_SUCCESS) {
meta->mm_psize = env->me_psize; int err = mdbx_override_meta(env, n, 0, nullptr);
txnid_t txnid = mdbx_meta_txnid_stable(env, meta); if (unlikely(err != MDBX_SUCCESS))
const txnid_t txnid0 = mdbx_meta_txnid_stable(env, METAPAGE(env, 0)); return err;
if (target_meta != 0 && txnid <= txnid0) } else {
txnid = safe64_txnid_next(txnid0); txnid_t txnid = mdbx_meta_txnid_stable(env, &meta);
const txnid_t txnid1 = mdbx_meta_txnid_stable(env, METAPAGE(env, 1)); if (new_txnid <= txnid)
if (target_meta != 1 && txnid <= txnid1) safe64_txnid_next(new_txnid);
txnid = safe64_txnid_next(txnid1);
const txnid_t txnid2 = mdbx_meta_txnid_stable(env, METAPAGE(env, 2));
if (target_meta != 2 && txnid <= txnid2)
txnid = safe64_txnid_next(txnid2);
if (!META_IS_STEADY(meta) || mdbx_recent_committed_txnid(env) != txnid) {
if (unlikely(txnid > MAX_TXNID)) {
mdbx_error("txnid overflow, raise %d", MDBX_TXN_FULL);
return MDBX_TXN_FULL;
} }
mdbx_meta_set_txnid(env, meta, txnid);
unaligned_poke_u64(4, meta->mm_datasync_sign, mdbx_meta_sign(meta));
} }
#if MDBX_ENABLE_PGOP_STAT if (unlikely(new_txnid > MAX_TXNID)) {
safe64_inc(&env->me_lck->mti_pgop_stat.wops, 1); mdbx_error("txnid overflow, raise %d", MDBX_TXN_FULL);
#endif /* MDBX_ENABLE_PGOP_STAT */ return MDBX_TXN_FULL;
if (env->me_flags & MDBX_WRITEMAP) {
mdbx_flush_incoherent_cpu_writeback();
rc = mdbx_msync(&env->me_dxb_mmap, 0, pgno_align2os_bytes(env, target_meta),
MDBX_SYNC_DATA | MDBX_SYNC_IODQ);
} else {
const mdbx_filehandle_t fd = (env->me_dsync_fd != INVALID_HANDLE_VALUE)
? env->me_dsync_fd
: env->me_lazy_fd;
rc = mdbx_pwrite(fd, page, env->me_psize, pgno2bytes(env, target_meta));
if (rc == MDBX_SUCCESS && fd == env->me_lazy_fd)
rc = mdbx_fsync(env->me_lazy_fd, MDBX_SYNC_DATA | MDBX_SYNC_IODQ);
} }
return mdbx_override_meta(env, target, new_txnid, target_meta);
return rc;
} }
__cold int mdbx_env_open_for_recovery(MDBX_env *env, const char *pathname, __cold int mdbx_env_open_for_recovery(MDBX_env *env, const char *pathname,

2
src/mdbx_chk.c
View File

@ -915,7 +915,7 @@ static __inline bool meta_ot(txnid_t txn_a, uint64_t sign_a, txnid_t txn_b,
static __inline bool meta_eq(txnid_t txn_a, uint64_t sign_a, txnid_t txn_b, static __inline bool meta_eq(txnid_t txn_a, uint64_t sign_a, txnid_t txn_b,
uint64_t sign_b) { uint64_t sign_b) {
if (txn_a != txn_b) if (!txn_a || txn_a != txn_b)
return false; return false;
if (SIGN_IS_STEADY(sign_a) != SIGN_IS_STEADY(sign_b)) if (SIGN_IS_STEADY(sign_a) != SIGN_IS_STEADY(sign_b))