From 50b843ecb709b2242a6ef89860b2dfa9871db861 Mon Sep 17 00:00:00 2001 From: Leonid Yuriev Date: Fri, 21 Jan 2022 01:29:59 +0300 Subject: [PATCH] mdbx-test: more for `--ignore-dbfull`. --- test/hill.cc | 5 ++++- test/nested.cc | 3 ++- test/ttl.cc | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/test/hill.cc b/test/hill.cc index a2fcb606..5aea4d71 100644 --- a/test/hill.cc +++ b/test/hill.cc @@ -453,6 +453,8 @@ bailout: log_notice("downhill: bailout at commit due '%s'", mdbx_strerror(err)); } + if (!rc && err == MDBX_MAP_FULL && config.params.ignore_dbfull) + rc = true; if (dbi) { if (config.params.drop_table && !mode_readonly()) { txn_begin(false); @@ -460,7 +462,8 @@ bailout: err = breakable_commit(); if (unlikely(err != MDBX_SUCCESS)) { log_notice("hill: bailout-clean due '%s'", mdbx_strerror(err)); - return rc; + if (err != MDBX_MAP_FULL || !config.params.ignore_dbfull) + rc = false; } } else db_table_close(dbi); diff --git a/test/nested.cc b/test/nested.cc index c70e6c5b..098eada0 100644 --- a/test/nested.cc +++ b/test/nested.cc @@ -95,7 +95,8 @@ bool testcase_nested::teardown() { txn_begin(false); db_table_drop(dbi); int err = breakable_commit(); - if (unlikely(err != MDBX_SUCCESS)) { + if (unlikely(err != MDBX_SUCCESS) && + (err != MDBX_MAP_FULL || !config.params.ignore_dbfull)) { log_notice("nested: bailout-clean due '%s'", mdbx_strerror(err)); ok = false; } diff --git a/test/ttl.cc b/test/ttl.cc index 838b6586..06498f5e 100644 --- a/test/ttl.cc +++ b/test/ttl.cc @@ -247,6 +247,8 @@ bool testcase_ttl::run() { } bailout: + if (!rc && err == MDBX_MAP_FULL && config.params.ignore_dbfull) + rc = true; txn_end(true); if (dbi) { if (config.params.drop_table && !mode_readonly()) { @@ -255,7 +257,8 @@ bailout: err = breakable_commit(); if (unlikely(err != MDBX_SUCCESS)) { log_notice("ttl: bailout-clean due '%s'", mdbx_strerror(err)); - return false; + if (err != MDBX_MAP_FULL || !config.params.ignore_dbfull) + rc = false; } } else db_table_close(dbi);