Commit 48feb973 authored by unknown's avatar unknown
Browse files

Made discless a config parameter instead of a env. variable

parent e914e6c7

ndb/include/mgmapi/mgmapi_config_parameters.h

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ 
#define CFG_LOGLEVEL_GREP             146

#define CFG_LOG_DESTINATION           147



#define CFG_DB_DISCLESS               148



#define CFG_NODE_ARBIT_RANK           200

#define CFG_NODE_ARBIT_DELAY          201

ndb/src/common/mgmcommon/ConfigInfo.cpp

+13 −0
Original line number Diff line number Diff line
@@ -888,6 +888,19 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    1,

    0x7FFFFFFF },

  



  {

    CFG_DB_DISCLESS,

    "Discless",

    "DB",

    "Run wo/ disk",

    ConfigInfo::USED,

    true,

    ConfigInfo::BOOL,

    0,

    0,

    1},

  

  {

    CFG_DB_ARBIT_TIMEOUT,

    "ArbitrationTimeout",

ndb/src/kernel/SimBlockList.cpp

+6 −5
Original line number Diff line number Diff line
@@ -72,11 +72,12 @@ SimBlockList::load(const Configuration & conf){ 


  SimulatedBlock * fs = 0;

  {

    char buf[100];

    if(NdbEnv_GetEnv("NDB_NOFS", buf, 100) == 0){

      fs = new (A_VALUE) Ndbfs(conf);

    } else { 

    Uint32 dl;

    const ndb_mgm_configuration_iterator * p = conf.getOwnConfigIterator();

    if(p && !ndb_mgm_get_int_parameter(p, CFG_DB_DISCLESS, &dl) && dl){

      fs = new (A_VALUE) VoidFs(conf);

    } else { 

      fs = new (A_VALUE) Ndbfs(conf);

    }

  }