From 1fe6b0c0e215cca7339987af33ade75b65c5ecea Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Mon, 24 Jul 2023 01:32:13 +0000 Subject: [PATCH] Also allow "0" and "no" as false for inmemory_metadata and inmemory_journal --- src/blockstore_open.cpp | 6 ++++-- src/disk_tool_prepare.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/blockstore_open.cpp b/src/blockstore_open.cpp index 5b369def..1ed37899 100644 --- a/src/blockstore_open.cpp +++ b/src/blockstore_open.cpp @@ -85,11 +85,13 @@ void blockstore_impl_t::parse_config(blockstore_config_t & config, bool init) immediate_commit = IMMEDIATE_SMALL; } metadata_buf_size = strtoull(config["meta_buf_size"].c_str(), NULL, 10); - inmemory_meta = config["inmemory_metadata"] != "false"; + inmemory_meta = config["inmemory_metadata"] != "false" && config["inmemory_metadata"] != "0" && + config["inmemory_metadata"] != "no"; journal.sector_count = strtoull(config["journal_sector_buffer_count"].c_str(), NULL, 10); journal.no_same_sector_overwrites = config["journal_no_same_sector_overwrites"] == "true" || config["journal_no_same_sector_overwrites"] == "1" || config["journal_no_same_sector_overwrites"] == "yes"; - journal.inmemory = config["inmemory_journal"] != "false"; + journal.inmemory = config["inmemory_journal"] != "false" && config["inmemory_journal"] != "0" && + config["inmemory_journal"] != "no"; // Validate if (journal.sector_count < 2) { diff --git a/src/disk_tool_prepare.cpp b/src/disk_tool_prepare.cpp index 9f87207d..e6f794fd 100644 --- a/src/disk_tool_prepare.cpp +++ b/src/disk_tool_prepare.cpp @@ -147,7 +147,7 @@ int disk_tool_t::prepare_one(std::map options, int is_ for (int i = 0; i < sizeof(allow_additional_params)/sizeof(allow_additional_params[0]); i++) { auto it = options.find(allow_additional_params[i]); - if (it != options.end()) + if (it != options.end() && it->second != "") { sb[it->first] = it->second; }