You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by zh...@apache.org on 2019/09/19 23:51:02 UTC
[incubator-doris] branch master updated: Remove
config::max_file_descriptor_number (#1833)
This is an automated email from the ASF dual-hosted git repository.
zhaoc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 720808f Remove config::max_file_descriptor_number (#1833)
720808f is described below
commit 720808fda5990f4805e10f86fbfb22ee44c30781
Author: lichaoyong <li...@baidu.com>
AuthorDate: Fri Sep 20 07:50:57 2019 +0800
Remove config::max_file_descriptor_number (#1833)
---
be/src/common/config.h | 5 ++---
be/src/olap/storage_engine.cpp | 9 ++++-----
be/test/olap/delete_handler_test.cpp | 4 +---
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/be/src/common/config.h b/be/src/common/config.h
index daa36d4..b386d21 100644
--- a/be/src/common/config.h
+++ b/be/src/common/config.h
@@ -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");
diff --git a/be/src/olap/storage_engine.cpp b/be/src/olap/storage_engine.cpp
index 35e2f79..11ed82d 100644
--- a/be/src/olap/storage_engine.cpp
+++ b/be/src/olap/storage_engine.cpp
@@ -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;
diff --git a/be/test/olap/delete_handler_test.cpp b/be/test/olap/delete_handler_test.cpp
index fa062c0..4daa740 100644
--- a/be/test/olap/delete_handler_test.cpp
+++ b/be/test/olap/delete_handler_test.cpp
@@ -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;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org