From 24daade18e4d99b85e58eb4cb56de100a4cc7e7f Mon Sep 17 00:00:00 2001 From: Yhz Date: Sun, 8 Mar 2020 14:30:02 +0800 Subject: [PATCH] fix config wal valid_recovery_error_ignore bug Signed-off-by: Yhz --- CHANGELOG.md | 1 + core/src/server/Config.cpp | 2 +- core/src/server/Config.h | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abb94a552c..1fa431015c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,7 @@ Please mark all change in change log and use the issue from GitHub - \#1529 Fix server crash when cache_insert_data enabled - \#1530 Set table file with correct engine type in meta - \#1535 Degradation searching performance with metric_type: binary_idmap +- \#1549 Fix server/wal config setting bug ## Feature - \#216 Add CLI to get server info diff --git a/core/src/server/Config.cpp b/core/src/server/Config.cpp index f0b88fa98c..8506a28f0f 100644 --- a/core/src/server/Config.cpp +++ b/core/src/server/Config.cpp @@ -2013,7 +2013,7 @@ Config::SetWalConfigEnable(const std::string& value) { Status Config::SetWalConfigRecoveryErrorIgnore(const std::string& value) { CONFIG_CHECK(CheckWalConfigRecoveryErrorIgnore(value)); - return SetConfigValueInMem(CONFIG_WAL, CONFIG_WAL_RECOVERY_ERROR_IGNORE_DEFAULT, value); + return SetConfigValueInMem(CONFIG_WAL, CONFIG_WAL_RECOVERY_ERROR_IGNORE, value); } Status diff --git a/core/src/server/Config.h b/core/src/server/Config.h index 1bd99a6b9d..77bdd5def6 100644 --- a/core/src/server/Config.h +++ b/core/src/server/Config.h @@ -191,6 +191,9 @@ class Config { Status SetConfigCli(const std::string& parent_key, const std::string& child_key, const std::string& value); + Status + CheckDuplicatePort(); + Status UpdateFileConfigFromMem(const std::string& parent_key, const std::string& child_key);