diff --git a/ndb/include/mgmapi/mgmapi_config_parameters.h b/ndb/include/mgmapi/mgmapi_config_parameters.h index ed9f27fecf2..c0be3d6f03a 100644 --- a/ndb/include/mgmapi/mgmapi_config_parameters.h +++ b/ndb/include/mgmapi/mgmapi_config_parameters.h @@ -87,6 +87,8 @@ #define CFG_DB_UNDO_DATA_BUFFER 155 #define CFG_DB_REDO_BUFFER 156 +#define CFG_DB_LONG_SIGNAL_BUFFER 157 + #define CFG_NODE_ARBIT_RANK 200 #define CFG_NODE_ARBIT_DELAY 201 diff --git a/ndb/src/common/mgmcommon/ConfigInfo.cpp b/ndb/src/common/mgmcommon/ConfigInfo.cpp index 792dcca3a17..5534ea6aea8 100644 --- a/ndb/src/common/mgmcommon/ConfigInfo.cpp +++ b/ndb/src/common/mgmcommon/ConfigInfo.cpp @@ -667,7 +667,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { CFG_DB_UNDO_INDEX_BUFFER, "UndoIndexBuffer", "DB", - "Number bytes on each DB node allocated for storing data", + "Number bytes on each DB node allocated for writing UNDO logs for index part", ConfigInfo::USED, false, ConfigInfo::INT, @@ -679,7 +679,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { CFG_DB_UNDO_DATA_BUFFER, "UndoDataBuffer", "DB", - "Number bytes on each DB node allocated for storing data", + "Number bytes on each DB node allocated for writing UNDO logs for data part", ConfigInfo::USED, false, ConfigInfo::INT, @@ -691,7 +691,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { CFG_DB_REDO_BUFFER, "RedoBuffer", "DB", - "Number bytes on each DB node allocated for storing data", + "Number bytes on each DB node allocated for writing REDO logs", ConfigInfo::USED, false, ConfigInfo::INT, @@ -699,6 +699,18 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 1 * (1024 * 1024), MAX_INT_RNIL}, + { + CFG_DB_LONG_SIGNAL_BUFFER, + "LongMessageBuffer", + "DB", + "Number bytes on each DB node allocated for internal long messages", + ConfigInfo::USED, + false, + ConfigInfo::INT, + 1 * (1024 * 1024), + 1 * (1024 * 1024), + MAX_INT_RNIL}, + { CFG_DB_START_PARTIAL_TIMEOUT, "StartPartialTimeout", diff --git a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp index 0f25391fccb..e1f199ac411 100644 --- a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp +++ b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp @@ -54,6 +54,16 @@ Cmvmi::Cmvmi(const Configuration & conf) : { BLOCK_CONSTRUCTOR(Cmvmi); + Uint32 long_sig_buffer_size; + const ndb_mgm_configuration_iterator * p = conf.getOwnConfigIterator(); + ndbrequire(p != 0); + + ndb_mgm_get_int_parameter(p, CFG_DB_LONG_SIGNAL_BUFFER, + &long_sig_buffer_size); + + long_sig_buffer_size= long_sig_buffer_size / 256; + g_sectionSegmentPool.setSize(long_sig_buffer_size); + // Add received signals addRecSignal(GSN_CONNECT_REP, &Cmvmi::execCONNECT_REP); addRecSignal(GSN_DISCONNECT_REP, &Cmvmi::execDISCONNECT_REP); diff --git a/ndb/src/kernel/blocks/dbutil/DbUtil.cpp b/ndb/src/kernel/blocks/dbutil/DbUtil.cpp index ecaead3ba5a..554fc693fb8 100644 --- a/ndb/src/kernel/blocks/dbutil/DbUtil.cpp +++ b/ndb/src/kernel/blocks/dbutil/DbUtil.cpp @@ -112,7 +112,7 @@ DbUtil::DbUtil(const Configuration & conf) : addRecSignal(GSN_UTIL_RELEASE_CONF, &DbUtil::execUTIL_RELEASE_CONF); addRecSignal(GSN_UTIL_RELEASE_REF, &DbUtil::execUTIL_RELEASE_REF); - c_pagePool.setSize(100); + c_pagePool.setSize(10); c_preparePool.setSize(1); // one parallel prepare at a time c_preparedOperationPool.setSize(5); // three hardcoded, two for test c_operationPool.setSize(64); // 64 parallel operations diff --git a/ndb/src/kernel/blocks/dbutil/DbUtil.hpp b/ndb/src/kernel/blocks/dbutil/DbUtil.hpp index c6e15a3c539..5499970fde3 100644 --- a/ndb/src/kernel/blocks/dbutil/DbUtil.hpp +++ b/ndb/src/kernel/blocks/dbutil/DbUtil.hpp @@ -37,7 +37,7 @@ #include #include -#define UTIL_WORDS_PER_PAGE 8191 +#define UTIL_WORDS_PER_PAGE 1023 /** * @class DbUtil diff --git a/ndb/src/kernel/blocks/suma/Suma.cpp b/ndb/src/kernel/blocks/suma/Suma.cpp index 24e264291e7..4b2d6053d83 100644 --- a/ndb/src/kernel/blocks/suma/Suma.cpp +++ b/ndb/src/kernel/blocks/suma/Suma.cpp @@ -673,6 +673,7 @@ Suma::execDUMP_STATE_ORD(Signal* signal){ * */ +#if 0 void SumaParticipant::convertNameToId(SubscriptionPtr subPtr, Signal * signal) { @@ -703,6 +704,7 @@ SumaParticipant::convertNameToId(SubscriptionPtr subPtr, Signal * signal) sendSubCreateConf(signal, subPtr.p->m_subscriberRef, subPtr); } } +#endif void @@ -719,6 +721,7 @@ SumaParticipant::addTableId(Uint32 tableId, psyncRec->m_tableList.append(&tableId, 1); } +#if 0 void SumaParticipant::execGET_TABLEID_CONF(Signal * signal) { @@ -766,6 +769,8 @@ SumaParticipant::execGET_TABLEID_REF(Signal * signal) SubCreateRef::SignalLength, JBB); } +#endif + /************************************************************* * @@ -999,6 +1004,7 @@ SumaParticipant::execSUB_CREATE_REQ(Signal* signal) { } } break; +#if 0 case SubCreateReq::SelectiveTableSnapshot: /** * Tables specified by the user that does not exist @@ -1041,6 +1047,7 @@ SumaParticipant::execSUB_CREATE_REQ(Signal* signal) { return; } break; +#endif case SubCreateReq::DatabaseSnapshot: { jam(); diff --git a/ndb/src/kernel/blocks/suma/Suma.hpp b/ndb/src/kernel/blocks/suma/Suma.hpp index 7bd58b30640..08987fa9420 100644 --- a/ndb/src/kernel/blocks/suma/Suma.hpp +++ b/ndb/src/kernel/blocks/suma/Suma.hpp @@ -62,9 +62,10 @@ protected: void execLIST_TABLES_CONF(Signal* signal); void execGET_TABINFOREF(Signal* signal); void execGET_TABINFO_CONF(Signal* signal); +#if 0 void execGET_TABLEID_CONF(Signal* signal); void execGET_TABLEID_REF(Signal* signal); - +#endif /** * Scan interface */ @@ -275,7 +276,9 @@ public: */ // TODO we've got to fix this, this is to inefficient. Tomas char m_tables[MAX_TABLES]; +#if 0 char m_tableNames[MAX_TABLES][MAX_TAB_NAME_SIZE]; +#endif /** * "Iterator" used to iterate through m_tableNames */ diff --git a/ndb/src/kernel/blocks/suma/SumaInit.cpp b/ndb/src/kernel/blocks/suma/SumaInit.cpp index 9f0659942a2..a9fd293b1dd 100644 --- a/ndb/src/kernel/blocks/suma/SumaInit.cpp +++ b/ndb/src/kernel/blocks/suma/SumaInit.cpp @@ -51,9 +51,10 @@ SumaParticipant::SumaParticipant(const Configuration & conf) : //addRecSignal(GSN_GET_TABINFOREF, &SumaParticipant::execGET_TABINFO_REF); addRecSignal(GSN_GET_TABINFO_CONF, &SumaParticipant::execGET_TABINFO_CONF); addRecSignal(GSN_GET_TABINFOREF, &SumaParticipant::execGET_TABINFOREF); +#if 0 addRecSignal(GSN_GET_TABLEID_CONF, &SumaParticipant::execGET_TABLEID_CONF); addRecSignal(GSN_GET_TABLEID_REF, &SumaParticipant::execGET_TABLEID_REF); - +#endif /** * Dih interface */ diff --git a/ndb/src/kernel/vm/TransporterCallback.cpp b/ndb/src/kernel/vm/TransporterCallback.cpp index 158de64c87f..ba929b7ea7a 100644 --- a/ndb/src/kernel/vm/TransporterCallback.cpp +++ b/ndb/src/kernel/vm/TransporterCallback.cpp @@ -38,13 +38,6 @@ */ SectionSegmentPool g_sectionSegmentPool; -static int f(int v){ - g_sectionSegmentPool.setSize(v); - return v; -} - -static int v = f(2048); - bool import(Ptr & first, const Uint32 * src, Uint32 len){ /**