diff --git a/src/share/parameter/ob_parameter_seed.ipp b/src/share/parameter/ob_parameter_seed.ipp index ae229e83b6..c0bffc6b67 100644 --- a/src/share/parameter/ob_parameter_seed.ipp +++ b/src/share/parameter/ob_parameter_seed.ipp @@ -735,10 +735,6 @@ DEF_INT(clog_disk_usage_limit_percentage, OB_CLUSTER_PARAMETER, "95", "[80, 100] "clog_disk_utilization_threshold. " "Range: [80, 100]", 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)", "clog disk utilization threshold before reuse clog files, should be less than clog_disk_usage_limit_percentage. " "Range: [10, 100)", diff --git a/src/share/redolog/ob_log_file_store.cpp b/src/share/redolog/ob_log_file_store.cpp index ddefe308be..7cecebb782 100644 --- a/src/share/redolog/ob_log_file_store.cpp +++ b/src/share/redolog/ob_log_file_store.cpp @@ -16,7 +16,6 @@ #include "ob_log_file_store.h" #include "lib/file/file_directory_utils.h" #include "storage/blocksstable/ob_store_file_system.h" -#include "share/config/ob_server_config.h" namespace oceanbase { 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 ret = OB_SUCCESS; - int64_t config_size = 0; - int64_t disk_size = 0; if (IS_NOT_INIT) { ret = OB_NOT_INIT; COMMON_LOG(WARN, "not inited", K(ret)); - } else if (FALSE_IT(config_size = ObServerConfig::get_instance().clog_usage_limit_size)) { - // do nothing - } else if (OB_FAIL(disk_mgr_->get_total_disk_space(disk_size))) { + } else if (OB_FAIL(disk_mgr_->get_total_disk_space(total_space))) { COMMON_LOG(ERROR, "get total disk space fail", K(ret)); - } else { - total_space = common::min(config_size, disk_size); } return ret; }