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

mdbx: fix MDBX_RESULT_TRUE handling inside mdbx_mutex_failed()...mdbx_oomkick().

Browse Source
This commit is contained in:
Leo Yuriev 2017-06-14 23:34:11 +03:00
parent 71e2fe3df0
commit ddc3787936
2 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lck-posix.c
View File

@ -295,6 +295,8 @@ static int __cold mdbx_mutex_failed(MDBX_env *env, pthread_mutex_t *mutex,
(rc ? "this process' env is hosed" : "recovering")); (rc ? "this process' env is hosed" : "recovering"));
int check_rc = mdbx_reader_check0(env, rlocked, NULL); int check_rc = mdbx_reader_check0(env, rlocked, NULL);
check_rc = (check_rc == MDBX_SUCCESS) ? MDBX_RESULT_TRUE : check_rc;
int mreco_rc = pthread_mutex_consistent(mutex); int mreco_rc = pthread_mutex_consistent(mutex);
check_rc = (mreco_rc == 0) ? check_rc : mreco_rc; check_rc = (mreco_rc == 0) ? check_rc : mreco_rc;

47
src/mdbx.c
View File

@ -9780,6 +9780,10 @@ int __cold mdbx_reader_check(MDBX_env *env, int *dead) {
return mdbx_reader_check0(env, 0, dead); return mdbx_reader_check0(env, 0, dead);
} }
/* Return:
* MDBX_RESULT_TRUE - done and mutex recovered
* MDBX_SUCCESS - done
* Otherwise errcode. */
int __cold mdbx_reader_check0(MDBX_env *env, int rdt_locked, int *dead) { int __cold mdbx_reader_check0(MDBX_env *env, int rdt_locked, int *dead) {
assert(rdt_locked >= 0); assert(rdt_locked >= 0);
@ -9792,7 +9796,7 @@ int __cold mdbx_reader_check0(MDBX_env *env, int rdt_locked, int *dead) {
mdbx_pid_t *pids = alloca((snap_nreaders + 1) * sizeof(mdbx_pid_t)); mdbx_pid_t *pids = alloca((snap_nreaders + 1) * sizeof(mdbx_pid_t));
pids[0] = 0; pids[0] = 0;
int rc = MDBX_RESULT_FALSE, count = 0; int rc = MDBX_SUCCESS, count = 0;
MDBX_reader *mr = env->me_lck->mti_readers; MDBX_reader *mr = env->me_lck->mti_readers;
for (unsigned i = 0; i < snap_nreaders; i++) { for (unsigned i = 0; i < snap_nreaders; i++) {
@ -9802,39 +9806,44 @@ int __cold mdbx_reader_check0(MDBX_env *env, int rdt_locked, int *dead) {
if (pid != env->me_pid) if (pid != env->me_pid)
continue; continue;
if (mdbx_pid_insert(pids, pid) != 0) if (mdbx_pid_insert(pids, pid) != 0)
continue; continue /* such pid already processed */;
rc = mdbx_rpid_check(env, pid); int err = mdbx_rpid_check(env, pid);
if (rc == MDBX_RESULT_TRUE) if (err == MDBX_RESULT_TRUE)
continue; /* reader is live */ continue /* reader is live */;
if (rc != MDBX_RESULT_FALSE) if (err != MDBX_SUCCESS) {
break; /* mdbx_rpid_check() failed */ rc = err;
break /* mdbx_rpid_check() failed */;
}
/* stale reader found */ /* stale reader found */
if (!rdt_locked) { if (!rdt_locked) {
rc = mdbx_rdt_lock(env); err = mdbx_rdt_lock(env);
if (MDBX_IS_ERROR(rc)) if (MDBX_IS_ERROR(rc)) {
rc = err;
break; break;
}
rdt_locked = -1; rdt_locked = -1;
if (rc == MDBX_RESULT_TRUE) if (err == MDBX_RESULT_TRUE) {
/* the above checked all readers */ /* mutex recovered, the mdbx_mutex_failed() checked all readers */
rc = MDBX_RESULT_TRUE;
break; break;
}
/* a other process may have clean and reused slot, recheck */ /* a other process may have clean and reused slot, recheck */
if (mr[i].mr_pid != pid) if (mr[i].mr_pid != pid)
continue; continue;
rc = mdbx_rpid_check(env, pid); err = mdbx_rpid_check(env, pid);
if (MDBX_IS_ERROR(rc)) if (MDBX_IS_ERROR(rc)) {
rc = err;
break; break;
if (rc != MDBX_RESULT_FALSE) {
/* the race with other process, slot reused */
rc = MDBX_RESULT_FALSE;
continue;
} }
if (err != MDBX_SUCCESS)
continue /* the race with other process, slot reused */;
} }
/* clean it */ /* clean it */
@ -9896,7 +9905,7 @@ static txnid_t __cold mdbx_oomkick(MDBX_env *env, txnid_t oldest) {
for (retry = 0; retry < INT_MAX; ++retry) { for (retry = 0; retry < INT_MAX; ++retry) {
int reader; int reader;
if (mdbx_reader_check(env, NULL)) if (MDBX_IS_ERROR(mdbx_reader_check0(env, false, NULL)))
break; break;
txnid_t snap = mdbx_find_oldest(env->me_txn, &reader); txnid_t snap = mdbx_find_oldest(env->me_txn, &reader);