Commit 47d5fb91 authored by tomas@poseidon.mysql.com's avatar tomas@poseidon.mysql.com
Browse files

Bug #28751 Lots of memory locked in memory causes high kswapd 

- add odirect option for lcp+backup+redo log to lower CPU/kswapd usage
- writing odirect removes need for kernel write buffers avoiding kswapd to kick in
parent 8c35f44b

mysql-test/ndb/ndb_config_2_node.ini

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes 
TimeBetweenGlobalCheckpoints= 500

NoOfFragmentLogFiles= 3

DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory

ODirect= 1

# the following parametes just function as a small regression

# test that the parameter exists

InitialNoOfOpenFiles= 27

storage/ndb/include/mgmapi/mgmapi_config_parameters.h

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ 


#define CFG_DB_MEMREPORT_FREQUENCY    166



#define CFG_DB_O_DIRECT               168



#define CFG_DB_SGA                    198 /* super pool mem */

#define CFG_DB_DATA_MEM_2             199 /* used in special build in 5.1 */

storage/ndb/include/ndb_global.h.in

+2 −0
Original line number Diff line number Diff line
@@ -146,4 +146,6 @@ extern "C" { 
#define MAX(x,y) (((x)>(y))?(x):(y))

#endif



#define NDB_O_DIRECT_WRITE_ALIGNMENT 512



#endif

storage/ndb/src/kernel/blocks/backup/Backup.cpp

+42 −7
Original line number Diff line number Diff line
@@ -2761,6 +2761,8 @@ Backup::openFiles(Signal* signal, BackupRecordPtr ptr) 
  c_backupFilePool.getPtr(filePtr, ptr.p->dataFilePtr);

  filePtr.p->m_flags |= BackupFile::BF_OPENING;



  if (c_defaults.m_o_direct)

    req->fileFlags |= FsOpenReq::OM_DIRECT;

  req->userPointer = filePtr.i;

  FsOpenReq::setVersion(req->fileNumber, 2);

  FsOpenReq::setSuffix(req->fileNumber, FsOpenReq::S_DATA);
@@ -3735,12 +3737,31 @@ Backup::OperationRecord::newFragment(Uint32 tableId, Uint32 fragNo) 
}



bool

Backup::OperationRecord::fragComplete(Uint32 tableId, Uint32 fragNo)

Backup::OperationRecord::fragComplete(Uint32 tableId, Uint32 fragNo, bool fill_record)

{

  Uint32 * tmp;

  const Uint32 footSz = sizeof(BackupFormat::DataFile::FragmentFooter) >> 2;

  Uint32 sz = footSz + 1;



  if(dataBuffer.getWritePtr(&tmp, footSz + 1)) {

  if (fill_record)

  {

    Uint32 * new_tmp;

    if (!dataBuffer.getWritePtr(&tmp, sz))

      return false;

    new_tmp = tmp + sz;



    if ((UintPtr)new_tmp & (sizeof(Page32)-1))

    {

      /* padding is needed to get full write */

      new_tmp += 2 /* to fit empty header minimum 2 words*/;

      new_tmp = (Uint32 *)(((UintPtr)new_tmp + sizeof(Page32)-1) &

                            ~(UintPtr)(sizeof(Page32)-1));

      /* new write sz */

      sz = new_tmp - tmp;

    }

  }



  if(dataBuffer.getWritePtr(&tmp, sz)) {

    jam();

    * tmp = 0; // Finish record stream

    tmp++;
@@ -3752,7 +3773,17 @@ Backup::OperationRecord::fragComplete(Uint32 tableId, Uint32 fragNo) 
    foot->FragmentNo    = htonl(fragNo);

    foot->NoOfRecords   = htonl(noOfRecords);

    foot->Checksum      = htonl(0);

    dataBuffer.updateWritePtr(footSz + 1);



    if (sz != footSz + 1)

    {

      tmp += footSz;

      memset(tmp, 0, (sz - footSz - 1) * 4);

      *tmp = htonl(BackupFormat::EMPTY_ENTRY);

      tmp++;

      *tmp = htonl(sz - footSz - 1);

    }



    dataBuffer.updateWritePtr(sz);

    return true;

  }//if

  return false;
@@ -3854,8 +3885,13 @@ Backup::fragmentCompleted(Signal* signal, BackupFilePtr filePtr) 
    return;

  }//if

    

  BackupRecordPtr ptr LINT_SET_PTR;

  c_backupPool.getPtr(ptr, filePtr.p->backupPtr);



  OperationRecord & op = filePtr.p->operation;

  if(!op.fragComplete(filePtr.p->tableId, filePtr.p->fragmentNo)) {

  if(!op.fragComplete(filePtr.p->tableId, filePtr.p->fragmentNo,

                      c_defaults.m_o_direct))

  {

    jam();

    signal->theData[0] = BackupContinueB::BUFFER_FULL_FRAG_COMPLETE;

    signal->theData[1] = filePtr.i;
@@ -3865,9 +3901,6 @@ Backup::fragmentCompleted(Signal* signal, BackupFilePtr filePtr) 
  

  filePtr.p->m_flags &= ~(Uint32)BackupFile::BF_SCAN_THREAD;

  

  BackupRecordPtr ptr LINT_SET_PTR;

  c_backupPool.getPtr(ptr, filePtr.p->backupPtr);



  if (ptr.p->is_lcp())

  {

    ptr.p->slaveState.setState(STOPPING);
@@ -4905,6 +4938,8 @@ Backup::lcp_open_file(Signal* signal, BackupRecordPtr ptr) 
    FsOpenReq::OM_CREATE | 

    FsOpenReq::OM_APPEND |

    FsOpenReq::OM_AUTOSYNC;

  if (c_defaults.m_o_direct)

    req->fileFlags |= FsOpenReq::OM_DIRECT;

  FsOpenReq::v2_setCount(req->fileNumber, 0xFFFFFFFF);

  req->auto_sync_size = c_defaults.m_disk_synch_size;

storage/ndb/src/kernel/blocks/backup/Backup.hpp

+2 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ public: 
     * Once per fragment

     */

    bool newFragment(Uint32 tableId, Uint32 fragNo);

    bool fragComplete(Uint32 tableId, Uint32 fragNo);

    bool fragComplete(Uint32 tableId, Uint32 fragNo, bool fill_record);

    

    /**

     * Once per scan frag (next) req/conf
@@ -534,6 +534,7 @@ public: 
    Uint32 m_disk_write_speed;

    Uint32 m_disk_synch_size;

    Uint32 m_diskless;

    Uint32 m_o_direct;

  };

  

  /**