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

mdbx: ensure to sync meta-mages in env_sync_ex().

Browse Source 
Change-Id: I540c8353d47acc2e46d6c3a26cfe3e4f6d9249bf
This commit is contained in:
Leonid Yuriev 2019-09-16 21:53:08 +03:00
parent 78da9e52c4
commit e03addc8f9
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/elements/core.c
View File

@ -3184,6 +3184,7 @@ __cold static int mdbx_env_sync_ex(MDBX_env *env, int force, int nonblock) {
return rc; return rc;
} }
unsigned need_metasync = env->me_flags & MDBX_NOMETASYNC;
const MDBX_meta *head = mdbx_meta_head(env); const MDBX_meta *head = mdbx_meta_head(env);
pgno_t unsynced_pages = *env->me_unsynced_pages; pgno_t unsynced_pages = *env->me_unsynced_pages;
if (!META_IS_STEADY(head) || unsynced_pages) { if (!META_IS_STEADY(head) || unsynced_pages) {
@ -3205,6 +3206,7 @@ __cold static int mdbx_env_sync_ex(MDBX_env *env, int force, int nonblock) {
int rc = (flags & MDBX_WRITEMAP) int rc = (flags & MDBX_WRITEMAP)
? mdbx_msync(&env->me_dxb_mmap, 0, usedbytes, false) ? mdbx_msync(&env->me_dxb_mmap, 0, usedbytes, false)
: mdbx_filesync(env->me_fd, MDBX_SYNC_DATA); : mdbx_filesync(env->me_fd, MDBX_SYNC_DATA);
need_metasync = 0;
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
return rc; return rc;
@ -3227,6 +3229,7 @@ __cold static int mdbx_env_sync_ex(MDBX_env *env, int force, int nonblock) {
mdbx_durable_str(head), unsynced_pages); mdbx_durable_str(head), unsynced_pages);
MDBX_meta meta = *head; MDBX_meta meta = *head;
int rc = mdbx_sync_locked(env, flags | MDBX_SHRINK_ALLOWED, &meta); int rc = mdbx_sync_locked(env, flags | MDBX_SHRINK_ALLOWED, &meta);
need_metasync = 0;
if (unlikely(rc != MDBX_SUCCESS)) { if (unlikely(rc != MDBX_SUCCESS)) {
if (outside_txn) if (outside_txn)
mdbx_txn_unlock(env); mdbx_txn_unlock(env);
@ -3235,9 +3238,17 @@ __cold static int mdbx_env_sync_ex(MDBX_env *env, int force, int nonblock) {
} }
} }
int rc = MDBX_SUCCESS;
/* LY: sync meta-pages if MDBX_NOMETASYNC enabled
* and someone was not synced above. */
if (need_metasync && force)
rc = (flags & MDBX_WRITEMAP)
? mdbx_msync(&env->me_dxb_mmap, 0, pgno2bytes(env, NUM_METAS),
false)
: mdbx_filesync(env->me_fd, MDBX_SYNC_DATA | MDBX_SYNC_IODQ);
if (outside_txn) if (outside_txn)
mdbx_txn_unlock(env); mdbx_txn_unlock(env);
return MDBX_SUCCESS; return rc;
} }
__cold int mdbx_env_sync(MDBX_env *env, int force) { __cold int mdbx_env_sync(MDBX_env *env, int force) {