bk commit into 5.1 tree (tomas:1.1980)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1980 06/01/26 11:08:37 tomas@stripped +3 -0
  added config parameter InitialNoOfOpenFiles to ndb

  storage/ndb/src/mgmsrv/ConfigInfo.cpp
    1.75 06/01/26 11:08:31 tomas@stripped +12 -0
    added config parameter InitialNoOfOpenFiles to ndb

  storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
    1.23 06/01/26 11:08:31 tomas@stripped +4 -2
    added config parameter InitialNoOfOpenFiles to ndb

  storage/ndb/include/mgmapi/mgmapi_config_parameters.h
    1.25 06/01/26 11:08:31 tomas@stripped +1 -0
    added config parameter InitialNoOfOpenFiles to ndb

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/wl2325-alcatel

--- 1.24/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2006-01-23 11:46:16 +01:00
+++ 1.25/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2006-01-26 11:08:31 +01:00
@@ -84,6 +84,7 @@
 #define CFG_DB_BACKUP_DATADIR         158
 
 #define CFG_DB_MAX_OPEN_FILES         159
+#define CFG_DB_INITIAL_OPEN_FILES     162
 
 #define CFG_DB_DATA_MEM_2             199
 

--- 1.74/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2006-01-23 11:46:16 +01:00
+++ 1.75/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2006-01-26 11:08:31 +01:00
@@ -881,6 +881,18 @@
     STR_VALUE(MAX_INT_RNIL) },
   
   {
+    CFG_DB_MAX_OPEN_FILES,
+    "InitialNoOfOpenFiles",
+    DB_TOKEN,
+    "Initial number of files open per "DB_TOKEN_PRINT" node.(One thread is created per file)",
+    ConfigInfo::CI_USED,
+    false,
+    ConfigInfo::CI_INT,
+    "27",
+    "20",
+    STR_VALUE(MAX_INT_RNIL) },
+  
+  {
     CFG_DB_TRANSACTION_CHECK_INTERVAL,
     "TimeBetweenInactiveTransactionAbortCheck",
     DB_TOKEN,

--- 1.22/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	2005-10-14 10:31:08 +02:00
+++ 1.23/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	2006-01-26 11:08:31 +01:00
@@ -110,9 +110,11 @@
 
   m_maxFiles = 40;
   ndb_mgm_get_int_parameter(p, CFG_DB_MAX_OPEN_FILES, &m_maxFiles);
-  
+  Uint32 noIdleFiles = 27;
+  ndb_mgm_get_int_parameter(p, CFG_DB_INITIAL_OPEN_FILES, &m_maxFiles);
+  if (noIdleFiles > m_maxFiles)
+    m_maxFiles = noIdleFiles;
   // Create idle AsyncFiles
-  Uint32 noIdleFiles = m_maxFiles > 27  ? 27 : m_maxFiles ;
   for (Uint32 i = 0; i < noIdleFiles; i++){
     theIdleFiles.push_back(createAsyncFile());
   }