bk commit into 5.0 tree (tomas:1.2500) BUG#28653

[tomas]

Below is the list of changes that have just been committed into a local
5.0 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@stripped, 2007-05-24 21:02:01+02:00, tomas@stripped +3 -0
  Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
  - correction, use recomputed _actual_ redobuffer

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp@stripped, 2007-05-24 21:01:59+02:00, tomas@stripped +3 -2
    Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
    - correction, use recomputed _actual_ redobuffer

  ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@stripped, 2007-05-24 21:01:59+02:00, tomas@stripped +2 -2
    Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
    - correction, use recomputed _actual_ redobuffer

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-05-24 21:01:59+02:00, tomas@stripped +5 -0
    Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
    - correction, use recomputed _actual_ redobuffer

# 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:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.0-ndb

--- 1.47/ndb/src/kernel/blocks/dblqh/Dblqh.hpp	2007-05-08 08:24:18 +02:00
+++ 1.48/ndb/src/kernel/blocks/dblqh/Dblqh.hpp	2007-05-24 21:01:59 +02:00
@@ -2668,7 +2668,8 @@
   UintR cfirstfreeLogFile;
   UintR clogFileFileSize;
 
-#define ZLFO_FILE_SIZE 256            /* MAX 256 OUTSTANDING FILE OPERATIONS */
+#define ZLFO_MIN_FILE_SIZE 256
+// RedoBuffer/32K minimum ZLFO_MIN_FILE_SIZE
   LogFileOperationRecord *logFileOperationRecord;
   LogFileOperationRecordPtr lfoPtr;
   UintR cfirstfreeLfo;
@@ -2685,7 +2686,7 @@
   UintR cfirstfreePageRef;
   UintR cpageRefFileSize;
 
-#define ZSCANREC_FILE_SIZE 100
+// Configurable
   ArrayPool<ScanRecord> c_scanRecordPool;
   ScanRecordPtr scanptr;
   UintR cscanNoFreeRec;

--- 1.18/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp	2007-02-14 06:03:23 +01:00
+++ 1.19/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp	2007-05-24 21:01:59 +02:00
@@ -32,11 +32,11 @@
   chostFileSize = MAX_NDB_NODES;
   clcpFileSize = ZNO_CONCURRENT_LCP;
   clcpLocrecFileSize = ZLCP_LOCREC_FILE_SIZE;
-  clfoFileSize = ZLFO_FILE_SIZE;
+  clfoFileSize = 0;
   clogFileFileSize = 0;
   clogPartFileSize = ZLOG_PART_FILE_SIZE;
   cpageRefFileSize = ZPAGE_REF_FILE_SIZE;
-  cscanrecFileSize = ZSCANREC_FILE_SIZE;
+  cscanrecFileSize = 0;
   ctabrecFileSize = 0;
   ctcConnectrecFileSize = 0;
   ctcNodeFailrecFileSize = MAX_NDB_NODES;

--- 1.106/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-05-08 12:57:33 +02:00
+++ 1.107/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-05-24 21:01:59 +02:00
@@ -7251,6 +7251,11 @@
     return;
   }
 
+  /* maximum number of log file operations */
+  clfoFileSize = clogPageFileSize;
+  if (clfoFileSize < ZLFO_MIN_FILE_SIZE)
+    clfoFileSize = ZLFO_MIN_FILE_SIZE;
+
   // Update timer on tcConnectRecord
   tcConnectptr.p->tcTimer = cLqhTimeOutCount;
   init_acc_ptr_list(scanptr.p);