Commit c54cb75c authored by unknown's avatar unknown
Browse files

- to ensure maximum available memory for TUP DataMem 

moved all array allocation to READ_CONFIG_REQ (except CMVI which was not possible)
reorganized READ_CONFIG_REQ call order in ndb cntr to make sure TUP allocates first
moved allocations internally in TUP to allocate DataMem first
parent d9e5eaa5

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

+100 −0
Original line number Diff line number Diff line
@@ -72,6 +72,106 @@ static Uint32 g_TypeOfStart = NodeState::ST_ILLEGAL_TYPE; 
#define SEND_BACKUP_STARTED_FLAG(A) (((A) & 0x3) > 0)

#define SEND_BACKUP_COMPLETED_FLAG(A) (((A) & 0x3) > 1)



void 

Backup::execREAD_CONFIG_REQ(Signal* signal)

{

  jamEntry();



  const ReadConfigReq * req = (ReadConfigReq*)signal->getDataPtr();



  Uint32 ref = req->senderRef;

  Uint32 senderData = req->senderData;



  const ndb_mgm_configuration_iterator * p = 

    theConfiguration.getOwnConfigIterator();

  ndbrequire(p != 0);



  c_nodePool.setSize(MAX_NDB_NODES);



  Uint32 noBackups = 0, noTables = 0, noAttribs = 0;

  ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_DISCLESS, &m_diskless));

  ndb_mgm_get_int_parameter(p, CFG_DB_PARALLEL_BACKUPS, &noBackups);

  //  ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_NO_TABLES, &noTables));

  ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DICT_TABLE, &noTables));

  ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_NO_ATTRIBUTES, &noAttribs));



  noAttribs++; //RT 527 bug fix



  c_backupPool.setSize(noBackups);

  c_backupFilePool.setSize(3 * noBackups);

  c_tablePool.setSize(noBackups * noTables);

  c_attributePool.setSize(noBackups * noAttribs);

  c_triggerPool.setSize(noBackups * 3 * noTables);



  // 2 = no of replicas

  c_fragmentPool.setSize(noBackups * 2 * NO_OF_FRAG_PER_NODE * noTables);

  

  Uint32 szMem = 0;

  ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_MEM, &szMem);

  Uint32 noPages = (szMem + sizeof(Page32) - 1) / sizeof(Page32);

  // We need to allocate an additional of 2 pages. 1 page because of a bug in

  // ArrayPool and another one for DICTTAINFO.

  c_pagePool.setSize(noPages + NO_OF_PAGES_META_FILE + 2); 



  Uint32 szDataBuf = (2 * 1024 * 1024);

  Uint32 szLogBuf = (2 * 1024 * 1024);

  Uint32 szWrite = 32768;

  ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_DATA_BUFFER_MEM, &szDataBuf);

  ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_LOG_BUFFER_MEM, &szLogBuf);

  ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_WRITE_SIZE, &szWrite);

  

  c_defaults.m_logBufferSize = szLogBuf;

  c_defaults.m_dataBufferSize = szDataBuf;

  c_defaults.m_minWriteSize = szWrite;

  c_defaults.m_maxWriteSize = szWrite;

  

  { // Init all tables

    ArrayList<Table> tables(c_tablePool);

    TablePtr ptr;

    while(tables.seize(ptr)){

      new (ptr.p) Table(c_attributePool, c_fragmentPool);

    }

    tables.release();

  }



  {

    ArrayList<BackupFile> ops(c_backupFilePool);

    BackupFilePtr ptr;

    while(ops.seize(ptr)){

      new (ptr.p) BackupFile(* this, c_pagePool);

    }

    ops.release();

  }

  

  {

    ArrayList<BackupRecord> recs(c_backupPool);

    BackupRecordPtr ptr;

    while(recs.seize(ptr)){

      new (ptr.p) BackupRecord(* this, c_pagePool, c_tablePool, 

			       c_backupFilePool, c_triggerPool);

    }

    recs.release();

  }



  // Initialize BAT for interface to file system

  {

    Page32Ptr p;

    ndbrequire(c_pagePool.seizeId(p, 0));

    c_startOfPages = (Uint32 *)p.p;

    c_pagePool.release(p);

    

    NewVARIABLE* bat = allocateBat(1);

    bat[0].WA = c_startOfPages;

    bat[0].nrr = c_pagePool.getSize()*sizeof(Page32)/sizeof(Uint32);

  }

  

  ReadConfigConf * conf = (ReadConfigConf*)signal->getDataPtrSend();

  conf->senderRef = reference();

  conf->senderData = senderData;

  sendSignal(ref, GSN_READ_CONFIG_CONF, signal, 

	     ReadConfigConf::SignalLength, JBB);

}



void

Backup::execSTTOR(Signal* signal) 

{

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

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ public: 
protected:



  void execSTTOR(Signal* signal);

  void execREAD_CONFIG_REQ(Signal* signal);

  void execDUMP_STATE_ORD(Signal* signal);

  void execREAD_NODESCONF(Signal* signal);

  void execNODE_FAILREP(Signal* signal);

ndb/src/kernel/blocks/backup/BackupInit.cpp

+1 −81
Original line number Diff line number Diff line
@@ -34,90 +34,10 @@ Backup::Backup(const Configuration & conf) : 
{

  BLOCK_CONSTRUCTOR(Backup);

  

  c_nodePool.setSize(MAX_NDB_NODES);

  c_masterNodeId = getOwnNodeId();

  

  const ndb_mgm_configuration_iterator * p = conf.getOwnConfigIterator();

  ndbrequire(p != 0);



  Uint32 noBackups = 0, noTables = 0, noAttribs = 0;

  ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_DISCLESS, &m_diskless));

  ndb_mgm_get_int_parameter(p, CFG_DB_PARALLEL_BACKUPS, &noBackups);

  //  ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_NO_TABLES, &noTables));

  ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DICT_TABLE, &noTables));

  ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_NO_ATTRIBUTES, &noAttribs));



  noAttribs++; //RT 527 bug fix



  c_backupPool.setSize(noBackups);

  c_backupFilePool.setSize(3 * noBackups);

  c_tablePool.setSize(noBackups * noTables);

  c_attributePool.setSize(noBackups * noAttribs);

  c_triggerPool.setSize(noBackups * 3 * noTables);



  // 2 = no of replicas

  c_fragmentPool.setSize(noBackups * 2 * NO_OF_FRAG_PER_NODE * noTables);

  

  Uint32 szMem = 0;

  ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_MEM, &szMem);

  Uint32 noPages = (szMem + sizeof(Page32) - 1) / sizeof(Page32);

  // We need to allocate an additional of 2 pages. 1 page because of a bug in

  // ArrayPool and another one for DICTTAINFO.

  c_pagePool.setSize(noPages + NO_OF_PAGES_META_FILE + 2); 



  Uint32 szDataBuf = (2 * 1024 * 1024);

  Uint32 szLogBuf = (2 * 1024 * 1024);

  Uint32 szWrite = 32768;

  ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_DATA_BUFFER_MEM, &szDataBuf);

  ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_LOG_BUFFER_MEM, &szLogBuf);

  ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_WRITE_SIZE, &szWrite);

  

  c_defaults.m_logBufferSize = szLogBuf;

  c_defaults.m_dataBufferSize = szDataBuf;

  c_defaults.m_minWriteSize = szWrite;

  c_defaults.m_maxWriteSize = szWrite;

  

  { // Init all tables

    ArrayList<Table> tables(c_tablePool);

    TablePtr ptr;

    while(tables.seize(ptr)){

      new (ptr.p) Table(c_attributePool, c_fragmentPool);

    }

    tables.release();

  }



  {

    ArrayList<BackupFile> ops(c_backupFilePool);

    BackupFilePtr ptr;

    while(ops.seize(ptr)){

      new (ptr.p) BackupFile(* this, c_pagePool);

    }

    ops.release();

  }

  

  {

    ArrayList<BackupRecord> recs(c_backupPool);

    BackupRecordPtr ptr;

    while(recs.seize(ptr)){

      new (ptr.p) BackupRecord(* this, c_pagePool, c_tablePool, 

			       c_backupFilePool, c_triggerPool);

    }

    recs.release();

  }



  // Initialize BAT for interface to file system

  {

    Page32Ptr p;

    ndbrequire(c_pagePool.seizeId(p, 0));

    c_startOfPages = (Uint32 *)p.p;

    c_pagePool.release(p);

    

    NewVARIABLE* bat = allocateBat(1);

    bat[0].WA = c_startOfPages;

    bat[0].nrr = c_pagePool.getSize()*sizeof(Page32)/sizeof(Uint32);

  }

  

  // Add received signals

  addRecSignal(GSN_READ_CONFIG_REQ, &Backup::execREAD_CONFIG_REQ);

  addRecSignal(GSN_STTOR, &Backup::execSTTOR);

  addRecSignal(GSN_DUMP_STATE_ORD, &Backup::execDUMP_STATE_ORD);

  addRecSignal(GSN_READ_NODESCONF, &Backup::execREAD_NODESCONF);

ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp

+22 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ Cmvmi::Cmvmi(const Configuration & conf) : 
  addRecSignal(GSN_SET_LOGLEVELORD,  &Cmvmi::execSET_LOGLEVELORD);

  addRecSignal(GSN_EVENT_REP,  &Cmvmi::execEVENT_REP);

  addRecSignal(GSN_STTOR,  &Cmvmi::execSTTOR);

  addRecSignal(GSN_READ_CONFIG_REQ,  &Cmvmi::execREAD_CONFIG_REQ);

  addRecSignal(GSN_CLOSE_COMREQ,  &Cmvmi::execCLOSE_COMREQ);

  addRecSignal(GSN_ENABLE_COMORD,  &Cmvmi::execENABLE_COMORD);

  addRecSignal(GSN_OPEN_COMREQ,  &Cmvmi::execOPEN_COMREQ);
@@ -307,6 +308,27 @@ void Cmvmi::sendSTTORRY(Signal* signal) 
}//Cmvmi::sendSTTORRY





void 

Cmvmi::execREAD_CONFIG_REQ(Signal* signal)

{

  jamEntry();



  const ReadConfigReq * req = (ReadConfigReq*)signal->getDataPtr();



  Uint32 ref = req->senderRef;

  Uint32 senderData = req->senderData;



  const ndb_mgm_configuration_iterator * p = 

    theConfiguration.getOwnConfigIterator();

  ndbrequire(p != 0);



  ReadConfigConf * conf = (ReadConfigConf*)signal->getDataPtrSend();

  conf->senderRef = reference();

  conf->senderData = senderData;

  sendSignal(ref, GSN_READ_CONFIG_CONF, signal, 

	     ReadConfigConf::SignalLength, JBB);

}



void Cmvmi::execSTTOR(Signal* signal)

{

  Uint32 theStartPhase  = signal->theData[1];

ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ private: 
  void execNDB_TAMPER(Signal* signal);

  void execSET_LOGLEVELORD(Signal* signal);

  void execEVENT_REP(Signal* signal);

  void execREAD_CONFIG_REQ(Signal* signal);

  void execSTTOR(Signal* signal);

  void execCLOSE_COMREQ(Signal* signal);

  void execENABLE_COMORD(Signal* signal);