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

lmdb: forces a steady checkpoint if OOM occurred

Browse Source 
because of reclaiming stops on a weak ones.

This is 6/9 for https://github.com/ReOpen/ReOpenLDAP/issues/1
and https://github.com/ReOpen/ReOpenLDAP/issues/2

Change-Id: I91d8a3dfaf06e1917326d8f73c4a65565cde0b47
This commit is contained in:
Leo Yuriev 2015-05-15 00:56:27 +03:00
parent 312135169f
commit 633f2a10ad
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mdb.c
View File

@ -1937,12 +1937,22 @@ mdb_find_oldest(MDB_env *env, int *laggard)
} }
static int static int
mdb_oomkick_laggard(MDB_env *env) mdb_oomkick(MDB_env *env)
{ {
int reader, retry; int reader, retry;
txnid_t snap, oldest = mdb_find_oldest(env, &reader); txnid_t snap, oldest = mdb_find_oldest(env, &reader);
if (reader < 0) MDB_meta* head = mdb_env_meta_head(env);
return 0; MDB_meta* tail = mdb_env_meta_flipflop(env, head);
if (META_IS_WEAK(head) && oldest == tail->mm_txnid) {
MDB_meta meta = *head;
mdb_assert(env, env->me_sync_pending > 0);
if (mdb_env_sync0(env, env->me_flags & MDB_WRITEMAP, &meta) == MDB_SUCCESS) {
snap = mdb_find_oldest(env, &reader);
if (oldest < snap)
return 1;
}
}
for(retry = 0; ; ++retry) { for(retry = 0; ; ++retry) {
MDB_reader *r; MDB_reader *r;
@ -1950,10 +1960,13 @@ mdb_oomkick_laggard(MDB_env *env)
pid_t pid; pid_t pid;
int rc; int rc;
if (reader < 0)
return 0;
if (mdb_reader_check(env, NULL)) if (mdb_reader_check(env, NULL))
break; break;
snap = mdb_find_oldest(env, NULL); snap = mdb_find_oldest(env, &reader);
if (oldest < snap) if (oldest < snap)
return 1; return 1;
@ -2249,7 +2262,7 @@ oomkick_retry:;
pgno = txn->mt_next_pgno; pgno = txn->mt_next_pgno;
if (pgno + num > env->me_maxpg) { if (pgno + num > env->me_maxpg) {
mdb_debug("DB size maxed out"); mdb_debug("DB size maxed out");
if ((mc->mc_flags & C_RECLAIMING) == 0 && mdb_oomkick_laggard(env)) if ((mc->mc_flags & C_RECLAIMING) == 0 && mdb_oomkick(env))
goto oomkick_retry; goto oomkick_retry;
rc = MDB_MAP_FULL; rc = MDB_MAP_FULL;
goto fail; goto fail;