database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Remove config::max_file_descriptor_number (#1833)

Browse Source
This commit is contained in:
lichaoyong
2019-09-20 07:50:57 +08:00
committed by ZHAO Chun
parent 315f762523
commit 720808fda5
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
be/src/common/config.h
View File

@ -221,10 +221,9 @@ namespace config {
CONF_Bool(row_nums_check, "true")
//file descriptors cache, by default, cache 32768 descriptors
CONF_Int32(file_descriptor_cache_capacity, "32768");
// minimum/maximum file descriptor number
// minimum file descriptor number
// modify them upon necessity
CONF_Int32(min_file_descriptor_number, "65536");
CONF_Int32(max_file_descriptor_number, "131072");
CONF_Int32(min_file_descriptor_number, "60000");
CONF_Int64(index_stream_cache_capacity, "10737418240");
CONF_Int64(max_packed_row_block_size, "20971520");

9
be/src/olap/storage_engine.cpp
View File

@ -187,9 +187,9 @@ OLAPStatus StorageEngine::open() {
res = _check_file_descriptor_number();
if (res != OLAP_SUCCESS) {
LOG(WARNING) << "file descriptor number is not between "
<< "min_file_descriptor_number:" << config::min_file_descriptor_number
<< " and max_file_descriptor_number:" << config::max_file_descriptor_number;
LOG(ERROR) << "File descriptor number is less than " << config::min_file_descriptor_number
<< ". Please use (ulimit -n) to set a value equal or greater than "
<< config::min_file_descriptor_number;
return OLAP_ERR_INIT_FAILED;
}
@ -370,8 +370,7 @@ OLAPStatus StorageEngine::_check_file_descriptor_number() {
<< ", use default configuration instead.";
return OLAP_SUCCESS;
}
if (l.rlim_cur < config::min_file_descriptor_number
|| l.rlim_cur > config::max_file_descriptor_number) {
if (l.rlim_cur < config::min_file_descriptor_number) {
return OLAP_ERR_TOO_FEW_FILE_DESCRITPROR;
}
return OLAP_SUCCESS;

4
be/test/olap/delete_handler_test.cpp
View File

@ -53,9 +53,7 @@ void set_up() {
create_dir(config::storage_root_path);
std::vector<StorePath> paths;
paths.emplace_back(config::storage_root_path, -1);
config::min_file_descriptor_number = 65536;
config::max_file_descriptor_number = 131072;
config::min_file_descriptor_number = 1000;
doris::EngineOptions options;
options.store_paths = paths;