Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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.2055 06/01/15 20:45:08 jonas@eel.(none) +10 -0
ndb dd -
Change default page buffer cache size
storage/ndb/src/mgmsrv/ConfigInfo.cpp
1.71 06/01/15 20:45:04 jonas@eel.(none) +12 -0
Change default page buffer caches from 1M (only used for testing) to realistic 64M
storage/ndb/src/kernel/blocks/restore.cpp
1.3 06/01/15 20:45:04 jonas@eel.(none) +1 -1
Add configuration of page buffer
storage/ndb/src/kernel/blocks/pgman.cpp
1.3 06/01/15 20:45:04 jonas@eel.(none) +12 -2
Add configuration of page buffer
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
1.25 06/01/15 20:45:04 jonas@eel.(none) +11 -1
Add configuration of page buffer
storage/ndb/include/mgmapi/mgmapi_config_parameters.h
1.23 06/01/15 20:45:04 jonas@eel.(none) +2 -0
Add configuration of page buffer
storage/ndb/include/kernel/ndb_limits.h
1.20 06/01/15 20:45:04 jonas@eel.(none) +12 -0
Hard code some limits (for now)...
mysql-test/ndb/ndbcluster.sh
1.45 06/01/15 20:45:04 jonas@eel.(none) +3 -0
Add configuration of page buffer
mysql-test/ndb/ndb_config_4_node.ini
1.2 06/01/15 20:45:04 jonas@eel.(none) +1 -0
Add configuration of page buffer
mysql-test/ndb/ndb_config_2_node.ini
1.17 06/01/15 20:45:04 jonas@eel.(none) +1 -0
Add configuration of page buffer
mysql-test/ndb/ndb_config_1_node.ini
1.2 06/01/15 20:45:03 jonas@eel.(none) +1 -0
Add configuration of page buffer
# 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: jonas
# Host: eel.(none)
# Root: /home/jonas/src/mysql-5.1-new
--- 1.2/storage/ndb/src/kernel/blocks/pgman.cpp 2006-01-11 09:26:03 +01:00
+++ 1.3/storage/ndb/src/kernel/blocks/pgman.cpp 2006-01-15 20:45:04 +01:00
@@ -84,8 +84,6 @@
m_cleanup_ptr.i = RNIL;
// should be a factor larger than number of pool pages
- m_page_entry_pool.setSize(2000);
- m_page_request_pool.setSize(10000);
m_data_buffer_pool.setSize(1);
m_page_hashlist.setSize(512);
@@ -115,6 +113,18 @@
theConfiguration.getOwnConfigIterator();
ndbrequire(p != 0);
+ Uint64 page_buffer = 64*1024*1024;
+ ndb_mgm_get_int64_parameter(p, CFG_DB_DISK_PAGE_BUFFER_MEMORY, &page_buffer);
+
+ if (page_buffer > 0)
+ {
+ page_buffer /= GLOBAL_PAGE_SIZE; // in pages
+ m_page_entry_pool.setSize(2*page_buffer);
+ m_page_request_pool.setSize(10000);
+ m_param.m_max_pages = page_buffer;
+ m_param.m_max_hot_pages = (page_buffer * 9) / 10;
+ }
+
ReadConfigConf * conf = (ReadConfigConf*)signal->getDataPtrSend();
conf->senderRef = reference();
conf->senderData = senderData;
--- 1.2/storage/ndb/src/kernel/blocks/restore.cpp 2006-01-11 09:26:03 +01:00
+++ 1.3/storage/ndb/src/kernel/blocks/restore.cpp 2006-01-15 20:45:04 +01:00
@@ -31,7 +31,7 @@
#include <dbtup/Dbtup.hpp>
#include <KeyDescriptor.hpp>
-#define PAGES (4*32)
+#define PAGES LCP_RESTORE_BUFFER
Restore::Restore(const Configuration & conf) :
SimulatedBlock(RESTORE, conf),
--- 1.22/storage/ndb/include/mgmapi/mgmapi_config_parameters.h 2005-11-04 21:09:58 +01:00
+++ 1.23/storage/ndb/include/mgmapi/mgmapi_config_parameters.h 2006-01-15 20:45:04 +01:00
@@ -85,6 +85,8 @@
#define CFG_DB_MAX_OPEN_FILES 159
+#define CFG_DB_DISK_PAGE_BUFFER_MEMORY 160
+
#define CFG_NODE_ARBIT_RANK 200
#define CFG_NODE_ARBIT_DELAY 201
--- 1.19/storage/ndb/include/kernel/ndb_limits.h 2005-11-07 12:19:05 +01:00
+++ 1.20/storage/ndb/include/kernel/ndb_limits.h 2006-01-15 20:45:04 +01:00
@@ -141,4 +141,16 @@
*/
#define NDB_SECTION_SEGMENT_SZ 60
+/*
+ * Restore Buffer in pages
+ * 4M
+ */
+#define LCP_RESTORE_BUFFER (4*32)
+
+/*
+ * Log buffer pages
+ * 8M
+ */
+#define LGMAN_LOG_BUFFER (8*32)
+
#endif
--- 1.70/storage/ndb/src/mgmsrv/ConfigInfo.cpp 2005-11-04 21:09:59 +01:00
+++ 1.71/storage/ndb/src/mgmsrv/ConfigInfo.cpp 2006-01-15 20:45:04 +01:00
@@ -761,6 +761,18 @@
STR_VALUE(MAX_INT_RNIL)},
{
+ CFG_DB_DISK_PAGE_BUFFER_MEMORY,
+ "DiskPageBufferMemory",
+ DB_TOKEN,
+ "Number bytes on each "DB_TOKEN_PRINT" node allocated for disk page buffer cache",
+ ConfigInfo::CI_USED,
+ false,
+ ConfigInfo::CI_INT64,
+ "64M",
+ "4M",
+ "1024G" },
+
+ {
CFG_DB_START_PARTIAL_TIMEOUT,
"StartPartialTimeout",
DB_TOKEN,
--- 1.24/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp 2005-11-07 12:19:06 +01:00
+++ 1.25/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp 2006-01-15 20:45:04 +01:00
@@ -93,7 +93,6 @@
addRecSignal(GSN_TESTSIG, &Cmvmi::execTESTSIG);
subscriberPool.setSize(5);
- m_global_page_pool.setSize(1024+256, true);
const ndb_mgm_configuration_iterator * db = theConfig.getOwnConfigIterator();
for(unsigned j = 0; j<LogLevel::LOGLEVEL_CATEGORIES; j++){
@@ -322,6 +321,17 @@
theConfiguration.getOwnConfigIterator();
ndbrequire(p != 0);
+ Uint64 page_buffer = 64*1024*1024;
+ ndb_mgm_get_int64_parameter(p, CFG_DB_DISK_PAGE_BUFFER_MEMORY, &page_buffer);
+
+ page_buffer /= GLOBAL_PAGE_SIZE; // in pages
+ if (page_buffer > 0)
+ {
+ page_buffer += LGMAN_LOG_BUFFER;
+ }
+ page_buffer += LCP_RESTORE_BUFFER;
+ m_global_page_pool.setSize(page_buffer + 64, true);
+
ReadConfigConf * conf = (ReadConfigConf*)signal->getDataPtrSend();
conf->senderRef = reference();
conf->senderData = senderData;
--- 1.44/mysql-test/ndb/ndbcluster.sh 2005-11-24 11:34:27 +01:00
+++ 1.45/mysql-test/ndb/ndbcluster.sh 2006-01-15 20:45:04 +01:00
@@ -58,6 +58,7 @@
ndb_con_op=105000
ndb_dmem=80M
ndb_imem=24M
+ndb_pbmem=32M
VERBOSE=100
NDB_MGM_EXTRA_OPTS=
@@ -90,6 +91,7 @@
ndb_con_op=5000
ndb_dmem=10M
ndb_imem=1M
+ ndb_pbmem=4M
;;
--diskless)
ndb_diskless=1
@@ -206,6 +208,7 @@
-e s,"CHOOSE_HOSTNAME_".*,"$ndb_host",g \
-e s,"CHOOSE_FILESYSTEM","$fs_ndb",g \
-e s,"CHOOSE_PORT_MGM","$ndb_mgmd_port",g \
+ -e s,"CHOOSE_DiskPageBufferMemory","$ndb_pbmem",g \
< "$config_ini" \
> "$fs_ndb/config.ini"
fi
--- 1.16/mysql-test/ndb/ndb_config_2_node.ini 2005-11-24 11:34:27 +01:00
+++ 1.17/mysql-test/ndb/ndb_config_2_node.ini 2006-01-15 20:45:04 +01:00
@@ -11,6 +11,7 @@
MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes
TimeBetweenGlobalCheckpoints= 500
NoOfFragmentLogFiles= 3
+DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
[ndbd]
HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress
--- 1.1/mysql-test/ndb/ndb_config_1_node.ini 2005-11-24 11:34:27 +01:00
+++ 1.2/mysql-test/ndb/ndb_config_1_node.ini 2006-01-15 20:45:03 +01:00
@@ -11,6 +11,7 @@
MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes
TimeBetweenGlobalCheckpoints= 500
NoOfFragmentLogFiles= 3
+DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
[ndbd]
HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress
--- 1.1/mysql-test/ndb/ndb_config_4_node.ini 2005-11-24 11:34:28 +01:00
+++ 1.2/mysql-test/ndb/ndb_config_4_node.ini 2006-01-15 20:45:04 +01:00
@@ -11,6 +11,7 @@
MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes
TimeBetweenGlobalCheckpoints= 500
NoOfFragmentLogFiles= 3
+DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
[ndbd]
HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress
| Thread |
|---|
| • bk commit into 5.1 tree (jonas:1.2055) | jonas | 15 Jan |
