bk commit into 4.1 tree (jonas:1.2506)

[jonas]

Below is the list of changes that have just been committed into a local
4.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.2506 06/04/26 15:57:48 jonas@stripped +3 -0
  ndb -
    Unleash backup to write more than 32k at a time
    Using parameter BackupMaxWriteSize
    (greatly affect LCP time in 5.1, set default value to 256k)

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.62 06/04/26 15:57:46 jonas@stripped +13 -1
    Add config fro max write size in backup

  ndb/src/kernel/blocks/backup/BackupInit.cpp
    1.13 06/04/26 15:57:46 jonas@stripped +3 -2
    Unleash backup to write more than 32k at a time

  ndb/include/mgmapi/mgmapi_config_parameters.h
    1.18 06/04/26 15:57:46 jonas@stripped +1 -0
    Add config fro max write size in backup

# 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:	perch.ndb.mysql.com
# Root:	/home/jonas/src/41-work

--- 1.17/ndb/include/mgmapi/mgmapi_config_parameters.h	2006-01-26 10:16:20 +01:00
+++ 1.18/ndb/include/mgmapi/mgmapi_config_parameters.h	2006-04-26 15:57:46 +02:00
@@ -65,6 +65,7 @@
 #define CFG_DB_BACKUP_DATA_BUFFER_MEM     134
 #define CFG_DB_BACKUP_LOG_BUFFER_MEM      135
 #define CFG_DB_BACKUP_WRITE_SIZE          136
+#define CFG_DB_BACKUP_MAX_WRITE_SIZE      139
 
 #define CFG_LOG_DESTINATION           147
 

--- 1.61/ndb/src/mgmsrv/ConfigInfo.cpp	2005-09-05 16:33:37 +02:00
+++ 1.62/ndb/src/mgmsrv/ConfigInfo.cpp	2006-04-26 15:57:46 +02:00
@@ -1191,7 +1191,19 @@
     false,
     ConfigInfo::CI_INT,
     "32K",
-    "0",
+    "2K",
+    STR_VALUE(MAX_INT_RNIL) },
+
+  { 
+    CFG_DB_BACKUP_MAX_WRITE_SIZE,
+    "BackupMaxWriteSize",
+    DB_TOKEN,
+    "Max size of filesystem writes made by backup (in bytes)",
+    ConfigInfo::CI_USED,
+    false,
+    ConfigInfo::CI_INT,
+    "256K",
+    "2K",
     STR_VALUE(MAX_INT_RNIL) },
 
   /***************************************************************************

--- 1.12/ndb/src/kernel/blocks/backup/BackupInit.cpp	2006-04-10 13:45:31 +02:00
+++ 1.13/ndb/src/kernel/blocks/backup/BackupInit.cpp	2006-04-26 15:57:46 +02:00
@@ -66,15 +66,16 @@
 
   Uint32 szDataBuf = (2 * 1024 * 1024);
   Uint32 szLogBuf = (2 * 1024 * 1024);
-  Uint32 szWrite = 32768;
+  Uint32 szWrite = 32768, maxWriteSize = (256 * 1024);
   ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_DATA_BUFFER_MEM, &szDataBuf);
   ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_LOG_BUFFER_MEM, &szLogBuf);
   ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_WRITE_SIZE, &szWrite);
+  ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_MAX_WRITE_SIZE, &maxWriteSize);
   
   c_defaults.m_logBufferSize = szLogBuf;
   c_defaults.m_dataBufferSize = szDataBuf;
   c_defaults.m_minWriteSize = szWrite;
-  c_defaults.m_maxWriteSize = szWrite;
+  c_defaults.m_maxWriteSize = maxWriteSize;
   
   { // Init all tables
     ArrayList<Table> tables(c_tablePool);