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

mdbx: add MDBX_WANNA_RECOVERY.

Browse Source
This commit is contained in:
Leo Yuriev 2017-05-17 20:54:16 +03:00
parent 015a242c89
commit 677625ead1
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mdbx.h
View File

@ -336,6 +336,10 @@ typedef enum MDB_cursor_op {
* - ABI version mismatch (rare case); */
#define MDBX_EBADSIGN (-30420)
/* Database should be recovered, but this could be done automatically
* right now (e.g. in readonly mode and so forth). */
#define MDBX_WANNA_RECOVERY (-30419)
/* Statistics for a database in the environment */
typedef struct MDBX_stat {
unsigned ms_psize; /* Size of a database page.

14
src/mdbx.c
View File

@ -718,14 +718,14 @@ static const char *__mdbx_strerr(int errnum) {
"MDB_KEYEXIST: Key/data pair already exists",
"MDB_NOTFOUND: No matching key/data pair found",
"MDB_PAGE_NOTFOUND: Requested page not found",
"MDB_CORRUPTED: Located page was wrong data",
"MDB_CORRUPTED: Database is corrupted",
"MDB_PANIC: Update of meta page failed or environment had fatal error",
"MDB_VERSION_MISMATCH: DB version mismatch libmdbx",
"MDB_INVALID: File is not an LMDB file",
"MDB_MAP_FULL: Environment mapsize limit reached",
"MDB_DBS_FULL: Too may DBI (maxdbs reached)",
"MDB_READERS_FULL: Too many readers (maxreaders reached)",
NULL /* -30789 unused in MDBX */,
NULL /* MDB_TLS_FULL (-30789): unused in MDBX */,
"MDB_TXN_FULL: Transaction has too many dirty pages - transaction too "
"big",
"MDB_CURSOR_FULL: Internal error - cursor stack limit reached",
@ -752,6 +752,9 @@ static const char *__mdbx_strerr(int errnum) {
return "MDBX_EMULTIVAL: Unable to update multi-value for the given key";
case MDBX_EBADSIGN:
return "MDBX_EBADSIGN: Wrong signature of a runtime object(s)";
case MDBX_WANNA_RECOVERY:
return "MDBX_WANNA_RECOVERY: Database should be recovered, but this could "
"be done in a read-only mode";
default:
return NULL;
}
@ -3818,14 +3821,13 @@ static int __cold mdbx_setup_dxb(MDB_env *env, MDB_meta *meta, int lck_rc) {
MDB_meta *const head = mdbx_meta_head(env);
if (head->mm_txnid != meta->mm_txnid) {
mdbx_trace("head->mm_txnid (%" PRIuPTR ") != (%" PRIuPTR
") meta->mm_txnid",
mdbx_trace("head->mm_txnid (%" PRIuPTR ") != (%" PRIuPTR ") meta->mm_txnid",
head->mm_txnid, meta->mm_txnid);
if (lck_rc == /* lck exclusive */ MDBX_RESULT_TRUE) {
assert(META_IS_STEADY(meta) && !META_IS_STEADY(head));
if (env->me_flags & MDB_RDONLY) {
mdbx_trace("exclusive, but read-only, unable recovery/rollback");
return MDB_CORRUPTED /* LY: could not recovery/rollback */;
return MDBX_WANNA_RECOVERY /* LY: could not recovery/rollback */;
}
/* LY: rollback weak checkpoint */
@ -3841,7 +3843,7 @@ static int __cold mdbx_setup_dxb(MDB_env *env, MDB_meta *meta, int lck_rc) {
/* LY: without-lck (read-only) mode, so it is imposible that other
* process made weak checkpoint. */
mdbx_trace("without-lck, unable recovery/rollback");
return MDB_CORRUPTED;
return MDBX_WANNA_RECOVERY;
} else {
/* LY: assume just have a collision with other running process,
* or someone make a weak checkpoint */

2
src/tools/mdbx_chk.c
View File

@ -691,6 +691,8 @@ int main(int argc, char *argv[]) {
rc = mdbx_env_open_ex(env, envname, envflags, 0664, &exclusive);
if (rc) {
error("mdbx_env_open failed, error %d %s\n", rc, mdbx_strerror(rc));
if (rc == MDBX_WANNA_RECOVERY && (envflags & MDB_RDONLY))
print("Please run %s in the read-write mode (with '-w' option).\n", prog);
goto bailout;
}
if (verbose)