Commit b8e43a1d authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files

ndb - make size of redo log files (fragment log files) configurable 

  using new config variable FragmentLogFileSize (4M - 1G)
parent 8a9bf139

mysql-test/ndb/ndb_config_1_node.ini

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ DataDir= CHOOSE_FILESYSTEM 
MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes

MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes

TimeBetweenGlobalCheckpoints= 500

NoOfFragmentLogFiles= 3

NoOfFragmentLogFiles= 8

FragmentLogFileSize= 6M

DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory



#

mysql-test/ndb/ndb_config_2_node.ini

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ DataDir= CHOOSE_FILESYSTEM 
MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes

MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes

TimeBetweenGlobalCheckpoints= 500

NoOfFragmentLogFiles= 3

NoOfFragmentLogFiles= 4

FragmentLogFileSize=12M

DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory

# the following parametes just function as a small regression

# test that the parameter exists

storage/ndb/include/mgmapi/mgmapi_config_parameters.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 


#define CFG_DB_FILESYSTEM_PATH        125

#define CFG_DB_NO_REDOLOG_FILES       126

#define CFG_DB_REDOLOG_FILE_SIZE      140



#define CFG_DB_LCP_DISC_PAGES_TUP     127

#define CFG_DB_LCP_DISC_PAGES_TUP_SR  128

storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp

+7 −6
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ class Dbtup; 
/*       CONSTANTS OF THE LOG PAGES                                          */

/* ------------------------------------------------------------------------- */

#define ZPAGE_HEADER_SIZE 32

#define ZNO_MBYTES_IN_FILE 16

#define ZPAGE_SIZE 8192

#define ZPAGES_IN_MBYTE 32

#define ZTWOLOG_NO_PAGES_IN_MBYTE 5
@@ -142,7 +141,7 @@ class Dbtup; 
/*       IN THE MBYTE.                                                       */

/* ------------------------------------------------------------------------- */

#define ZFD_HEADER_SIZE 3

#define ZFD_PART_SIZE 48

#define ZFD_MBYTE_SIZE 3

#define ZLOG_HEAD_SIZE 8

#define ZNEXT_LOG_SIZE 2

#define ZABORT_LOG_SIZE 3
@@ -169,7 +168,6 @@ class Dbtup; 
#define ZPOS_LOG_TYPE 0

#define ZPOS_NO_FD 1

#define ZPOS_FILE_NO 2

#define ZMAX_LOG_FILES_IN_PAGE_ZERO 40

/* ------------------------------------------------------------------------- */

/*       THE POSITIONS WITHIN A PREPARE LOG RECORD AND A NEW PREPARE         */

/*       LOG RECORD.                                                         */
@@ -1436,17 +1434,17 @@ public: 
     *       header of each log file.  That information is used during

     *       system restart to find the tail of the log.  

     */

    UintR logLastPrepRef[16];

    UintR *logLastPrepRef;

    /**

     *       The max global checkpoint completed before the mbyte in the

     *       log file was started.  One variable per mbyte.  

     */

    UintR logMaxGciCompleted[16];

    UintR *logMaxGciCompleted;

    /**

     *       The max global checkpoint started before the mbyte in the log

     *       file was started.  One variable per mbyte.

     */

    UintR logMaxGciStarted[16];

    UintR *logMaxGciStarted;

    /**

     *       This variable contains the file name as needed by the file 

     *       system when opening the file.
@@ -2162,6 +2160,7 @@ private: 
  void execSTART_RECREF(Signal* signal);



  void execGCP_SAVEREQ(Signal* signal);

  void execFSOPENREF(Signal* signal);

  void execFSOPENCONF(Signal* signal);

  void execFSCLOSECONF(Signal* signal);

  void execFSWRITECONF(Signal* signal);
@@ -2671,6 +2670,8 @@ private: 
  LogPartRecord *logPartRecord;

  LogPartRecordPtr logPartPtr;

  UintR clogPartFileSize;

  Uint32 clogFileSize; // In MBYTE

  Uint32 cmaxLogFilesInPageZero; //



// Configurable

  LogFileRecord *logFileRecord;

storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp

+3 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ void Dblqh::initData() 
  cLqhTimeOutCheckCount = 0;

  cbookedAccOps = 0;

  m_backup_ptr = RNIL;

  clogFileSize = 16;

  cmaxLogFilesInPageZero = 40;

}//Dblqh::initData()



void Dblqh::initRecords()
@@ -260,6 +262,7 @@ Dblqh::Dblqh(Block_context& ctx): 
  addRecSignal(GSN_START_FRAGREQ, &Dblqh::execSTART_FRAGREQ);

  addRecSignal(GSN_START_RECREF, &Dblqh::execSTART_RECREF);

  addRecSignal(GSN_GCP_SAVEREQ, &Dblqh::execGCP_SAVEREQ);

  addRecSignal(GSN_FSOPENREF, &Dblqh::execFSOPENREF, true);

  addRecSignal(GSN_FSOPENCONF, &Dblqh::execFSOPENCONF);

  addRecSignal(GSN_FSCLOSECONF, &Dblqh::execFSCLOSECONF);

  addRecSignal(GSN_FSWRITECONF, &Dblqh::execFSWRITECONF);