mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
jonas@perch.ndb.mysql.com 2006-01-19 14:08:05 +01:00
parent 17f293fd97
commit 7256328d48
5 changed files with 54 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
storage/ndb/include/kernel/signaldata/CreateTable.hpp
View file

@ -95,7 +95,8 @@ public:
InvalidTablespace = 755,
VarsizeBitfieldNotSupported = 757,
NotATablespace = 758,
InvalidTablespaceVersion = 759
InvalidTablespaceVersion = 759,
OutOfStringBuffer = 773
};
private:

2
storage/ndb/include/mgmapi/mgmapi_config_parameters.h
View file

@ -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

42
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file

@ -2016,8 +2016,30 @@ 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);
bat[0].WA = &c_schemaPageRecordArray.getPtr(0)->word[0];
@ -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;

12
storage/ndb/src/mgmsrv/ConfigInfo.cpp
View file

@ -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
***************************************************************************/

3
storage/ndb/src/ndbapi/ndberror.c
View file

@ -391,7 +391,8 @@ 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
*/