Commit ebf57797 authored by unknown's avatar unknown
Browse files

ndb dd - 

  Change default page buffer cache size


mysql-test/ndb/ndb_config_1_node.ini:
  Add configuration of page buffer
mysql-test/ndb/ndb_config_2_node.ini:
  Add configuration of page buffer
mysql-test/ndb/ndb_config_4_node.ini:
  Add configuration of page buffer
mysql-test/ndb/ndbcluster.sh:
  Add configuration of page buffer
storage/ndb/include/kernel/ndb_limits.h:
  Hard code some limits (for now)...
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Add configuration of page buffer
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Add configuration of page buffer
storage/ndb/src/kernel/blocks/pgman.cpp:
  Add configuration of page buffer
storage/ndb/src/kernel/blocks/restore.cpp:
  Add configuration of page buffer
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Change default page buffer caches from 1M (only used for testing) to realistic 64M
parent 1d5a5ae0

mysql-test/ndb/ndb_config_1_node.ini

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes 
MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes

TimeBetweenGlobalCheckpoints= 500

NoOfFragmentLogFiles= 3

DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory



[ndbd]

HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress

mysql-test/ndb/ndb_config_2_node.ini

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes 
MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes

TimeBetweenGlobalCheckpoints= 500

NoOfFragmentLogFiles= 3

DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory



[ndbd]

HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress

mysql-test/ndb/ndb_config_4_node.ini

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes 
MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes

TimeBetweenGlobalCheckpoints= 500

NoOfFragmentLogFiles= 3

DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory



[ndbd]

HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress

mysql-test/ndb/ndbcluster.sh

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ ndb_no_attr=2048 
ndb_con_op=105000

ndb_dmem=80M

ndb_imem=24M

ndb_pbmem=32M



VERBOSE=100

NDB_MGM_EXTRA_OPTS=
@@ -90,6 +91,7 @@ while test $# -gt 0; do 
     ndb_con_op=5000

     ndb_dmem=10M

     ndb_imem=1M

     ndb_pbmem=4M

     ;;

    --diskless)

     ndb_diskless=1
@@ -206,6 +208,7 @@ if [ $initial_ndb ] ; then 
    -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

storage/ndb/include/kernel/ndb_limits.h

+12 −0
Original line number Diff line number Diff line
@@ -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