hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

delete config clog_usage_limit_size

Browse Source
This commit is contained in:
obdev
2021-07-20 21:33:13 +08:00
committed by wangzelin.wzl
parent f45d2cdbe2
commit 80fad5f4a8
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/share/parameter/ob_parameter_seed.ipp
View File

@ -735,10 +735,6 @@ DEF_INT(clog_disk_usage_limit_percentage, OB_CLUSTER_PARAMETER, "95", "[80, 100]
"clog_disk_utilization_threshold. " "clog_disk_utilization_threshold. "
"Range: [80, 100]", "Range: [80, 100]",
ObParameterAttr(Section::TRANS, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE)); ObParameterAttr(Section::TRANS, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
DEF_CAP(clog_usage_limit_size, OB_CLUSTER_PARAMETER, "2048G", "[256MB,)",
"the size of the total clog file size limited per server. "
"Range: [256M,)",
ObParameterAttr(Section::TRANS, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
DEF_INT(clog_disk_utilization_threshold, OB_CLUSTER_PARAMETER, "80", "[10, 100)", DEF_INT(clog_disk_utilization_threshold, OB_CLUSTER_PARAMETER, "80", "[10, 100)",
"clog disk utilization threshold before reuse clog files, should be less than clog_disk_usage_limit_percentage. " "clog disk utilization threshold before reuse clog files, should be less than clog_disk_usage_limit_percentage. "
"Range: [10, 100)", "Range: [10, 100)",

9
src/share/redolog/ob_log_file_store.cpp
View File

@ -16,7 +16,6 @@
#include "ob_log_file_store.h" #include "ob_log_file_store.h"
#include "lib/file/file_directory_utils.h" #include "lib/file/file_directory_utils.h"
#include "storage/blocksstable/ob_store_file_system.h" #include "storage/blocksstable/ob_store_file_system.h"
#include "share/config/ob_server_config.h"
namespace oceanbase { namespace oceanbase {
using namespace clog; using namespace clog;
@ -870,17 +869,11 @@ const char* ObLogFileStore::get_dir_name() const
int ObLogFileStore::get_total_disk_space(int64_t& total_space) const int ObLogFileStore::get_total_disk_space(int64_t& total_space) const
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
int64_t config_size = 0;
int64_t disk_size = 0;
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
COMMON_LOG(WARN, "not inited", K(ret)); COMMON_LOG(WARN, "not inited", K(ret));
} else if (FALSE_IT(config_size = ObServerConfig::get_instance().clog_usage_limit_size)) { } else if (OB_FAIL(disk_mgr_->get_total_disk_space(total_space))) {
// do nothing
} else if (OB_FAIL(disk_mgr_->get_total_disk_space(disk_size))) {
COMMON_LOG(ERROR, "get total disk space fail", K(ret)); COMMON_LOG(ERROR, "get total disk space fail", K(ret));
} else {
total_space = common::min(config_size, disk_size);
} }
return ret; return ret;
} }