Commit 0d340013 authored by unknown's avatar unknown
Browse files

bug#16455 - ndb crash when running of of rope pool 


storage/ndb/include/kernel/signaldata/CreateTable.hpp:
  New error code for rope pool
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  New error code for rope pool
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  New error code for rope pool
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  New error code for rope pool
storage/ndb/src/ndbapi/ndberror.c:
  New error code for rope pool
parent 14b62752

storage/ndb/include/kernel/signaldata/CreateTable.hpp

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ public: 
    InvalidTablespace = 755,

    VarsizeBitfieldNotSupported = 757,

    NotATablespace = 758,

    InvalidTablespaceVersion = 759

    InvalidTablespaceVersion = 759,

    OutOfStringBuffer = 773

  };



private:

storage/ndb/include/mgmapi/mgmapi_config_parameters.h

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


#define CFG_DB_MAX_OPEN_FILES         159



#define CFG_DB_STRING_MEMORY          161



#define CFG_NODE_ARBIT_RANK           200

#define CFG_NODE_ARBIT_DELAY          201

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp

+36 −6
Original line number Diff line number Diff line
@@ -2016,7 +2016,29 @@ void Dbdict::execREAD_CONFIG_REQ(Signal* signal) 
  c_schemaOp.setSize(8);

  //c_opDropObj.setSize(8);

  c_Trans.setSize(8);

  c_rope_pool.setSize(100000/28);



  Uint32 rps = 0;

  rps += tablerecSize * (MAX_TAB_NAME_SIZE + MAX_FRM_DATA_SIZE);

  rps += attributesize * (MAX_ATTR_NAME_SIZE + MAX_ATTR_DEFAULT_VALUE_SIZE);

  rps += c_maxNoOfTriggers * MAX_TAB_NAME_SIZE;

  rps += (10 + 10) * MAX_TAB_NAME_SIZE;



  Uint32 sm = 5;

  ndb_mgm_get_int_parameter(p, CFG_DB_STRING_MEMORY, &sm);

  if (sm == 0)

    sm = 5;

  

  Uint32 sb = 0;

  if (sm < 100)

  {

    sb = (rps * sm) / 100;

  }

  else

  {

    sb = sm;

  }

  

  c_rope_pool.setSize(sb/28 + 100);

  

  // Initialize BAT for interface to file system

  NewVARIABLE* bat = allocateBat(2);
@@ -5795,7 +5817,8 @@ void Dbdict::handleTabInfoInit(SimpleProperties::Reader & it, 
  

  { 

    Rope name(c_rope_pool, tablePtr.p->tableName);

    ndbrequire(name.assign(tableDesc.TableName, tableNameLength, name_hash));

    tabRequire(name.assign(tableDesc.TableName, tableNameLength, name_hash),

	       CreateTableRef::OutOfStringBuffer);

  }



  Ptr<DictObject> obj_ptr;
@@ -5827,7 +5850,8 @@ void Dbdict::handleTabInfoInit(SimpleProperties::Reader & it, 
  

  {

    Rope frm(c_rope_pool, tablePtr.p->frmData);

    ndbrequire(frm.assign(tableDesc.FrmData, tableDesc.FrmLen));

    tabRequire(frm.assign(tableDesc.FrmData, tableDesc.FrmLen),

	       CreateTableRef::OutOfStringBuffer);

  }

  

  tablePtr.p->ngLen = tableDesc.FragmentDataLen;
@@ -5942,7 +5966,13 @@ void Dbdict::handleTabInfo(SimpleProperties::Reader & it, 
     */

    {

      Rope name(c_rope_pool, attrPtr.p->attributeName);

      name.assign(attrDesc.AttributeName, len, name_hash);

      if (!name.assign(attrDesc.AttributeName, len, name_hash))

      {

	jam();

	parseP->errorCode = CreateTableRef::OutOfStringBuffer;

	parseP->errorLine = __LINE__;

	return;

      }

    }

    attrPtr.p->attributeId = i;

    //attrPtr.p->attributeId = attrDesc.AttributeId;
@@ -14568,7 +14598,7 @@ Dbdict::create_fg_prepare_start(Signal* signal, SchemaOp* op){ 
    {

      Rope name(c_rope_pool, obj_ptr.p->m_name);

      if(!name.assign(fg.FilegroupName, len, hash)){

	op->m_errorCode = CreateTableRef::TableNameTooLong;

	op->m_errorCode = CreateTableRef::OutOfStringBuffer;

	c_obj_pool.release(obj_ptr);

	c_filegroup_pool.release(fg_ptr);

	break;
@@ -14774,7 +14804,7 @@ Dbdict::create_file_prepare_start(Signal* signal, SchemaOp* op){ 
    {

      Rope name(c_rope_pool, obj_ptr.p->m_name);

      if(!name.assign(f.FileName, len, hash)){

	op->m_errorCode = CreateTableRef::TableNameTooLong;

	op->m_errorCode = CreateTableRef::OutOfStringBuffer;

	c_obj_pool.release(obj_ptr);

	c_file_pool.release(filePtr);

	break;

storage/ndb/src/mgmsrv/ConfigInfo.cpp

+12 −0
Original line number Diff line number Diff line
@@ -1202,6 +1202,18 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    "0",

    STR_VALUE(MAX_INT_RNIL) },



  { 

    CFG_DB_STRING_MEMORY,

    "StringMemory",

    DB_TOKEN,

    "Default size of string memory (0 -> 5% of max 1-100 -> %of max, >100 -> actual bytes)",

    ConfigInfo::CI_USED,

    false,

    ConfigInfo::CI_INT,

    "0",

    "0",

    STR_VALUE(MAX_INT_RNIL) },

  

  /***************************************************************************

   * API

   ***************************************************************************/

storage/ndb/src/ndbapi/ndberror.c

+2 −1
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ ErrorBundle ErrorCodes[] = { 
  { 1229, DMEC, SE, "Too long frm data supplied" },

  { 1231, DMEC, SE, "Invalid table or index to scan" },

  { 1232, DMEC, SE, "Invalid table or index to scan" },

  { 773,  DMEC, SE, "Out of string memory, please modify StringMemory config parameter" },

  

  /**

   * FunctionNotImplemented