From: Jonas Oreland Date: December 4 2009 12:45pm Subject: bzr commit into mysql-5.1-telco-7.0 branch (jonas:3257) Bug#49156 List-Archive: http://lists.mysql.com/commits/92875 X-Bug: 49156 Message-Id: <20091204124530.786B9A4B5DE@perch.localdomain> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_nZ+76YnmhZL6dUqaUJEjag)" --Boundary_(ID_nZ+76YnmhZL6dUqaUJEjag) MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Content-disposition: inline #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); --Boundary_(ID_nZ+76YnmhZL6dUqaUJEjag) MIME-version: 1.0 Content-type: text/bzr-bundle; CHARSET=US-ASCII; name="bzr/jonas@stripped" Content-transfer-encoding: 7BIT Content-disposition: inline; filename="bzr/jonas@stripped" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jonas@stripped # target_branch: file:///home/jonas/src/telco-6.4/ # testament_sha1: 0390f2cc5c7d57db27ea46e66f1fe8c9dd99d7fb # timestamp: 2009-12-04 13:45:30 +0100 # source_branch: file:///home/jonas/src/64-local/ # base_revision_id: jonas@stripped # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVegxogAA25/gFAQAGBZf/// f//eEL////BgB1307uO9gAs77eehRr22gZDhJSAp6noNTxQeo9QzU2p6anqGgANAaaD1ABqp6jaj TTI9TQep6mgD1BkDQ0NAAAABKQjITxKaep6h6mTymhoAAAAAAAEimpqNNNKeahtJiamjNE0bTSDI YmgGmhoyBlUNPUNABoyGgAMgBkGQAAAEkgmkxMTTQ000JhMhJ5Qm1PQRjSM1GgbUsuK2148u6ZtE k+zu+/T2dpVXu6b+GJJoa2XvhncoRY0p2SuDnOSmaN8xChHBgUUfn2zfH/Vnv8vjyR+gWgzMbbTa /P4SjudfHkzGMc8jpndhsY5NTab296UaNg7MG1j1Yuh5dkomeDLXe/cHVTL0tXXip/kBeiqAws/R AAaKrCCqh0TDnLcQme2244PBGU/SJWKAgyxVDWoAEFmm2kKbHHWczGVtVzb09FTxhnfbXTulEopi JINNmTXBU2DC59RnHMeRc7wWsvNNpnnmgCPMV9CvQ/pcH0ovCmyQHRgGYV0NL3Vs/kYuAgMkEB85 Idecyg1kpmAnSThOJOL52fmCCCkmSCFJBEtByXAVs8KUMKZNyvFJJ5IWCs0jhJYqgXFLYxtW5jB3 QhenEaiRjINqHSkhTPFfLirgDmQQnIjzYDFoZh6DWW6Lm+TtBc9xHgCVqSmrgaCsgCom4aoieCqB +p8jXnGutJozyScFZiPHExT5jrLbb7AVLZ4qMaDDm4gZ6zA4mdbYorL7OJWWk40xqM6yKz02E56F nHK7/nQuzFxQMP0D9raNhdA1vAYTJkXuEE4nZJ54lRAiC1D1cKiJSUr7r0ZUGBIYsJx3QoP+1lbj RmeG5siRmKfJ5fqBMQWRm4FY0lSQOdJO9i4ZoZ6yghmzjux2KCbQvB5iqLShRtsKiZOJyyNBZUPJ E9mbLQKQcj+NB4lwk/mbCmmk4kwJxphY+UPt3mgxpliOBynj02QBxU4WItYtZsLylhsw41jU+l98 9M+p9dp3LaiRAmGFcyozKgdjwymLr1ZIuHjjMUgrx9bTR212UIjS8mOZLAEGRc5JrBaipw8kpRrI WgkCkyisTTffgg2eAmhiixGJKfPq85qjWXXWwPcyzhapGYWuKRJm5qBkNA934BU+TXRORdeCKIBH Ko8QNDH8/p3p+mBof0D1LU+rVZ6Jo786hvcV21QmbNI99rPEcbFGSEJlx35mjbUUHY/AmEEeDX6l 2IEGCUCEfZdIqisYwCpPY+hNI2FO5muhwMKVe5jn6R3Uaxo6TmKvAkdQL6y4+AyoKB58+np+PzvL qjh8GxXgxAwOeIwL55jdlj+sw9DVjRy/mYfEuSU/6MCKpMZk2BV6/hTwOI4+Jy7hpfLBYW27phJD kUKUNPAoHjs03yx8pcOxefUIrO9453ctN/kcbzYTFh6Hgrtr4mRNwoOv94OcbjmRh1w+QIY3qcdp /YiLXU3sWgqoQtDc8uJjjiE4phdB2JpBOcMFxcGRSdTPs5G3Z+x/iaawoLz0vRSBzKidZq7nuOw/ T48A8/GzkQB1y6lDcbIVExKgqYoQZMXYwrVtSoUNRBVBTFhgJiHrjwucqVEVB66F0vC9Mglol+eq 5kn7gm/lZzNWdZmqSHHhQghuwwQbTObDIxNZiTG+JI4Hn5yPftO5IgiorPoMEYbDwF8g8wxRs3FW s9Tlmki+fzjHtttVJxehRy9RxKErLxPvoW+cJk10HA1vFCxxRlEOzS7fVfW4Ul8kXK0/JGQD9R2O WcF2VBsNef2BUE6MleycBt9FtIIUxgnUFKTsj3h8UuQcAK++mCNhI1Y1iHEYsN84Rg780BqZ2khM JlvAFJxaTWclGdYC/LQNLcKSZoGWFRecwXkVlvukCMKsBPXQpJhXMVAUDIbqxduVMbNuqzauTEl5 vIOxRMgBGBo1MZvzkqk3CVKyiqZxnuOG/RdN4oflh/AIaiEnOYZdj2cgs4ochHWokzJfv2B0d2xJ wnk3iRycbT2JY6K/WX+Z41MkzAbziPV8ulimNHMh+t3QjbdUCaQkOEvn6gjVBfuy3d6EaMEDJ7lT ol0xPIkmEwmDqhRI6N6YO/fsLHKSKw7k+emxkwxxhVUN9VHU9u507nSzcawRzTHBxjq3UDxj+0AI jb4r01qhWS04b5fDbQCzbfsgGLJ+8uKr9ihLRtTkEZmTZr285lmp2FcjPvEsA5gikjZMvluZishF iOPzJFsBULD60bbbbbxgjlLiv4F450uI1x9F5E3SdtwidoB1Aw07TvD22VYAVcdz1w4DjPavQatB avtZSYXHT4wOER1Bo89d04WuPJrB9mCjXfsIlhA6FFhGiZQ3cltSOX2GsF7tngChkPNvsCduVh1q NI1pyUwx90EGJmplufwKC0mho7cT3nAq8Ggho3AkkZioSyFw1RVivYC5n+LuSKcKEgr0GNEA --Boundary_(ID_nZ+76YnmhZL6dUqaUJEjag)--