summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2005-03-10 07:45:17 +0100
committerunknown <joreland@mysql.com>2005-03-10 07:45:17 +0100
commit4b5c3e6e428f5fef4cf837c4467b12c4c4a818ff (patch)
tree7601848a418f746039524b07bec37cbfd6fc9fb0 /ndb
parent6f4a99a10f1c0a55f952bc9e42b258275e9a2f6a (diff)
downloadmariadb-git-4b5c3e6e428f5fef4cf837c4467b12c4c4a818ff.tar.gz
bug#9089
ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations ndb/include/mgmapi/mgmapi_config_parameters.h: Reenable MAX_OPEN_FILES to enable LCP in some situations ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp: Reenable MAX_OPEN_FILES to enable LCP in some situations ndb/src/mgmsrv/ConfigInfo.cpp: Reenable MAX_OPEN_FILES to enable LCP in some situations
Diffstat (limited to 'ndb')
-rw-r--r--ndb/include/mgmapi/mgmapi_config_parameters.h2
-rw-r--r--ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp6
-rw-r--r--ndb/src/mgmsrv/ConfigInfo.cpp5
3 files changed, 7 insertions, 6 deletions
diff --git a/ndb/include/mgmapi/mgmapi_config_parameters.h b/ndb/include/mgmapi/mgmapi_config_parameters.h
index 8a04ee2fe37..432854d1d36 100644
--- a/ndb/include/mgmapi/mgmapi_config_parameters.h
+++ b/ndb/include/mgmapi/mgmapi_config_parameters.h
@@ -81,6 +81,8 @@
#define CFG_DB_BACKUP_DATADIR 158
+#define CFG_DB_MAX_OPEN_FILES 159
+
#define CFG_NODE_ARBIT_RANK 200
#define CFG_NODE_ARBIT_DELAY 201
diff --git a/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp b/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
index 9c943760e31..9750e1c5179 100644
--- a/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
+++ b/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
@@ -66,10 +66,10 @@ Ndbfs::Ndbfs(const Configuration & conf) :
ndbrequire(p != 0);
m_maxFiles = 40;
- //ndb_mgm_get_int_parameter(p, CFG_DB_MAX_OPEN_FILES, &m_maxFiles);
-
+ ndb_mgm_get_int_parameter(p, CFG_DB_MAX_OPEN_FILES, &m_maxFiles);
+
// Create idle AsyncFiles
- Uint32 noIdleFiles = 27;
+ Uint32 noIdleFiles = m_maxFiles > 27 ? 27 : m_maxFiles ;
for (Uint32 i = 0; i < noIdleFiles; i++){
theIdleFiles.push_back(createAsyncFile());
}
diff --git a/ndb/src/mgmsrv/ConfigInfo.cpp b/ndb/src/mgmsrv/ConfigInfo.cpp
index 9be4af1b9b5..a91b1c4fcab 100644
--- a/ndb/src/mgmsrv/ConfigInfo.cpp
+++ b/ndb/src/mgmsrv/ConfigInfo.cpp
@@ -873,7 +873,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
STR_VALUE(MAX_INT_RNIL) },
{
- KEY_INTERNAL,
+ CFG_DB_MAX_OPEN_FILES,
"MaxNoOfOpenFiles",
DB_TOKEN,
"Max number of files open per "DB_TOKEN_PRINT" node.(One thread is created per file)",
@@ -882,8 +882,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::CI_INT,
"40",
"20",
- "256" },
-
+ STR_VALUE(MAX_INT_RNIL) },
{
CFG_DB_TRANSACTION_CHECK_INTERVAL,