bzr commit into mysql-5.1-telco-7.0 branch (jonas:3257) Bug#49156

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.4/ based on revid:jonas@stripped

 3257 Jonas Oreland	2009-12-04
      ndb - bug#49156 - account for threads when computing size of DIH fragment pools, remove dead code (that I actually thought was the problem :-)

    modified:
      storage/ndb/include/kernel/kernel_config_parameters.h
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/vm/Configuration.cpp
=== modified file 'storage/ndb/include/kernel/kernel_config_parameters.h'
--- a/storage/ndb/include/kernel/kernel_config_parameters.h	2009-10-15 12:36:53 +0000
+++ b/storage/ndb/include/kernel/kernel_config_parameters.h	2009-12-04 12:45:23 +0000
@@ -36,7 +36,6 @@
 
 #define CFG_DIH_API_CONNECT   (PRIVATE_BASE + 15)
 #define CFG_DIH_FRAG_CONNECT  (PRIVATE_BASE + 17)
-#define CFG_DIH_MORE_NODES    (PRIVATE_BASE + 18)
 #define CFG_DIH_REPLICAS      (PRIVATE_BASE + 19)
 #define CFG_DIH_TABLE         (PRIVATE_BASE + 20)
 

=== modified file 'storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	2009-11-02 17:15:29 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	2009-12-04 12:45:23 +0000
@@ -69,6 +69,7 @@
 // Error Codes for Add Table
 // --------------------------------------
 #define ZREPLERROR1 306
+#define ZREPLERROR2 307
 
 // --------------------------------------
 // Crash Codes

=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2009-11-05 21:14:04 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2009-12-04 12:45:23 +0000
@@ -7541,7 +7541,7 @@ void Dbdih::execDIADDTABREQ(Signal* sign
   }//if
   if (noFragments > cremainingfrags) {
     jam();
-    addtabrefuseLab(signal, connectPtr, ZREPLERROR1);
+    addtabrefuseLab(signal, connectPtr, ZREPLERROR2);
     return;
   }//if
   

=== modified file 'storage/ndb/src/kernel/vm/Configuration.cpp'
--- a/storage/ndb/src/kernel/vm/Configuration.cpp	2009-11-09 13:29:20 +0000
+++ b/storage/ndb/src/kernel/vm/Configuration.cpp	2009-12-04 12:45:23 +0000
@@ -788,23 +788,14 @@ Configuration::calcSizeAlt(ConfigValues 
     cfg.put(CFG_DIH_API_CONNECT, 
 	    2 * noOfTransactions);
     
-    Uint32 noFragPerTable= ((noOfDBNodes + NO_OF_FRAGS_PER_CHUNK - 1) >>
-                           LOG_NO_OF_FRAGS_PER_CHUNK) <<
-                           LOG_NO_OF_FRAGS_PER_CHUNK;
+    Uint32 noFragPerTable= (((noOfDBNodes * lqhInstances) + 
+                             NO_OF_FRAGS_PER_CHUNK - 1) >>
+                            LOG_NO_OF_FRAGS_PER_CHUNK) <<
+      LOG_NO_OF_FRAGS_PER_CHUNK;
 
     cfg.put(CFG_DIH_FRAG_CONNECT, 
 	    noFragPerTable *  noOfMetaTables);
     
-    int temp;
-    temp = noOfReplicas - 2;
-    if (temp < 0)
-      temp = 1;
-    else
-      temp++;
-    cfg.put(CFG_DIH_MORE_NODES, 
-	    temp * NO_OF_FRAG_PER_NODE *
-	    noOfMetaTables *  noOfDBNodes);
-
     cfg.put(CFG_DIH_REPLICAS, 
 	    NO_OF_FRAG_PER_NODE * noOfMetaTables *
 	    noOfDBNodes * noOfReplicas * lqhInstances);


Attachment: [text/bzr-bundle] bzr/[e-mail]