mirror of
https://github.com/isar/libmdbx.git
synced 2024-10-30 11:29:19 +08:00
mdbx: don't check other meta pages if one is specified for verification/recovery.
Fixes https://github.com/erthink/libmdbx/issues/202
This commit is contained in:
Leonid Yuriev
parent
0e83a8e5ef
commit
0cd1eac6a8
22
src/core.c
22
src/core.c
@ -11583,18 +11583,18 @@ static __cold int mdbx_setup_dxb(MDBX_env *env, const int lck_rc) {
|
||||
env->me_poison_edge = bytes2pgno(env, env->me_dxb_mmap.limit);
|
||||
#endif /* MDBX_USE_VALGRIND || __SANITIZE_ADDRESS__ */
|
||||
|
||||
const unsigned meta_clash_mask = mdbx_meta_eq_mask(env);
|
||||
if (unlikely(meta_clash_mask)) {
|
||||
if (/* not recovery mode */ env->me_stuck_meta < 0) {
|
||||
mdbx_error("meta-pages are clashed: mask 0x%d", meta_clash_mask);
|
||||
return MDBX_CORRUPTED;
|
||||
} else {
|
||||
mdbx_warning("ignore meta-pages clashing (mask 0x%d) in recovery mode",
|
||||
meta_clash_mask);
|
||||
}
|
||||
}
|
||||
|
||||
while (likely(/* not recovery mode */ env->me_stuck_meta < 0)) {
|
||||
const unsigned meta_clash_mask = mdbx_meta_eq_mask(env);
|
||||
if (unlikely(meta_clash_mask)) {
|
||||
if (/* not recovery mode */ env->me_stuck_meta < 0) {
|
||||
mdbx_error("meta-pages are clashed: mask 0x%d", meta_clash_mask);
|
||||
return MDBX_CORRUPTED;
|
||||
} else {
|
||||
mdbx_warning("ignore meta-pages clashing (mask 0x%d) in recovery mode",
|
||||
meta_clash_mask);
|
||||
}
|
||||
}
|
||||
|
||||
MDBX_meta *const head = mdbx_meta_head(env);
|
||||
const txnid_t head_txnid = mdbx_meta_txnid_fluid(env, head);
|
||||
MDBX_meta *const steady = mdbx_meta_steady(env);
|
||||
|
||||
111
src/mdbx_chk.c
111
src/mdbx_chk.c
@ -1376,11 +1376,6 @@ int main(int argc, char *argv[]) {
|
||||
"of may by large than the database itself,\n "
|
||||
"until it will be closed or reopened in read-write mode.\n");
|
||||
#endif
|
||||
print(" - transactions: recent %" PRIu64 ", latter reader %" PRIu64
|
||||
", lag %" PRIi64 "\n",
|
||||
envinfo.mi_recent_txnid, envinfo.mi_latter_reader_txnid,
|
||||
envinfo.mi_recent_txnid - envinfo.mi_latter_reader_txnid);
|
||||
|
||||
verbose_meta(0, envinfo.mi_meta0_txnid, envinfo.mi_meta0_sign,
|
||||
envinfo.mi_bootid.meta0.x, envinfo.mi_bootid.meta0.y);
|
||||
verbose_meta(1, envinfo.mi_meta1_txnid, envinfo.mi_meta1_sign,
|
||||
@ -1389,52 +1384,70 @@ int main(int argc, char *argv[]) {
|
||||
envinfo.mi_bootid.meta2.x, envinfo.mi_bootid.meta2.y);
|
||||
}
|
||||
|
||||
if (verbose > 1)
|
||||
print(" - performs check for meta-pages clashes\n");
|
||||
if (meta_eq(envinfo.mi_meta0_txnid, envinfo.mi_meta0_sign,
|
||||
envinfo.mi_meta1_txnid, envinfo.mi_meta1_sign)) {
|
||||
print(" ! meta-%d and meta-%d are clashed\n", 0, 1);
|
||||
++problems_meta;
|
||||
}
|
||||
if (meta_eq(envinfo.mi_meta1_txnid, envinfo.mi_meta1_sign,
|
||||
envinfo.mi_meta2_txnid, envinfo.mi_meta2_sign)) {
|
||||
print(" ! meta-%d and meta-%d are clashed\n", 1, 2);
|
||||
++problems_meta;
|
||||
}
|
||||
if (meta_eq(envinfo.mi_meta2_txnid, envinfo.mi_meta2_sign,
|
||||
envinfo.mi_meta0_txnid, envinfo.mi_meta0_sign)) {
|
||||
print(" ! meta-%d and meta-%d are clashed\n", 2, 0);
|
||||
++problems_meta;
|
||||
}
|
||||
if (stuck_meta >= 0) {
|
||||
if (verbose) {
|
||||
print(" - skip checking meta-pages since the %u"
|
||||
" is selected for verification\n",
|
||||
stuck_meta);
|
||||
print(" - transactions: recent %" PRIu64
|
||||
", selected for verification %" PRIu64 ", lag %" PRIi64 "\n",
|
||||
envinfo.mi_recent_txnid, get_meta_txnid(stuck_meta),
|
||||
envinfo.mi_recent_txnid - get_meta_txnid(stuck_meta));
|
||||
}
|
||||
} else {
|
||||
if (verbose > 1)
|
||||
print(" - performs check for meta-pages clashes\n");
|
||||
if (meta_eq(envinfo.mi_meta0_txnid, envinfo.mi_meta0_sign,
|
||||
envinfo.mi_meta1_txnid, envinfo.mi_meta1_sign)) {
|
||||
print(" ! meta-%d and meta-%d are clashed\n", 0, 1);
|
||||
++problems_meta;
|
||||
}
|
||||
if (meta_eq(envinfo.mi_meta1_txnid, envinfo.mi_meta1_sign,
|
||||
envinfo.mi_meta2_txnid, envinfo.mi_meta2_sign)) {
|
||||
print(" ! meta-%d and meta-%d are clashed\n", 1, 2);
|
||||
++problems_meta;
|
||||
}
|
||||
if (meta_eq(envinfo.mi_meta2_txnid, envinfo.mi_meta2_sign,
|
||||
envinfo.mi_meta0_txnid, envinfo.mi_meta0_sign)) {
|
||||
print(" ! meta-%d and meta-%d are clashed\n", 2, 0);
|
||||
++problems_meta;
|
||||
}
|
||||
|
||||
const unsigned steady_meta_id = meta_recent(true);
|
||||
const uint64_t steady_meta_txnid = get_meta_txnid(steady_meta_id);
|
||||
const unsigned weak_meta_id = meta_recent(false);
|
||||
const uint64_t weak_meta_txnid = get_meta_txnid(weak_meta_id);
|
||||
if (envflags & MDBX_EXCLUSIVE) {
|
||||
if (verbose > 1)
|
||||
print(" - performs full check recent-txn-id with meta-pages\n");
|
||||
if (steady_meta_txnid != envinfo.mi_recent_txnid) {
|
||||
print(" ! steady meta-%d txn-id mismatch recent-txn-id (%" PRIi64
|
||||
" != %" PRIi64 ")\n",
|
||||
steady_meta_id, steady_meta_txnid, envinfo.mi_recent_txnid);
|
||||
++problems_meta;
|
||||
const unsigned steady_meta_id = meta_recent(true);
|
||||
const uint64_t steady_meta_txnid = get_meta_txnid(steady_meta_id);
|
||||
const unsigned weak_meta_id = meta_recent(false);
|
||||
const uint64_t weak_meta_txnid = get_meta_txnid(weak_meta_id);
|
||||
if (envflags & MDBX_EXCLUSIVE) {
|
||||
if (verbose > 1)
|
||||
print(" - performs full check recent-txn-id with meta-pages\n");
|
||||
if (steady_meta_txnid != envinfo.mi_recent_txnid) {
|
||||
print(" ! steady meta-%d txn-id mismatch recent-txn-id (%" PRIi64
|
||||
" != %" PRIi64 ")\n",
|
||||
steady_meta_id, steady_meta_txnid, envinfo.mi_recent_txnid);
|
||||
++problems_meta;
|
||||
}
|
||||
} else if (write_locked) {
|
||||
if (verbose > 1)
|
||||
print(" - performs lite check recent-txn-id with meta-pages (not a "
|
||||
"monopolistic mode)\n");
|
||||
if (weak_meta_txnid != envinfo.mi_recent_txnid) {
|
||||
print(" ! weak meta-%d txn-id mismatch recent-txn-id (%" PRIi64
|
||||
" != %" PRIi64 ")\n",
|
||||
weak_meta_id, weak_meta_txnid, envinfo.mi_recent_txnid);
|
||||
++problems_meta;
|
||||
}
|
||||
} else if (verbose) {
|
||||
print(" - skip check recent-txn-id with meta-pages (monopolistic or "
|
||||
"read-write mode only)\n");
|
||||
}
|
||||
} else if (write_locked) {
|
||||
if (verbose > 1)
|
||||
print(" - performs lite check recent-txn-id with meta-pages (not a "
|
||||
"monopolistic mode)\n");
|
||||
if (weak_meta_txnid != envinfo.mi_recent_txnid) {
|
||||
print(" ! weak meta-%d txn-id mismatch recent-txn-id (%" PRIi64
|
||||
" != %" PRIi64 ")\n",
|
||||
weak_meta_id, weak_meta_txnid, envinfo.mi_recent_txnid);
|
||||
++problems_meta;
|
||||
}
|
||||
} else if (verbose) {
|
||||
print(" - skip check recent-txn-id with meta-pages (monopolistic or "
|
||||
"read-write mode only)\n");
|
||||
total_problems += problems_meta;
|
||||
|
||||
if (verbose)
|
||||
print(" - transactions: recent %" PRIu64 ", latter reader %" PRIu64
|
||||
", lag %" PRIi64 "\n",
|
||||
envinfo.mi_recent_txnid, envinfo.mi_latter_reader_txnid,
|
||||
envinfo.mi_recent_txnid - envinfo.mi_latter_reader_txnid);
|
||||
}
|
||||
total_problems += problems_meta;
|
||||
|
||||
if (!dont_traversal) {
|
||||
struct problem *saved_list;
|
||||
@ -1603,7 +1616,7 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
if (rc == 0 && total_problems == 1 && problems_meta == 1 && !dont_traversal &&
|
||||
(envflags & MDBX_RDONLY) == 0 && !only_subdb && stuck_meta < 0 &&
|
||||
steady_meta_txnid < envinfo.mi_recent_txnid) {
|
||||
get_meta_txnid(meta_recent(true)) < envinfo.mi_recent_txnid) {
|
||||
print("Perform sync-to-disk for make steady checkpoint at txn-id #%" PRIi64
|
||||
"\n",
|
||||
envinfo.mi_recent_txnid);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user