Commit ea010ef5 authored by unknown's avatar unknown
Browse files

ndb - Fix LCP during SR parameters 


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Fix LCP during SR parameters
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix LCP during SR parameters
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Fix LCP during SR parameters
ndb/src/mgmsrv/ConfigInfo.cpp:
  Fix LCP during SR parameters
parent aab66123

ndb/include/mgmapi/mgmapi_config_parameters.h

+5 −2
Original line number Diff line number Diff line
@@ -50,8 +50,11 @@ 


#define CFG_DB_FILESYSTEM_PATH        125

#define CFG_DB_NO_REDOLOG_FILES       126

#define CFG_DB_DISC_BANDWIDTH         127

#define CFG_DB_SR_DISC_BANDWITH       128



#define CFG_DB_LCP_DISC_PAGES_TUP     127

#define CFG_DB_LCP_DISC_PAGES_TUP_SR  128

#define CFG_DB_LCP_DISC_PAGES_ACC     137

#define CFG_DB_LCP_DISC_PAGES_ACC_SR  138



#define CFG_DB_TRANSACTION_CHECK_INTERVAL   129

#define CFG_DB_TRANSACTION_INACTIVE_TIMEOUT 130

ndb/src/kernel/blocks/dbacc/DbaccMain.cpp

+4 −2
Original line number Diff line number Diff line
@@ -722,10 +722,12 @@ void Dbacc::execREAD_CONFIG_REQ(Signal* signal) 
  ndbrestart1Lab(signal);









  clblPagesPerTick = 50;









  //ndb_mgm_get_int_parameter(p, CFG_DB_, &clblPagesPerTick);









  ndb_mgm_get_int_parameter(p, CFG_DB_LCP_DISC_PAGES_ACC_SR, 









			    &clblPagesPerTick);

















  clblPagesPerTickAfterSr = 50;









  //ndb_mgm_get_int_parameter(p, CFG_DB_, &clblPagesPerTickAfterSr);









  ndb_mgm_get_int_parameter(p, CFG_DB_LCP_DISC_PAGES_ACC, 









			    &clblPagesPerTickAfterSr);

















  tdata0 = 0;









  initialiseRecordsLab(signal, ref, senderData);
































ndb/src/kernel/blocks/dbtup/DbtupGen.cpp



+4
−2






























Original line number
Diff line number
Diff line







@@ -663,10 +663,12 @@ void Dbtup::execREAD_CONFIG_REQ(Signal* signal)







  initialiseRecordsLab(signal, 0, ref, senderData);



















  clblPagesPerTick = 50;









  //ndb_mgm_get_int_parameter(p, CFG_DB_, &clblPagesPerTick);









  ndb_mgm_get_int_parameter(p, CFG_DB_LCP_DISC_PAGES_TUP_SR, 









			    &clblPagesPerTick);



















  clblPagesPerTickAfterSr = 50;









  //ndb_mgm_get_int_parameter(p, CFG_DB_, &clblPagesPerTickAfterSr);









  ndb_mgm_get_int_parameter(p, CFG_DB_LCP_DISC_PAGES_TUP, 









			    &clblPagesPerTickAfterSr);



















}//Dbtup::execSIZEALT_REP()










































ndb/src/mgmsrv/ConfigInfo.cpp



+4
−4






























Original line number
Diff line number
Diff line







@@ -928,7 +928,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {







    STR_VALUE(MAX_INT_RNIL) },



















  {









    KEY_INTERNAL,









    CFG_DB_LCP_DISC_PAGES_TUP_SR,









    "NoOfDiskPagesToDiskDuringRestartTUP",









    DB_TOKEN,









    "?",








@@ -940,7 +940,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {







    STR_VALUE(MAX_INT_RNIL) },



















  {









    KEY_INTERNAL,









    CFG_DB_LCP_DISC_PAGES_TUP,









    "NoOfDiskPagesToDiskAfterRestartTUP",









    DB_TOKEN,









    "?",








@@ -952,7 +952,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {







    STR_VALUE(MAX_INT_RNIL) },



















  {









    KEY_INTERNAL,









    CFG_DB_LCP_DISC_PAGES_ACC_SR,









    "NoOfDiskPagesToDiskDuringRestartACC",









    DB_TOKEN,









    "?",








@@ -964,7 +964,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {







    STR_VALUE(MAX_INT_RNIL) },



















  {









    KEY_INTERNAL,









    CFG_DB_LCP_DISC_PAGES_ACC,









    "NoOfDiskPagesToDiskAfterRestartACC",









    DB_TOKEN,









    "?",