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

mdbx: fix mdbx_override_meta() to avoid false-positive assertions.

Browse Source 
Fixed https://github.com/erthink/libmdbx/issues/253.
This commit is contained in:
Leonid Yuriev
2021-12-13 13:03:49 +03:00
parent 29eb4c2bed
commit c70d2d62d1
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core.c
View File

@@ -12319,16 +12319,12 @@ __cold static int __must_check_result mdbx_override_meta(
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_override_meta() called only while current process have exclusive
* lock of a DB file. So meta-page could be updated directly without
* clearing consistency flag by mdbx_meta_update_begin() */
memcpy(pgno2page(env, target), page, env->me_psize);
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),
rc = mdbx_msync(&env->me_dxb_mmap, 0, pgno_align2os_bytes(env, target + 1),
MDBX_SYNC_DATA | MDBX_SYNC_IODQ);
} else {
const mdbx_filehandle_t fd = (env->me_dsync_fd != INVALID_HANDLE_VALUE)